gina 0.1.6-alpha.21 → 0.1.6-alpha.22

package/framework/{v0.1.6-alpha.21 → v0.1.6-alpha.22}/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.21/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.22/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":7,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.21/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.22/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","__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.21 → v0.1.6-alpha.22}/core/controller/controller.js

@@ -376,7 +376,7 @@ function SuperController(options) {
             var isSpecialCase = (
                     getContext('bundle') != _config.bundle
                     && requestPort != hostPort
-                    && local.req.headers[':host'] != process.env.PROXY_HOST
+                    && local.req.headers[':host'] != process.gina.PROXY_HOST
             ) ? true : false;
 
             if (isSpecialCase) {
@@ -949,7 +949,7 @@ function SuperController(options) {
                 typeof(local.req.headers['x-nginx-proxy']) != 'undefined'
                 && /^true$/i.test(local.req.headers['x-nginx-proxy'])
                 ||
-                typeof(process.env.PROXY_HOSTNAME) != 'undefined'
+                typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
             ) ? true : false;
 
 
@@ -1791,7 +1791,7 @@ function SuperController(options) {
         var isSpecialCase = (
                 getContext('bundle') != local.options.conf.bundle
                 && requestPort != hostPort
-                && local.req.headers[':host'] != process.env.PROXY_HOST
+                && local.req.headers[':host'] != process.gina.PROXY_HOST
         ) ? true : false;
 
         if (isSpecialCase) {
@@ -1804,7 +1804,7 @@ function SuperController(options) {
             && !isSpecialCase
         ) {
 
-            hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']||process.env.PROXY_HOST);
+            hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']||process.gina.PROXY_HOST);
 
             if (
                 !/^(80|443)$/.test(requestPort)
@@ -2177,13 +2177,13 @@ function SuperController(options) {
                 typeof(local.req.headers['x-nginx-proxy']) != 'undefined'
                 && /^true$/i.test(local.req.headers['x-nginx-proxy'])
                 ||
-                typeof(process.env.PROXY_HOSTNAME) != 'undefined'
+                typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
             ) ? true : false;
 
 
 
             var hostname = (isProxyHost)
-                    ? process.env.PROXY_HOSTNAME
+                    ? process.gina.PROXY_HOSTNAME
                     : ctx.config.envConf[bundle][env].hostname;
 
             // var hostname = (isProxyHost)
@@ -3751,8 +3751,8 @@ function SuperController(options) {
             getContext('isProxyHost')
             && typeof(tmp.hostname) != 'undefined'
         ) {
-            tmp.hostname    = process.env.PROXY_HOSTNAME;
-            tmp.host        = process.env.PROXY_HOST;
+            tmp.hostname    = process.gina.PROXY_HOSTNAME;
+            tmp.host        = process.gina.PROXY_HOST;
             // tmp.hostname    = getContext('gina').config.envConf._proxyHostname
             // tmp.host        = tmp.hostname.replace(/^(https|http)\:\/\//, '');
         }

package/framework/{v0.1.6-alpha.21 → v0.1.6-alpha.22}/core/gna.js

@@ -229,8 +229,8 @@ if ( proxyPathObj.existsSync() ) {
     }
 
     if (proxy) {
-        gna.proxyHostname   = process.env.PROXY_HOSTNAME    = proxy.hostname;
-        gna.proxyHost       = process.env.PROXY_HOST        = proxy.hostname
+        gna.proxyHostname   = process.gina.PROXY_HOSTNAME    = proxy.hostname;
+        gna.proxyHost       = process.gina.PROXY_HOST        = proxy.hostname
                                                                     .replace(/^(https|http)\:\/\//g, '')
                                                                     .replace(/\:\d+\/$|\:\d+$/, '')
         ;
@@ -255,7 +255,13 @@ if ( proxyPathObj.existsSync() ) {
             }
             foundScheme = null;
         }
-        gna.proxyPort       = process.env.PROXY_PORT        = parseInt(proxyPort)
+        gna.proxyPort       = process.gina.PROXY_PORT        = parseInt(proxyPort);
+
+        var isProxyHost = (
+            typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
+        ) ? true : false;
+        // Forcing context - also available for workers
+        setContext('isProxyHost', isProxyHost);
     }
 }
 

package/framework/{v0.1.6-alpha.21 → v0.1.6-alpha.22}/core/router.js

@@ -178,7 +178,7 @@ function Router(env, scope) {
             typeof(request.headers['x-nginx-proxy']) != 'undefined'
             && /^true$/i.test(request.headers['x-nginx-proxy'])
             ||
-            typeof(process.env.PROXY_HOSTNAME) != 'undefined'
+            typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
         ) ? true : false;
 
         setContext('isProxyHost', isProxyHost);

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

@@ -862,7 +862,7 @@ function Routing() {
             }
 
             isProxyHost = getContext('isProxyHost');
-            // isProxyHost = ( _isProxyHost && /^true$/i.test(_isProxyHost) ) ? true : (( typeof(process.env.PROXY_HOSTNAME) != 'undefined' ) ? true : false);
+            // isProxyHost = ( _isProxyHost && /^true$/i.test(_isProxyHost) ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false);
 
         }
 
@@ -910,8 +910,8 @@ function Routing() {
 
         route.isProxyHost = isProxyHost;
         if (isProxyHost) {
-            route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : process.env.PROXY_HOSTNAME;
-            // route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : config.envConf._proxyHostname || process.env.PROXY_HOSTNAME;
+            route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : process.gina.PROXY_HOSTNAME;
+            // route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : config.envConf._proxyHostname || process.gina.PROXY_HOSTNAME;
             route.host      = route.hostname.replace(/^(https|http)\:\/\//, '');
         }
 

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

@@ -84,7 +84,7 @@ function SwigFilters(conf) {
 
         var url     = null
             , prop  = self.options.envObj.getConf(obj, options.conf.env)
-            , isProxyHost  = ( ctx.isProxyHost && /^true$/i.test(ctx.isProxyHost) ) ? true : (( typeof(process.env.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
+            , isProxyHost  = ( ctx.isProxyHost && /^true$/i.test(ctx.isProxyHost) ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
         ;
         if ( isProxyHost ) {
             url = prop.server.scheme + '://'+ prop.host;
@@ -149,7 +149,7 @@ function SwigFilters(conf) {
             , wrootRe           = null
             , isStandalone      = null
             , isMaster          = null
-            , isProxyHost       = ( ctx.isProxyHost && /^true$/i.test(ctx.isProxyHost) ) ? true : (( typeof(process.env.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
+            , isProxyHost       = ( ctx.isProxyHost && /^true$/i.test(ctx.isProxyHost) ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
             , routingRules      = null
             , rule              = null
             , url               = NaN
@@ -209,14 +209,14 @@ function SwigFilters(conf) {
                     hostname        = config.hostname + config.server.webroot;
 
                     scheme          = hostname.match(/^(https|http)/)[0];
-                    requestPort = (ctx.req.headers.port||ctx.req.headers[':port']||parseInt(process.env.PROXY_PORT));
+                    requestPort = (ctx.req.headers.port||ctx.req.headers[':port']||parseInt(process.gina.PROXY_PORT));
                     var hostPort = config.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
-                            && ctx.req.headers[':host'] != process.env.PROXY_HOST
+                            && ctx.req.headers[':host'] != process.gina.PROXY_HOST
                     ) ? true : false;
 
                     if (isSpecialCase) {
@@ -229,7 +229,7 @@ function SwigFilters(conf) {
                         && !isSpecialCase
                     ) {
 
-                        hostname    = scheme + '://'+ (ctx.req.headers.host||ctx.req.headers[':host']||process.env.PROXY_HOST);
+                        hostname    = scheme + '://'+ (ctx.req.headers.host||ctx.req.headers[':host']||process.gina.PROXY_HOST);
 
                         if (
                             !/^(80|443)$/.test(requestPort)

package/package.json

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

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

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

package/framework/v0.1.6-alpha.21/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.21/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}