gina 0.1.6-alpha.147 → 0.1.6-alpha.149

package/framework/{v0.1.6-alpha.147 → v0.1.6-alpha.149}/core/controller/controller.renderSwig.js

@@ -225,7 +225,8 @@ async function render(userData, displayToolbar, errOptions) {
                 }
 
                 // updating extends
-                _templateContent = _templateContent.replace(layoutPath, '../../../../cache/'+ localOptions.bundle +'/'+ newLayoutPath);
+                // _templateContent = _templateContent.replace(layoutPath, '../../../../cache/'+ localOptions.bundle +'/'+ newLayoutPath);
+                _templateContent = _templateContent.replace(layoutPath, _(cachePath +'/'+ localOptions.bundle +'/'+ newLayoutPath, true) );
 
                 // override layout path
                 layoutPath = newLayoutPath;
@@ -829,7 +830,7 @@ async function render(userData, displayToolbar, errOptions) {
                     if ( /**  self.isCacheless() ||*/ typeof(localOptions.template.assets) == 'undefined' || typeof(localOptions.template.assets[local.req.url]) == 'undefined' ) {
                         // assets string -> object
                         //assets = self.serverInstance.getAssets(localOptions.conf, layout.toString(), swig, data);
-                        assets = self.serverInstance.getAssets(localOptions.conf, layout, swig, data);
+                        assets = self.serverInstance.getAssets(localOptions.conf, layout, null, data);
                         localOptions.template.assets = JSON.parse(assets);
                     }
 

package/framework/{v0.1.6-alpha.147 → v0.1.6-alpha.149}/core/deps/swig-1.4.2/dist/swig.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.147/core/asset/plugin/../../deps/swig-1.4.2/dist/swig.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.149/core/asset/plugin/../../deps/swig-1.4.2/dist/swig.min.js",
 "lineCount":7,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.147/core/asset/plugin/../../deps/swig-1.4.2/bin/swig.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.149/core/asset/plugin/../../deps/swig-1.4.2/bin/swig.js"],
 "names":["swig","require","optimist","fs","path","filters","utils","uglify","command","argv","usage","describe","v","o","h","j","c","m","alias","default","check","_","length","Error","shift","ctx","out","file","str","console","log","efn","anonymous","files","fn","version","process","exit","JSON","parse","readFileSync","normalize","mkdirSync","e","errno","basename","writeFileSync","flags","each","resolve","filter","name","setFilter","tags","tag","setTag","compile","ends","block","options","setDefaults","r","precompile","filename","locals","tpl","toString","replace","minify","fromString","code","eval","__tpl","render","forEach"]
 }

package/framework/{v0.1.6-alpha.147 → v0.1.6-alpha.149}/core/server.js

@@ -1090,32 +1090,14 @@ function Server(options) {
          * }
          */
 
-        if (swig) {
-            var assetsStr = JSON.stringify(assets);
-
-            // var conf = self.conf[self.conf.bundle][self.conf.env];
-            // var filters = SwigFilters({
-            //     options     : conf,
-            //     isProxyHost : getContext('isProxyHost')
-            // });
-            // try {
-            //     // Allows you to get a bundle web root
-            //     // e.g.: swig.setFilter('getWebroot', filters.getWebroot);
-            //     // e.g.: swig.setFilter('nl2br', filters.nl2br);
-            //     for (let filter in filters) {
-            //         if ( typeof(filters[filter]) == 'function' && !/^getConfig$/.test(filter) ) {
-            //             swig.setFilter(filter, filters[filter]);
-            //         }
-            //     }
 
-            // } catch (err) {
-            //     throw err;
-            // }
-            // TODO - Setup Default Swig Filters
+        if (swig) { // Deprecated
+            var assetsStr = JSON.stringify(assets);
             assets = swig.compile( assetsStr.substring(1, assetsStr.length-1), swig.getOptions() )(data);
-            return '{'+ assets +'}'
+
+            return '{'+ assets +'}';
         } else {
-            return assets
+            return JSON.stringify(assets)
         }
     }
 
@@ -1589,7 +1571,7 @@ function Server(options) {
             , isHandler     = null
             , hanlersPath   = null
             , preferedEncoding = bundleConf.server.preferedCompressionEncodingOrder
-            , acceptEncodingArr = request.headers['accept-encoding'].replace(/\s+/g, '').split(/\,/)
+            , acceptEncodingArr = (request.headers['accept-encoding']) ? request.headers['accept-encoding'].replace(/\s+/g, '').split(/\,/) : []
             , acceptEncoding = null
         ;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.6-alpha.147",
+  "version": "0.1.6-alpha.149",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.6-alpha.147/core/gna",
+  "main": "./framework/v0.1.6-alpha.149/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",

package/framework/v0.1.6-alpha.147/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.147