gina 0.1.6-alpha.65 → 0.1.6-alpha.66

package/framework/{v0.1.6-alpha.65 → v0.1.6-alpha.66}/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.6-alpha.65/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.66/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":8,
 "mappings":"AAeAA,MAAA,CAAA,eAAA,CAA8BA,MAAA,CAAA,MAC9BA,OAAA,CAAA,WAAA,CAA8B,IAE9BA;MAAA,CAAA,YAAA,CAA8B,QAAQ,CAACC,CAAD,CAAO,CAEzC,GAAI,CAACA,CAAL,CAEI,MAAO,CAAA,CAGX,IAAKA,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,MAAc,8BARa,CAU3B,aAAmB,QAASA,CAAAA,IAAT,CAAc,qCAAd,CAAF,CAA2D,CAAA,CAA3D,CAAkE,CAAA,CAVxD,CAY3B,kBAAwB,QAASA,CAAAA,IAAT,CAAc,0CAAd,CAAF,CAAgE,CAAA,CAAhE,CAAuE,CAAA,CAZlE,CAc3B,YAAkB,QAASA,CAAAA,IAAT,CAAc,oCAAd,CAAF,CAA0D,CAAA,CAA1D,CAAiE,CAAA,CAdtD,CAgB3B,SAAY,iCAhBe;AAkB3B,QAAWC,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,gCAAnB,CAAX,CAlBgB,CAoB3B,eAAkBF,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,uCAAnB,CAAX,CApBS,CAwB3BC,QAAU,gCAxBiB,CA0B3B,QAAY,gCA1Be,CA4B3B,SAAa,iCA5Bc,CA+B1B,UAAUJ,CAAAA,IAAV,CAAeD,CAAQM,CAAAA,CAAvB,CAAL,GAEIN,CAAA,CAAA,SAEA,CAFuBD,CAAA,CAAA,MAAA,CAAA,SAEvB,CAFqD,kCAErD,CAAAC,CAAA,CAAA,aAAA,CAA2BD,CAAA,CAAA,MAAA,CAAA,aAA3B,CAA8D,sCAJlE,CAiCAA,EAAA,CAAA,OAAA,CAAkB,CAEd,GAA0B,4BAFZ,CAId,gBAA0B,iCAJZ;AAMd,UAA0B,mCANZ,CAQd,aAA0B,sCARZ,CAUd,UAA0B,IAVZ,CAalBA,EAAA,CAAA,OAAgBQ,CAAAA,gBAAhB,CAAiC,SAAjC,CAA4C,QAAS,EAAG,CA9BpD,GA+BkBC,IA/Bb,CAAA,YAAL,CAAA,CA+BkBA,IA5Bb,CAAA,YAAL,EAA+D,QAA/D,EAA8B,MA4BZA,KA5BmB,CAAA,YAArC,GA4BkBA,IA3Bd,CAAA,YADJ,CAC4B,IAAIC,IAAJ,CA2BVD,IA3BmB,CAAA,YAAT,CAD5B,CA4BkBA,KAzBb,CAAA,SAAL,EAAyD,QAAzD,EAA2B,MAyBTA,KAzBgB,CAAA,SAAlC,GAyBkBA,IAxBd,CAAA,SADJ,CACyB,IAAIC,IAAJ,CAwBPD,IAxBgB,CAAA,SAAT,CADzB,CAyBkBA,KAtBb,CAAA,eAAL,EAAqE,QAArE,EAAiC,MAsBfA,KAtBsB,CAAA,eAAxC,GAsBkBA,IArBd,CAAA,eADJ,CAC+BE,QAAA,CAqBbF,IArBsB,CAAA,eAAT,CAD/B,CAsBkBA,KAnBlB,CAAA,SAAA;AAAqB,IAAIC,IAAJ,CAAyCE,CAAhC,IAAIF,IAAJ,CAmBZD,IAnBqB,CAAA,YAAT,CAAgCG,EAAAA,OAAhC,EAAT,CAmBHH,IAnBwD,CAAA,eAArD,CAErB,KAAA,EAiBkBA,IAjBX,CAAA,SAAP,CAA4B,IAAIC,IAdhC,CAAA,IACI,EAAA,CAAO,IA8BX,OAAO,EAD6C,CAAxD,CAIAV,EAAA,CAAA,OAAgBa,CAAAA,OAWhBb,EAAA,CAAA,MAAA,CAAA,UAAA,CAA+B,QAAQ,CAACc,CAAD,CAAS,CAE5C,GAAuB,WAAvB,EAAK,MAAOA,EAAZ,CACI,MAAOd,EAAA,CAAA,MAAA,CAAA,OAGX,KAAIe,EAAc,EAAlB,CACIC,EAAchB,CAAA,CAAA,MAAA,CAAA,OACdiB,EAAAA,CAAK,IAAIC,MAAJ,CAAW,KAAX,CAAmBJ,CAAnB,CAA4BK,MAAOC,CAAAA,YAAP,CAAoB,EAApB,CAA5B,CAGT,KAAKC,IAAIA,CAAT,GAAkBL,EAAlB,CACSC,CAAGf,CAAAA,IAAH,CAAQmB,CAAR,CAAL,GACIN,CAAA,CAAOM,CAAP,CADJ,CACoBL,CAAA,CAAQK,CAAR,CADpB,CAKJ,OAA4B,EAArB,CAACN,CAAA,CAAA,KAAA,EAAD,CAA0BA,CAA1B,CAAmC,IAjBE,CAqBhDhB,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;AACI,MAAOoB,SAASC,CAAAA,MADpB,EAC8C,SAAWrB,CAAAA,IAAX,CAAgBoB,QAASC,CAAAA,MAAzB,CAD9C,EAGI,CAACD,QAASC,CAAAA,MAHd,EAGwB,IAAKrB,CAAAA,IAAL,CAAUoB,QAASE,CAAAA,IAAnB,CAHxB,CAIE,CAEE,IAAID,EAAiCE,CAAvB,GAAuBA,CAAjBH,QAASC,CAAAA,MAAQE,EAAAA,KAAxB,CAA8B,CAA9B,CACT,EAACF,CAAL,EAAe,IAAKrB,CAAAA,IAAL,CAAUoB,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,IACI3B,MAAA,CAAA,eADJ,CACgCC,CAAA,CAAA,MAAA,CAAA,QADhC,CAC+D,SAAUE,CAAAA,IAAV,CAAe4B,CAAA,CAAQ,CAAR,CAAWC,CAAAA,KAAX,CAAiB,GAAjB,CAAA,CAAuB,CAAvB,CAAf,CAAF,CAAgD,CAAA,CAAhD,CAAsD,CAAA,CADnH,CAIAR,EAAA,CADAO,CACA,CADU,IAbZ,CAiBF9B,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,MAAO2B,CAAP,CAAY,CACV,KAAMA,EAAN,CADU,CAMVC,CAAAA;AAAc,IAKdC,EAAAA,CAAcC,QAASC,CAAAA,IAAKC,CAAAA,oBAAd,CAAmC,MAAnC,CAOlB,KA1KyC,IAoKnCC,EAAY,CApKuB,CAqKnCC,EAAYL,CAAML,CAAAA,MArKiB,CAsKnCW,EAAY,CAAA,CAtKuB,CAuKnCvB,EAAgBC,MAAJ,CARAuB,8BAQA,CAGlB,CAAOH,CAAP,CAAWC,CAAX,CAAgB,EAAED,CAAlB,CACI,GAAKrB,CAAGf,CAAAA,IAAH,CAAQgC,CAAA,CAAMI,CAAN,CAASd,CAAAA,IAAjB,CAAL,CAA8B,CAC1BgB,CAAA,CAAQ,CAAA,CACR,MAF0B,CAQlCvB,CAAA,CADAsB,CACA,CAFAD,CAEA,CAHAJ,CAGA,CAHU,IAKLM,EAAL,GACIP,CAsBA,CAtBkBE,QAASO,CAAAA,aAAT,CAAuB,MAAvB,CAsBlB,CArBAT,CAAKT,CAAAA,IAqBL,CArBkBvB,CAAA,CAAA,OAqBlB,CA7CcwC,8BA6Cd,CApBAR,CAAKU,CAAAA,KAoBL,CApBkB,QAoBlB,CAnBAV,CAAKW,CAAAA,GAmBL,CAnBkB,YAmBlB,CAlBAX,CAAKY,CAAAA,IAkBL,CAlBkB,UAkBlB,CAfIC,CAeJ,CAfcX,QAASE,CAAAA,oBAAT,CAA8B,MAA9B,CAAA,CAAsC,CAAtC,CAed,CAbA,CADIU,CACJ,CADoBD,CAAQT,CAAAA,oBAAR,CAA6B,MAA7B,CACpB,GAEuC,WAFvC,EAEO,MAAOU,EAAclB,CAAAA,MAF5B,EAG8B,CAH9B,CAGOkB,CAAclB,CAAAA,MAHrB,EAMImB,OAAQC,CAAAA,KAAR,CAAc,eAAd,CACA,CAAAH,CAAQI,CAAAA,YAAR,CAAqBjB,CAArB,CAA2Bc,CAAA,CAAc,CAAd,CAA3B,CAPJ,GASIC,OAAQC,CAAAA,KAAR,CAAc,cAAd,CACA;AAAAH,CAAQK,CAAAA,WAAR,CAAoBlB,CAApB,CAVJ,CAaA,CAAAa,CAAA,CADAC,CACA,CADgB,IAtBpB,CA2BK,UAAU7C,CAAAA,IAAV,CAAeD,CAAA,CAAA,QAAf,CAAL,GACQmD,CACJ,CAD0BrD,MAAA,CAAA,OAAA,CAAkB,cAAlB,CAC1B,CAAAA,MAAA,CAAA,WAAA,CAA0B,IAAIqD,CAFlC,CAKA,OAAO,CAAA,CArNkC;",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.65/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.66/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","isProxyHost","__defineGetter__","_this","Date","parseInt","getTime","timeout","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","headEls","existingLinks","console","debug","insertBefore","appendChild","Toolbar"]
 }

