updated: view markup

petersirka · petersirka · commit 559f07c79018 · 2014-12-20T20:45:53.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -42,7 +42,7 @@ Framework loads modules, packages, models, definitions, controllers
 - added: framework.on('controller-render-meta', function(controller) {})
 - added: framework.on('init')
 - added: framework.merge('/merge.js', '/js/file1.js', '/js/file2.js')
-- added: framework supports X-Forwarded-Protocol header 
+- added: framework supports X-Forwarded-Protocol header
 - added: FrameworkImage supports buffer
 - added: auto-vendor-prefixes: box-sizing
 - added: new flag `noxhr` or `-xhr` because all route contains +xhr as default
@@ -85,6 +85,9 @@ Framework loads modules, packages, models, definitions, controllers
 - added: framework.dependencies (this object contains all installed total.js dependencies)
 - added: controller.translate([text]);
 - added: framework.translate(text, [language])
+- added: @{body.} instead of @{post.}
+- added: @{query.} instead of @{get.}
+- added: @{files} uploaded files
 
 - updated: (IMPORTANT) framework doesn't remove subdirectories with files in temporary directory
 - updated: (IMPORTANT) all models are loaded after is the framework loaded
@@ -105,6 +108,8 @@ Framework loads modules, packages, models, definitions, controllers
 - updated: @{cookie(name)} --> read cookie
 - updated: framework.mail(address, subject, view, model, callback, replyTo) - added: replyTo
 - updated: controller.view(name) can execute without name (controller.viewname contains name according to URL)
+- updated: @{post} is deprecated
+- updated: @{get} is deprecated
 
 - renamed: config['directory-angular'] to config['directory-public-virtual']
 - renamed: config['allow-compress-html'] to config['allow-compile-html']
diff --git a/index.js b/index.js
@@ -10594,7 +10594,7 @@ Controller.prototype.view = function(name, model, headers, isPartial) {
     var helpers = framework.helpers;
 
     try {
-        value = generator.call(self, self, self.repository, model, self.session, self.get, self.post, self.url, framework.global, helpers, self.user, self.config, framework.functions, 0, isPartial ? self.outputPartial : self.output, self.date, self.req.cookie);
+        value = generator.call(self, self, self.repository, model, self.session, self.get, self.post, self.url, framework.global, helpers, self.user, self.config, framework.functions, 0, isPartial ? self.outputPartial : self.output, self.date, self.req.cookie, self.req.files);
     } catch (ex) {
 
         var err = new Error('View: ' + name + ' - ' + ex.toString());
diff --git a/internal.js b/internal.js
@@ -1831,7 +1831,7 @@ function view_parse(content, minify) {
             builder += '+' + escaper(text);
     }
 
-    var fn = '(function(self,repository,model,session,get,post,url,global,helpers,user,config,functions,index,output,date){var language=this.language;var cookie=function(name){return controller.req.cookie(name);};' + (isSitemap ? 'var sitemap=function(){return self.sitemap.apply(self,arguments);};' : '') + (functions.length > 0 ? functions.join('') + ';' : '') + 'var controller=self;' + builder + ';return $output;})';
+    var fn = '(function(self,repository,model,session,query,body,url,global,helpers,user,config,functions,index,output,date,files){var get=query;var post=body;var language=this.language;var cookie=function(name){return controller.req.cookie(name);};' + (isSitemap ? 'var sitemap=function(){return self.sitemap.apply(self,arguments);};' : '') + (functions.length > 0 ? functions.join('') + ';' : '') + 'var controller=self;' + builder + ';return $output;})';
     return eval(fn);
 }
 
@@ -1922,6 +1922,9 @@ function view_prepare(command, dynamicCommand, functions) {
 
             return '$STRING(' + command + ').encode()';
 
+        case 'files':
+            return command;
+
         case 'CONFIG':
         case 'FUNCTION':
         case 'MODEL':
diff --git a/test/controllers/default.js b/test/controllers/default.js
@@ -138,6 +138,9 @@ function plain_post_raw() {
 
 function plain_post_parse() {
     var self = this;
+    self.layout('');
+    var output = self.view('params', null, true);
+    assert.ok(output === '--body=total.js--query=query--post=total.js--get=query--', 'Problem with getting values from request body and URL.');
     self.post.type = 'parse';
     self.json(self.post);
 }
diff --git a/test/test-framework-debug.js b/test/test-framework-debug.js
@@ -281,7 +281,7 @@ function test_routing(next) {
 	});
 
 	async.await('post-parse', function(complete) {
-		utils.request(url + 'post/parse/', ['post'], { name: 'total.js' }, function(error, data, code, headers) {
+		utils.request(url + 'post/parse/?value=query', ['post'], { name: 'total.js' }, function(error, data, code, headers) {
 			if (error)
 				throw error;
 			assert(data === '{"name":"total.js","type":"parse"}', 'post-json');
diff --git a/test/views/fromURL.html b/test/views/fromURL.html
diff --git a/test/views/params.html b/test/views/params.html
@@ -0,0 +1 @@
+--body=@{body.name}--query=@{query.value}--post=@{post.name}--get=@{get.value}--

Original file line number	Diff line number	Diff line change
`@@ -1831,7 +1831,7 @@ function view_parse(content, minify) {`
`1831`	`1831`	`builder += '+' + escaper(text);`
`1832`	`1832`	`}`
`1833`	`1833`
`1834`		`- var fn = '(function(self,repository,model,session,get,post,url,global,helpers,user,config,functions,index,output,date){var language=this.language;var cookie=function(name){return controller.req.cookie(name);};' + (isSitemap ? 'var sitemap=function(){return self.sitemap.apply(self,arguments);};' : '') + (functions.length > 0 ? functions.join('') + ';' : '') + 'var controller=self;' + builder + ';return $output;})';`
	`1834`	`+ var fn = '(function(self,repository,model,session,query,body,url,global,helpers,user,config,functions,index,output,date,files){var get=query;var post=body;var language=this.language;var cookie=function(name){return controller.req.cookie(name);};' + (isSitemap ? 'var sitemap=function(){return self.sitemap.apply(self,arguments);};' : '') + (functions.length > 0 ? functions.join('') + ';' : '') + 'var controller=self;' + builder + ';return $output;})';`
`1835`	`1835`	`return eval(fn);`
`1836`	`1836`	`}`
`1837`	`1837`
`@@ -1922,6 +1922,9 @@ function view_prepare(command, dynamicCommand, functions) {`
`1922`	`1922`
`1923`	`1923`	`return '$STRING(' + command + ').encode()';`
`1924`	`1924`
	`1925`	`+ case 'files':`
	`1926`	`+ return command;`
	`1927`	`+`
`1925`	`1928`	`case 'CONFIG':`
`1926`	`1929`	`case 'FUNCTION':`
`1927`	`1930`	`case 'MODEL':`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,9 @@ function plain_post_raw() {`
`138`	`138`
`139`	`139`	`function plain_post_parse() {`
`140`	`140`	`var self = this;`
	`141`	`+ self.layout('');`
	`142`	`+ var output = self.view('params', null, true);`
	`143`	`+ assert.ok(output === '--body=total.js--query=query--post=total.js--get=query--', 'Problem with getting values from request body and URL.');`
`141`	`144`	`self.post.type = 'parse';`
`142`	`145`	`self.json(self.post);`
`143`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+--body=@{body.name}--query=@{query.value}--post=@{post.name}--get=@{get.value}--`