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

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

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

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

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.184/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.185/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}

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

@@ -8674,14 +8674,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) ) {
@@ -8700,21 +8694,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' ) {
@@ -8722,14 +8724,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/framework/{v0.1.1-alpha.184 → v0.1.1-alpha.185}/core/asset/plugin/dist/vendor/gina/js/gina.min.js

@@ -398,10 +398,10 @@ C)v[D[0].substr(1)]=G;else return!1}else++J;if(v.count()==D.length){z=null;for(z
 (u.param.path=u.param.path.replace(D,G[O]));'undefined'!=typeof u.param.title&&/:/.test(u.param.title)&&(u.param.title=u.param.title.replace(D,G[O]));'undefined'!=typeof u.param.namespace&&/:/.test(u.param.namespace)&&(u.param.namespace=u.param.namespace.replace(D,G[O]));'undefined'!=typeof u.param.file&&/:/.test(u.param.file)&&(Q.variable=G[O],u.param.file=u.param.file.replace(D,Q));if(/,/.test(u.url)){r=u.url.split(/,/g);var C=0;for(ea=r.length;C<ea;++C)Q.variable=G[O],r[C]=r[C].replace(D,Q);u.url=
 r.join(',')}else Q.variable=G[O],u.url=u.url.replace(D,Q)}}if(r){C=0;ea=r.length;Ea=Ea.split(/,/g);var m=0;for(u.urlIndex=0;C<ea;++C)if(r=0,D=Ea[0].match(/:[-_a-z0-9]+/ig)){N=0;for(O=D.length;N<O;N++){var z=D[N].substr(1);'undefined'!=typeof G[z]&&G[z]&&r++}r>m&&(m=r,u.urlIndex=C)}}return u};P.getRoute=function(u,G,r){var ea=null;A?ea=window.gina.config:(ea=getContext('gina').config,'undefined'!=typeof getContext('argvFilename')&&(ea.getRouting=getContext('gina').Config.instance.getRouting));var Ea=
 ea.env||GINA_ENV,N=null,O=ea.bundle;/@/.test(u)||'undefined'==typeof O||null==O||(u=u.toLowerCase(),u+='@'+O);if(/@/.test(u)){var D=u.replace(/(.*):\/\//,'').split(/@/);O=D[1];/\/(.*)$/.test(u)&&(N=u.replace(/(.*):\/\//,'').split(/\/(.*)$/)[1],O=O.replace(/\/(.*)$/,''),Ea=N||Ea);u=D[0].toLowerCase()+'@'+O}N=ea.getRouting(O,Ea);if('undefined'==typeof N[u])throw Error('[ RoutingHelper::getRouting(rule, params) ] : `'+u+'` not found !');ea=JSON.clone(N[u]);O=null;ea=S(ea,G);/,/.test(ea.url)&&('undefined'!=
-typeof ea.urlIndex&&(r=ea.urlIndex,delete ea.urlIndex),r='undefined'!=typeof r?r:0,ea.url=ea.url.split(/,/g)[r]);/\/$/.test(ea.url)&&'/'!=ea.url&&(ea.url=ea.url.substr(0,ea.url.length-1));if(/GET/i.test(ea.method)&&'undefined'!=typeof G){r='?';N=N[u].url;for(let C in ea.param)-1<P.reservedParams.indexOf(C)||(new RegExp(ea.param[C])).test(N)||'undefined'==typeof G[C]||(r+=C+'='+encodeRFC5987ValueChars(G[C])+'&',delete G[C]);for(let C in G)-1<P.reservedParams.indexOf(C)||'undefined'!=typeof ea.requirements[C]||
-(r='object'==typeof G[C]?r+(C+'='+encodeRFC5987ValueChars(JSON.stringify(G[C]))+'&'):r+(C+'='+G[C]+'&'));1<r.length&&(r=r.substring(0,r.length-1),ea.url+=r)}ea.toUrl=function(C){var m=null;/^redirect$/i.test(this.param.control)&&(m=P.getUrlProps(this.bundle,Ea||GINA_ENV));var z=this.webroot||m.webroot;m=this.hostname||m.hostname;var y=this.url;this.url='undefined'!=typeof C&&1==C?y.replace(z,'/'):y;return m+this.url};ea.request=function(C,m){var z=null,y=null;'function'==typeof arguments[arguments.length-
-1]&&(z=arguments[arguments.length-1]);'object'==typeof arguments[2]&&(y=arguments[2]);var H=this.webroot||y.webroot,v=this.hostname||y.hostname;y='undefined'!=typeof C&&1==C?path.replace(H,'/'):this.url||y.url;v=/^https/.test(v)?'https':'http';A?window.open(y,'undefined'!=typeof m&&'undefined'!=typeof m.target?m.target:'_self'):('undefined'==typeof m.agent&&(m.agent=!1),v=require(''+v),H=function(w){var F='',J=!1;w.on('data',function(T){F+=T});w.on('error',function(T){J='Failed to get mail content';
-T&&'undefined'!=typeof T.stack?J+=T.stack:'string'==typeof T&&(J+='\n'+T)});w.on('end',function(){if(/^\{/.test(F))try{F=JSON.parse(F),'undefined'!=typeof F.error&&(J=JSON.clone(F),F=null)}catch(T){J=T}J?z(J):z(!1,F)})},z?v.get(y,m,H):v.get(y,m))};/:/.test(ea.url)&&(G=ea.url.match(/(:(.*)\/|:(.*)$)/g).map(function(C){return C.replace(/\//g,'')}).join(', '),O='[ RoutingHelper::getRoute(rule[, bundle, method]) ] : route [ %r ] param placeholder not defined: `'+ea.url+'` !\n Check your route description to compare requirements against param variables [ '+
+typeof ea.urlIndex&&(r=ea.urlIndex,delete ea.urlIndex),r='undefined'!=typeof r?r:0,ea.url=ea.url.split(/,/g)[r]);/\/$/.test(ea.url)&&'/'!=ea.url&&(ea.url=ea.url.substr(0,ea.url.length-1));if(/GET/i.test(ea.method)&&'undefined'!=typeof G){r='?';N=N[u].url;O=[];D=0;for(let C in ea.param)-1<P.reservedParams.indexOf(C)||(new RegExp(ea.param[C])).test(N)||'undefined'==typeof G[C]||(r+=C+'='+encodeRFC5987ValueChars(G[C])+'&',O[D]=G[C],++D);for(let C in G)-1<P.reservedParams.indexOf(C)||'undefined'!=typeof ea.requirements[C]||
+-1<O.indexOf(C)||(r='object'==typeof G[C]?r+(C+'='+encodeRFC5987ValueChars(JSON.stringify(G[C]))+'&'):r+(C+'='+G[C]+'&'));D=O=N=null;1<r.length&&(r=r.substring(0,r.length-1),ea.url+=r);r=null}ea.toUrl=function(C){var m=null;/^redirect$/i.test(this.param.control)&&(m=P.getUrlProps(this.bundle,Ea||GINA_ENV));var z=this.webroot||m.webroot;m=this.hostname||m.hostname;var y=this.url;this.url='undefined'!=typeof C&&1==C?y.replace(z,'/'):y;return m+this.url};ea.request=function(C,m){var z=null,y=null;'function'==
+typeof arguments[arguments.length-1]&&(z=arguments[arguments.length-1]);'object'==typeof arguments[2]&&(y=arguments[2]);var H=this.webroot||y.webroot,v=this.hostname||y.hostname;y='undefined'!=typeof C&&1==C?path.replace(H,'/'):this.url||y.url;v=/^https/.test(v)?'https':'http';A?window.open(y,'undefined'!=typeof m&&'undefined'!=typeof m.target?m.target:'_self'):('undefined'==typeof m.agent&&(m.agent=!1),v=require(''+v),H=function(w){var F='',J=!1;w.on('data',function(T){F+=T});w.on('error',function(T){J=
+'Failed to get mail content';T&&'undefined'!=typeof T.stack?J+=T.stack:'string'==typeof T&&(J+='\n'+T)});w.on('end',function(){if(/^\{/.test(F))try{F=JSON.parse(F),'undefined'!=typeof F.error&&(J=JSON.clone(F),F=null)}catch(T){J=T}J?z(J):z(!1,F)})},z?v.get(y,m,H):v.get(y,m))};/:/.test(ea.url)&&(G=ea.url.match(/(:(.*)\/|:(.*)$)/g).map(function(C){return C.replace(/\//g,'')}).join(', '),O='[ RoutingHelper::getRoute(rule[, bundle, method]) ] : route [ %r ] param placeholder not defined: `'+ea.url+'` !\n Check your route description to compare requirements against param variables [ '+
 G+']',O=O.replace(/%r/,u),console.warn(Error(O)));return ea};P.getRouteByUrl=function(u,G,r,ea,Ea){2==arguments.length&&'undefined'!=typeof arguments[1]&&-1<P.allowedMethods.indexOf(arguments[1].toLowerCase())&&(r=arguments[1],G=void 0);var N=null,O=null,D=null,C=null,m=null,z=null;if(/#/.test(u)&&1<u.length){var y=u.split(/#/);u=y[0];m='#'+y[1];y=null}1==arguments.length&&'undefined'!=typeof arguments[0]&&(/^(https|http)/i.test(u)||/^\//.test(u)||(u='/'+u),N='/'+u.split(/\//g)[1],A&&(C=gina.config.reverseRouting,
 D=gina.config.routing),'undefined'!=typeof C[N]&&(y=D[C[N]],G=y.bundle,N=y.webroot,z=y.hostname,y=null));Ea='boolean'!=typeof arguments[arguments.length-1]?!1:arguments[arguments.length-1];var H=!1,v=null,w=null,F=v=w=null;y='undefined'!=typeof r?!0:!1;A?(v=window.gina.config,G='undefined'!=typeof G?G:v.bundle,w=v.env,D=D||v.getRouting(G),C=C||v.reverseRouting,isXMLRequest='undefined'!=typeof isXMLRequest?isXMLRequest:!1,z=z||v.hostname,N=N||v.webroot,ea={routing:{},method:r,params:{},url:u}):(v=
 getContext('gina').config,G='undefined'!=typeof G?G:v.bundle,w=v.env,D=v.getRouting(G),z=v.envConf[G][w].hostname,N=v.envConf[G][w].server.webroot,ea||={routing:{},isXMLRequest:!1,method:'undefined'!=typeof r?r.toLowerCase():'get',params:{},url:u},Ea&&(ea.method=r),isXMLRequest=ea.isXMLRequest||!1);w=u.replace(new RegExp('^('+z+'|'+z.replace(/:\d+/,'')+')'),'');'undefined'==typeof ea.routing.path&&(ea.routing.path=decodeURI(w));r='undefined'!=typeof r?r.toLowerCase():'get';y&&(ea.originalMethod=ea.method,