added: framework.view(), framework.mail()

petersirka · petersirka · commit 6135806b81b0 · 2014-08-28T11:13:23.000+02:00
diff --git a/index.js b/index.js
@@ -4108,6 +4108,63 @@ Framework.prototype._log = function(a, b, c, d) {
     }, 1000);
 };
 
+/**
+ * Send e-mail
+ * @param {String or Array} address E-mail address.
+ * @param {String} subject E-mail subject.
+ * @param {String} view View name.
+ * @param {Object} model Optional.
+ * @param {Function(err)} callback Optional.
+ * @return {Framework}
+ */
+Framework.prototype.mail = function(address, subject, view, model, callback) {
+
+    var controller = new Controller('', null, null, null);
+
+    if (typeof(layout) === OBJECT) {
+        var tmp = repository;
+        repository = layout;
+        layout = tmp;
+    }
+
+    controller.layoutName = layout || '';
+
+    if (typeof(repository) === OBJECT && repository !== null)
+        controller.repository = repository;
+
+    controller.mail.apply(controller, arguments);
+    return self;
+};
+
+
+/**
+ * Render view
+ * @param {String} name View name.
+ * @param {Object} model Model.
+ * @param {String} layout Layout for the view, optional. Default without layout.
+ * @param {Object} repository A repository object, optional. Default empty.
+ * @return {String}
+ */
+Framework.prototype.view = function(name, model, layout, repository) {
+
+    var controller = new Controller('', null, null, null);
+
+    if (typeof(layout) === OBJECT) {
+        var tmp = repository;
+        repository = layout;
+        layout = tmp;
+    }
+
+    controller.layoutName = layout || '';
+
+    if (typeof(repository) === OBJECT && repository !== null)
+        controller.repository = repository;
+
+    var output = controller.view(name, model, true);
+    controller = null;
+    return output;
+};
+
 /**
  * Add a test function or test request
  * @param {String} name Test name.
@@ -6666,10 +6723,19 @@ function Controller(name, req, res, subscribe) {
     this._currentVideo = '';
     this._currentJS = '';
     this._currentCSS = '';
-    this._currentView = name[0] !== '#' && name !== 'default' ? '/' + name + '/' : '';
+    this._currentView = name[0] !== '#' && name !== 'default' && name !== '' ? '/' + name + '/' : '';
+
+    if (!this.req) {
+        var empty = {};
+        this.req = { uri: empty };
+    }
+
+    if (!this.res)
+        this.res = {};
 
     // Assign controller to Response
-    this.res.controller = this;
+    if (this.res)
+        this.res.controller = this;
 }
 
 Controller.prototype = {
@@ -9922,7 +9988,7 @@ Controller.prototype.view = function(name, model, headers, isPartial) {
         headers = null;
     }
 
-    if (self.res.success && !isPartial)
+    if (!isPartial && self.res && self.res.success)
         return self;
 
     var skip = name[0] === '~';
@@ -9972,9 +10038,10 @@ Controller.prototype.view = function(name, model, headers, isPartial) {
     }
 
     var helpers = framework.helpers;
-
-    try {
+/*
+    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, sitemap, isPartial ? self.outputPartial : self.output, self.date);
+/*
     } catch (ex) {
 
         var err = new Error('View: ' + name + ' - ' + ex.toString());
@@ -9996,7 +10063,7 @@ Controller.prototype.view = function(name, model, headers, isPartial) {
 
         isLayout = false;
         return value;
-    }
+    }*/
 
     if (!isLayout && self.precache && self.status === 200)
         self.precache(value, CONTENTTYPE_TEXTHTML, headers, true);
diff --git a/internal.js b/internal.js
@@ -1704,7 +1704,6 @@ MultipartParser.prototype.explain = function() {
 function View(controller) {
     this.controller = controller;
     this.cache = controller.cache;
-    this.prefix = controller.prefix;
 }
 
 /**
@@ -1948,7 +1947,6 @@ function view_prepare(command, dynamicCommand, functions) {
         case '!FUNCTION':
             return '(' + command.substring(1) + ')';
 
-
         case 'resource':
         case 'RESOURCE':
             return '(self.' + command + ').toString().encode()';
@@ -2060,7 +2058,6 @@ function view_prepare(command, dynamicCommand, functions) {
         case 'viewToggle':
             return 'self.$' + command;
 
-
         case 'radio':
         case 'text':
         case 'checkbox':
@@ -2431,7 +2428,7 @@ View.prototype.load = function(name, filename) {
 
     generator = self.read(filename);
 
-    if (!self.controller.isDebug)
+    if (!framework.isDebug)
         framework.temporary.views[key] = generator;
 
     return generator;
@@ -2451,9 +2448,9 @@ View.prototype.dynamic = function(content) {
     if (generator !== null)
         return generator;
 
-    generator = view_parse(content, self.controller, framework.config['allow-compress-html']);
+    generator = view_parse(content, framework.config['allow-compress-html']);
 
-    if (!self.controller.isDebug)
+    if (!framework.isDebug)
         framework.temporary.views[key] = generator;
 
     return generator;
diff --git a/minify/total.js/index.js b/minify/total.js/index.js
diff --git a/minify/total.js/internal.js b/minify/total.js/internal.js
diff --git a/test/modules/inline-view.js b/test/modules/inline-view.js
@@ -0,0 +1,7 @@
+var assert = require('assert');
+
+exports.install = function(framework) {
+    setTimeout(function() {
+        assert.ok(framework.view('view') === '<div>total.js</div><script>var a=1+1;</script>', 'framework.view()');
+    }, 100);
+};
diff --git a/test/views/view.html b/test/views/view.html
@@ -0,0 +1,4 @@
+<div>@{config['name']}</div>
+<script>
+    var a = 1 + 1;
+</script>