package/framework/{v0.1.6-alpha.65 → v0.1.6-alpha.66}/core/controller/controller.js

@@ -978,10 +978,42 @@ function SuperController(options) {
             ) ? true : false;
 
 
+
+            // var ctx = getContext('gina');
+            // var _config = ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV];
+            // // by default
+            // var hostname    = _config.hostname + _config.server.webroot;
+            // var scheme      = hostname.match(/^(https|http)/)[0];
+            // var requestPort = (local.req.headers.port||local.req.headers[':port']);
+
+            // var hostPort = hostname.match(/(\:d+\/|\:\d+)$/);
+            // hostPort = (hostPort) ? ~~(hostPort[0].replace(/\:/g, '')) : _config.port[_config.server.protocol][_config.server.scheme];
+            // // Linking bundle B from bundle A wihtout proxy
+            // var isSpecialCase = (
+            //         getContext('bundle') != _config.bundle
+            //         && requestPort != hostPort
+            //         && local.req.headers[':host'] != process.gina.PROXY_HOST
+            // ) ? true : false;
+
+            // if (isSpecialCase) {
+            //     hostname = _config.hostname;
+            // }
+            // if (
+            //     typeof(ctx.config.envConf._proxyHostname) == 'undefined'
+            //     ||
+            //     hostname != ctx.config.envConf._proxyHostname
+            // ) {
+            //     ctx.config.envConf._proxyHostname = (isProxyHost) ? hostname : null;
+            //     ctx.config.envConf._isRoutingUpdateNeeded = true;
+            // }
+
+
             // setup swig default filters
             var filters = SwigFilters({
                 options     : JSON.clone(localOptions),
                 isProxyHost : isProxyHost,
+                // _proxyHostname: ctx.config.envConf._proxyHostname,
+                // _isRoutingUpdateNeeded: ctx.config.envConf._isRoutingUpdateNeeded,
                 throwError  : self.throwError,
                 req         : local.req,
                 res         : local.res

package/framework/{v0.1.6-alpha.65 → v0.1.6-alpha.66}/core/server.isaac.js

@@ -183,8 +183,8 @@ function ServerEngineClass(options) {
             ) {
                 // Restoring non-proxied mode
                 isProxyHost = false;
-                delete process.gina.PROXY_HOSTNAME;
-                delete process.gina.PROXY_HOST;
+                // delete process.gina.PROXY_HOSTNAME;
+                // delete process.gina.PROXY_HOST;
                 setContext('isProxyHost', isProxyHost);
             }
             // healthcheck

package/framework/{v0.1.6-alpha.65 → v0.1.6-alpha.66}/lib/routing/src/main.js

@@ -910,8 +910,8 @@ function Routing() {
 
         route.isProxyHost = isProxyHost;
         if (isProxyHost) {
-            // route.proxy_hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : (process.gina.PROXY_HOSTNAME||config.envConf._proxyHostname);
-            route.proxy_hostname  = (isGFFCtx) ? window.location.protocol +'//'+ document.location.hostname : (process.gina.PROXY_HOSTNAME||config.envConf._proxyHostname);
+            // route.proxy_hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : (proxy.env.NODE_PROXY||process.gina.PROXY_HOSTNAME||config.envConf._proxyHostname);
+            route.proxy_hostname  = (isGFFCtx) ? window.location.protocol +'//'+ document.location.hostname : (proxy.env.NODE_PROXY||process.gina.PROXY_HOSTNAME||config.envConf._proxyHostname);
             route.proxy_host      = route.proxy_hostname.replace(/^(https|http)\:\/\//, '');
         }
 

package/framework/{v0.1.6-alpha.65 → v0.1.6-alpha.66}/lib/swig-filters/src/main.js

@@ -288,7 +288,7 @@ function SwigFilters(conf) {
 
         } catch (routingErr) {
             url = '404:['+ ctx.req.method +']'+rule;
-            console.error('[swig-filter] Routing Exception on route "', rule, '" \n', routingErr.stack);
+            console.error('[swig-filter] Routing Exception on route "', rule, '" \n', 'isProxy: '+ isProxyHost +'\n', 'process.gina.PROXY_HOSTNAME: '+ process.gina.PROXY_HOSTNAME +'\n' , routingErr.stack);
         }
 
 

package/package.json

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

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

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

package/framework/v0.1.6-alpha.65/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

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