gina 0.1.1-alpha.184 → 0.1.1-alpha.185

package/framework/{v0.1.1-alpha.184 → v0.1.1-alpha.185}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.184/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.185/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"AAeAA,MAAA,CAAA,eAAA,CAA8BA,MAAA,CAAA,MAC9BA,OAAA,CAAA,WAAA,CAA8B,IAE9BA;MAAA,CAAA,YAAA,CAA8B,QAAQ,CAACC,CAAD,CAAO,CAEzC,GAAKA,CAAL,CAIO,CACH,GAAKA,CAAA,CAAA,iBAAL,CACI,MAAO,CAAA,CAGX,KAAIC,EAAUD,CAAA,CAAA,MAAVC,CAA2B,CAE3B,OAAU,+BAFiB,CAI3B,IAAY,4BAJe,CAM3B,SAAe,QAASC,CAAAA,IAAT,CAAc,iCAAd,CAAF,CAAuD,CAAA,CAAvD,CAA8D,CAAA,CANhD,CAQ3B,SAAY,iCARe,CAU3B,QAAWC,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,gCAAnB,CAAX,CAVgB,CAY3B,eAAkBF,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,uCAAnB,CAAX,CAZS,CAgB3BC,QAAU,gCAhBiB,CAkB3B,QAAY,gCAlBe;AAoB3B,SAAa,iCApBc,CAgC/BN,EAAA,CAAA,MAAA,CAAA,UAAA,CAA+B,QAAQ,CAACO,CAAD,CAAS,CAE5C,GAAuB,WAAvB,EAAK,MAAOA,EAAZ,CACI,MAAOP,EAAA,CAAA,MAAA,CAAA,OAGX,KAAIQ,EAAc,EAAlB,CACIC,EAAcT,CAAA,CAAA,MAAA,CAAA,OACdU,EAAAA,CAAK,IAAIC,MAAJ,CAAW,KAAX,CAAmBJ,CAAnB,CAA4BK,MAAOC,CAAAA,YAAP,CAAoB,EAApB,CAA5B,CAET,KAAIC,EAAc,IAClB,KAAKA,CAAL,GAAcL,EAAd,CACSC,CAAGR,CAAAA,IAAH,CAAQY,CAAR,CAAL,GACGN,CAAA,CAAOM,CAAP,CADH,CACmBL,CAAA,CAAQK,CAAR,CADnB,CAIJ,OAA4B,EAArB,CAACN,CAAA,CAAA,KAAA,EAAD,CAA0BA,CAA1B,CAAmC,IAhBE,CAoBhDT,OAAA,CAAA,QAAA,CAAkC,4BAClCA,OAAA,CAAA,eAAA,CAAkC,SAAUG,CAAAA,IAAV,CAAe,iCAAf,CAAA,CAAoD,CAAA,CAApD,CAA0D,CAAA,CAC5F,IAC+B,WAD/B,EACI,MAAOa,SAASC,CAAAA,MADpB,EAC8C,SAAWd,CAAAA,IAAX,CAAgBa,QAASC,CAAAA,MAAzB,CAD9C,EAGI,CAACD,QAASC,CAAAA,MAHd,EAGwB,IAAKd,CAAAA,IAAL,CAAUa,QAASE,CAAAA,IAAnB,CAHxB,CAIE,CAEE,IAAID;AAAiCE,CAAvB,GAAuBA,CAAjBH,QAASC,CAAAA,MAAQE,EAAAA,KAAxB,CAA8B,CAA9B,CACT,EAACF,CAAL,EAAe,IAAKd,CAAAA,IAAL,CAAUa,QAASE,CAAAA,IAAnB,CAAf,GACID,CACA,CADSD,QAASE,CAAAA,IAAKE,CAAAA,KAAd,CAAoB,MAApB,CACT,CAAIC,KAAMC,CAAAA,OAAN,CAAcL,CAAd,CAAJ,EAA6C,CAA7C,CAA6BA,CAAOM,CAAAA,MAApC,GACIN,CADJ,CACaA,CAAA,CAAO,CAAP,CADb,CAFJ,CAOA,EADIO,CACJ,CADcP,CAAOG,CAAAA,KAAP,CAAa,oBAAb,CACd,IACIpB,MAAA,CAAA,eADJ,CACgCC,CAAA,CAAA,MAAA,CAAA,QADhC,CAC+D,SAAUE,CAAAA,IAAV,CAAeqB,CAAA,CAAQ,CAAR,CAAWC,CAAAA,KAAX,CAAiB,GAAjB,CAAA,CAAuB,CAAvB,CAAf,CAAF,CAAgD,CAAA,CAAhD,CAAsD,CAAA,CADnH,CAVF,CAcFxB,CAAA,CAAA,iBAAA,CAAkC,CAAA,CAClCA,EAAA,CAAA,UAAA,CAAmBC,CAAnB,CAEA,IAAI,CACAD,CAAA,CAAA,KAAA,CAA8BG,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,8BAAnB,CAAX,CAD9B,CAEF,MAAOoB,CAAP,CAAY,CACV,KAAMA,EAAN,CADU,CAMVC,CAAAA,CAAc,IAGdC,EAAAA,CAAcC,QAASC,CAAAA,IAAKC,CAAAA,oBAAd,CAAmC,MAAnC,CAOlB,KAlGG,IA4FGC,EAAY,CA5Ff,CA6FGC,EAAYL,CAAML,CAAAA,MA7FrB,CA8FGW,EAAY,CAAA,CA9Ff,CA+FGvB,EAAgBC,MAAJ,CAPgBuB,8BAOhB,CAGlB,CAAOH,CAAP;AAAWC,CAAX,CAAgB,EAAED,CAAlB,CACI,GAAKrB,CAAGR,CAAAA,IAAH,CAAQyB,CAAA,CAAMI,CAAN,CAASd,CAAAA,IAAjB,CAAL,CAA8B,CAC1BgB,CAAA,CAAQ,CAAA,CACR,MAF0B,CAM7BA,CAAL,GACIP,CAMA,CANkBE,QAASO,CAAAA,aAAT,CAAuB,MAAvB,CAMlB,CALAT,CAAKT,CAAAA,IAKL,CALkBhB,CAAA,CAAA,OAKlB,CAxB8BiC,8BAwB9B,CAJAR,CAAKU,CAAAA,KAIL,CAJkB,QAIlB,CAHAV,CAAKW,CAAAA,GAGL,CAHkB,YAGlB,CAFAX,CAAKY,CAAAA,IAEL,CAFkB,UAElB,CAAAV,QAASE,CAAAA,oBAAT,CAA8B,MAA9B,CAAA,CAAsC,CAAtC,CAAyCS,CAAAA,WAAzC,CAAqDb,CAArD,CAPJ,CAWK,UAAUxB,CAAAA,IAAV,CAAeD,CAAA,CAAA,QAAf,CAAL,GACQuC,CACJ,CAD0BzC,MAAA,CAAA,OAAA,CAAkB,cAAlB,CAC1B,CAAAA,MAAA,CAAA,WAAA,CAA0B,IAAIyC,CAFlC,CAKA,OAAO,CAAA,CAzHJ,CAFH,MAAO,CAAA,CAJ8B;",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.184/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.185/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.184 → v0.1.1-alpha.185}/core/controller/controller.js

@@ -417,7 +417,7 @@ function SuperController(options) {
                 local._swigOptions = JSON.clone(swigOptions);
             }
             swig.setDefaults(swigOptions);
-            // used for self.engine.compile(tpl, swigOptions)(data)
+            // used for self.engine.compile(tpl, swigOptions)(swigData)
             swig.getOptions = function() {
                 return local._swigOptions;
             }
@@ -1019,7 +1019,7 @@ function SuperController(options) {
                     layout = layout.replace(/<\/body>/i, plugin + '\n\t</body>');
                     layout = whisper(dic, layout, /\{{ ([a-zA-Z.]+) \}}/g );
                     //swig.invalidateCache();
-                    layout = swig.compile(layout, mapping)(data);
+                    layout = swig.compile(layout, mapping)(swigData);
 
 
                 } catch (err) {
@@ -1032,7 +1032,7 @@ function SuperController(options) {
             else if (hasViews() && localOptions.debugMode && self.isCacheless()) {
                 try {
                     //layout = whisper(dic, layout, /\{{ ([a-zA-Z.]+) \}}/g );
-                    layout = swig.compile(layout, mapping)(data);
+                    layout = swig.compile(layout, mapping)(swigData);
                 } catch (err) {
                     filename = localOptions.template.html;
                     filename += ( typeof(data.page.view.namespace) != 'undefined' && data.page.view.namespace != '' && new RegExp('^' + data.page.view.namespace +'-').test(data.page.view.file) ) ? '/' + data.page.view.namespace + data.page.view.file.split(data.page.view.namespace +'-').join('/') + ( (data.page.view.ext != '') ? data.page.view.ext: '' ) : '/' + data.page.view.file+ ( (data.page.view.ext != '') ? data.page.view.ext: '' );
@@ -1105,6 +1105,7 @@ function SuperController(options) {
                 }
 
                 // Last compilation before rendering
+                // Now we can use `data` instead of `swigData`
                 layout = swig.compile(layout, mapping)(data);
 
                 if ( !headersSent() ) {

package/framework/{v0.1.1-alpha.184 → v0.1.1-alpha.185}/lib/routing/src/main.js

@@ -971,14 +971,8 @@ function Routing() {
             throw new Error('[ RoutingHelper::getRouting(rule, params) ] : `' +rule + '` not found !')
         }
 
-        var route = JSON.clone(routing[rule]);
-        var variable    = null
-            , regex     = null
-            , urls      = null
-            , i         = null
-            , len       = null
-            , msg       = null
-        ;
+        var route   = JSON.clone(routing[rule]);
+        var msg     = null;
         route = checkRouteParams(route, params);
 
         if ( /\,/.test(route.url) ) {
@@ -997,21 +991,29 @@ function Routing() {
 
         // Completeting url with extra params e.g.: ?param1=val1&param2=val2
         if ( /GET/i.test(route.method) && typeof(params) != 'undefined' ) {
-            var queryParams = '?', maskedUrl = routing[rule].url;
-            //self.reservedParams;
+            var queryParams = '?'
+                , maskedUrl = routing[rule].url
+            ;
+
+            // in route.rule params
+            var extracted = [], i = 0;
             for (let r in route.param) {
                 if ( self.reservedParams.indexOf(r) > -1 || new RegExp(route.param[r]).test(maskedUrl) )
                     continue;
                 if (typeof(params[r]) != 'undefined' ) {
                     queryParams += r +'='+ encodeRFC5987ValueChars(params[r])+ '&';
-                    delete params[r]
+                    extracted[i] = params[r];
+                    ++i;
                 }
-
             }
 
             // extra params ( not declared in the rule, but added by getUrl() )
             for (let p in params) {
-                if ( self.reservedParams.indexOf(p) > -1 || typeof(route.requirements[p]) != 'undefined' ) {
+                if (
+                    self.reservedParams.indexOf(p) > -1
+                    || typeof(route.requirements[p]) != 'undefined'
+                    || extracted.indexOf(p) > -1
+                ) {
                     continue;
                 }
                 if ( typeof(params[p]) == 'object' ) {
@@ -1019,14 +1021,17 @@ function Routing() {
                 } else {
                     queryParams += p +'='+ params[p] +'&';
                 }
-
             }
+            maskedUrl = null;
+            extracted = null;
+            i = null;
 
             if (queryParams.length > 1) {
                 queryParams = queryParams.substring(0, queryParams.length-1);
 
                 route.url += queryParams;
             }
+            queryParams = null;
         }
 
         // recommanded for x-bundle coms

package/package.json

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

package/framework/v0.1.1-alpha.184/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.184