gina 0.1.6-alpha.145 → 0.1.6-alpha.147

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/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.145/core/asset/plugin/../../deps/swig-1.4.2/dist/swig.min.js",
+"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",
 "lineCount":7,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.145/core/asset/plugin/../../deps/swig-1.4.2/bin/swig.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.147/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.145 → v0.1.6-alpha.147}/core/gna.js

@@ -521,6 +521,7 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
     if ( !fs.existsSync(mountingPath) ) {
         new _(mountingPath).mkdirSync();
     }
+    // /tmp
     var tmpPath = getPath('project') + '/tmp';
     console.debug('tmp path: ', tmpPath);
     var tmpPathObj = new _(tmpPath);
@@ -528,6 +529,16 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
         tmpPathObj.mkdirSync();
     }
     tmpPathObj = null;
+
+    // cache
+    var cachePath = getPath('project') + '/cache';
+    console.debug('cache path: ', cachePath);
+    var cachePathObj = new _(cachePath);
+    if ( !cachePathObj.existsSync() ) {
+        cachePathObj.mkdirSync();
+    }
+    cachePathObj = null;
+
     var sourceObj = new _(source);
     var targetObj = new _(target);
 
@@ -632,6 +643,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
             console.debug('[ FRAMEWORK ] Bootstrap Initialization... ');
             gna.initialized = true;
+
             e.once('init', function(instance, middleware, conf) {
 
                 var configuration = config.getInstance();

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/core/plugins/lib/validator/src/main.js

@@ -99,6 +99,7 @@ function ValidatorPlugin(rules, data, formId) {
     //var Collection      = (isGFFCtx) ? require('lib/collection') : require('../../../../../lib/collection');
     var routing         = (isGFFCtx) ? require('lib/routing') : require('../../../../../lib/routing');
 
+
     /** definitions */
     var instance    = {
         'id'                : 'validator-' + uuid.v4(),
@@ -4160,9 +4161,7 @@ function ValidatorPlugin(rules, data, formId) {
             throw new Error('Validator::bindForm($target, customRule) could not bind form `'+ $target +'`\n'+err.stack );
         }
 
-        console.debug('binding for: '+ _id);
-
-
+        // console.debug('binding for: '+ _id);
         var withRules = false, rule = null, evt = '', proceed = null;
 
         if (
@@ -5867,7 +5866,7 @@ function ValidatorPlugin(rules, data, formId) {
                     && typeof($submit.form.id) != 'undefined'
                     && $form.id == $submit.form.id
                 ) {
-                    console.debug('attching submitTrigger: '+ $submit.id, ' \ form id: '+ $form.id);
+                    // console.debug('attaching submitTrigger: '+ $submit.id, ' \ form id: '+ $form.id);
                     instance.$forms[$form.id].submitTrigger = $form.submitTrigger = $submit.id || $submit.getAttribute('id');
                     // mark submitTrigger
                     $submit.dataset.ginaFormSubmitTriggerFor = $form.id;
@@ -7361,5 +7360,5 @@ if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     module.exports  = ValidatorPlugin
 } else if ( typeof(define) === 'function' && define.amd) {
     // Publish as AMD module
-    define('gina/validator', ['utils/events', 'utils/dom', 'utils/effects', 'utils/data', 'lib/form-validator'], function(){ return ValidatorPlugin })
+    define('gina/validator', ['utils/events', 'utils/dom', 'utils/effects', 'utils/data', 'lib/form-validator', 'lib/routing'], function(){ return ValidatorPlugin })
 }

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

@@ -4,14 +4,16 @@
  *
  */
 const fs                    = require('fs');
+const { execSync }          = require('child_process');
 const {EventEmitter}        = require('events');
 const Eio                   = require('engine.io');
-
+// const zlib                  = require('zlib'); // gzip / deflate
 
 const lib               = require('./../lib');
 const inherits          = lib.inherits;
 const merge             = lib.merge;
 const console           = lib.logger;
+const Collection        = lib.Collection;
 
 
 const env               = process.env.NODE_ENV
@@ -71,22 +73,140 @@ function ServerEngineClass(options) {
         , acceptEncoding    = null
     ;
 
-    var localAssets = null;
+    var localAssets             = null
+        , cachedAssets          = null
+        , cachePathObj          = null
+        , localCachePathObj     = null
+    ;
     try {
+        // Adding cache directory if not found
+        cachePathObj = new _(options.cachePath, true);
+        localCachePathObj = new _(options.cachePath +'/'+ options.bundle, true);
+        if ( !cachePathObj.existsSync() ) {
+            cachePathObj.mkdirSync();
+        }
+        // Empty cache for cahceless envs
+        if ( options.isCacheless && localCachePathObj.existsSync() ) {
+            localCachePathObj.rmSync();
+        }
+        // For frontend template routing if needed
+        // TODO - Used `options.routing` instead after having filtered `options.allRoutes` vs `options.formsRules` to use only external routes exposed by `"query"` validation
+        var _routing = JSON.clone(options.allRoutes);
+        // var _routing = JSON.clone(options.routing);
+        for (let rule in _routing) {
+            if ( typeof(_routing[rule]._comment) != 'undefined' ) {
+                delete _routing[rule]._comment;
+            }
+            if ( typeof(_routing[rule].middleware) != 'undefined' ) {
+                delete _routing[rule].middleware;
+            }
+
+            // reverseRouting in done on te frontend side
+
+        }// EO for (let rule in _routing)
+
+        // Checking if brotli is installed
+        var brotliBin = null;
+        try {
+            brotliBin = execSync( 'which brotli' ).toString().trim();
+        } catch (binErr) {
+            // Means that it is not installed.
+        }
+        // Checking if gzip is installed
+        var gZipBin = null;
+        try {
+            gZipBin = execSync( 'which gzip' ).toString().trim();
+        } catch (binErr) {
+            // Means that it is not installed.
+        }
+
+        // Caching routing
+        let targetDir   = _(options.cachePath +'/'+ options.bundle +'/config', true);
+        let targetDirObj = new _(targetDir, true);
+        if ( ! targetDirObj.existsSync() ) {
+            targetDirObj.mkdirSync();
+        }
+        let targetFile  = null
+            , fd        = null
+            , buffer    = null
+            , cmd       = null
+            , brFileObj = null
+            , gzFileObj = null
+        ;
+        if (_routing) {
+            targetFile  = 'routing.json';
+            // Storing to disk
+            console.debug(`Writing ${targetFile} to: ${targetDir}/${targetFile}`);
+            fd = fs.openSync(targetDir +'/'+ targetFile, 'w'); // Open file for writing
+            buffer = Buffer.from( JSON.stringify(_routing) );
+            fs.writeSync(fd, buffer, 0, buffer.length, 0); // Write the buffer
+            fs.closeSync(fd); // Close the file descriptor
+
+            // Adding brotli version
+            // To enblable this feature, you need to install brotli on the host
+            // [ Mac Os X ] brew install brotli
+            // [ Debian/Ubuntu ] sudo apt install brotli
+            try {
+                if (brotliBin) {
+                    brFileObj = new _(targetDir +'/'+ targetFile +'.br');
+                    // Removing existing
+                    if ( brFileObj.existsSync() ) {
+                        brFileObj.rmSync();
+                    }
+                    // Creating a new br version
+                    cmd = brotliBin +' --best '+ _(targetDir +'/'+ targetFile, true);
+                    console.debug( execSync( cmd ).toString() );
+                }
+            } catch (brError) {
+                console.error('[ SERVER ] '+ brError.stack);
+            }
+
+            // Adding GZip version
+            // To enblable this feature, you need to install gzip on the host
+            // [ Mac Os X ] brew install gzip
+            // [ Debian/Ubuntu ] sudo apt install gzip
+            try {
+                if (gZipBin) {
+                    gzFileObj = new _(targetDir +'/'+ targetFile +'.gz');
+                    // Removing existing
+                    if ( gzFileObj.existsSync() ) {
+                        gzFileObj.rmSync();
+                    }
+                    // Creating a new br version
+                    cmd = gZipBin +' -9 -k '+ _(targetDir +'/'+ targetFile, true);
+                    console.debug( execSync( cmd ).toString() );
+                }
+            } catch (gzError) {
+                console.error('[ SERVER ] '+ gzError.stack);
+            }
+        }
+
+
+        buffer = null;
+        fd = null;
+
+
+        // TODO - Make a br or a gz file asside here
         localAssets = [
             {
                 file    : 'public_suffix_list.dat',
                 path    : getPath('gina').lib +'/domain/dist',
                 mime    : 'text/plain; charset=utf8'
+            },
+            {
+                file    : 'routing.json',
+                path    : targetDir,
+                mime    : 'application/json; charset=utf8'
             }
         ];
         for (let i=0, len=localAssets.length; i<len; i++) {
-            let fileName  =  _(localAssets[i].path +'/'+ localAssets[i].file, true)
-            localAssets[i].content = readSync(fileName);
-        }
+            let fileName  =  _(localAssets[i].path +'/'+ localAssets[i].file, true);
+            localAssets[i].content = readSync(fileName, 'utf8');
+        }// EO for localAssets
+
     } catch (assetsError) {
         // TODO - Reuse the default or the project 404 page
-        fileContent = 'Not found';
+        // fileContent = 'Not found';
         console.error('[ SERVER ] '+ assetsError.stack);
     }
 
@@ -188,6 +308,8 @@ function ServerEngineClass(options) {
             , requestHost       = null
             , isBinary          = null
             , isCacheless       = options.isCacheless
+            , assetsCollection  = new Collection(localAssets)
+            , localAsset        = null
         ;
 
 
@@ -206,7 +328,7 @@ function ServerEngineClass(options) {
             // Proxy detection
             isProxyHost = getContext('isProxyHost') || false;
             requestHost = request.headers.host || request.headers[':authority'];
-            console.debug('[PROXY_HOST][isProxyHost='+ isProxyHost +'] request.headers.host -> ' + request.headers.host + '  VS request.headers[":authority"] '+ request.headers[':authority'] +' | '+ request.url);
+            // console.debug('[PROXY_HOST][isProxyHost='+ isProxyHost +'] request.headers.host -> ' + request.headers.host + '  VS request.headers[":authority"] '+ request.headers[':authority'] +' | '+ request.url);
             if (
                 !isProxyHost
                 && !/\:[0-9]+$/.test(requestHost)
@@ -221,7 +343,7 @@ function ServerEngineClass(options) {
                 if (request.headers['x-forwarded-host']) {
                     process.gina.PROXY_HOSTNAME = request.headers['x-forwarded-proto'] +'://'+ request.headers['x-forwarded-host'];
                     process.gina.PROXY_HOST     = request.headers['x-forwarded-host'];
-                    console.debug('[PROXY_HOST][X-FORWARDED-PROTO] override request.headers["x-forwarded-host"] -> ' + request.headers['x-forwarded-host']);
+                    // console.debug('[PROXY_HOST][X-FORWARDED-PROTO] override request.headers["x-forwarded-host"] -> ' + request.headers['x-forwarded-host']);
                 }
                 // Forcing context - also available for workers
                 setContext('isProxyHost', true);
@@ -258,19 +380,23 @@ function ServerEngineClass(options) {
             }
 
 
-            if ( /^get$/i.test(request.method) && /\_gina\/assets\/public_suffix_list.dat$/i.test(request.url) ) {
+            if (
+                /^get$/i.test(request.method) && /\_gina\/assets\/public_suffix_list.dat$/i.test(request.url)
+                ||
+                /^get$/i.test(request.method) && /\_gina\/assets\/routing\.json$/i.test(request.url)
+            ) {
                 // server.toApi(reques, response)
                 // console.debug('[ SERVER ][200] '+ request.url);
-
-                response.setHeader('content-type', localAssets[0].mime);
+                localAsset = assetsCollection.findOne({ file: request.url.split(/\//g).slice(-1).toString() });
+                response.setHeader('content-type', localAsset.mime);
                 response.setHeader('vary', 'Origin');
-                response.setHeader('cache-control', 'public,max-age=86400');
+                response.setHeader('cache-control', 'public, max-age=86400');
                 response.setHeader('x-content-type-options', 'nosniff');
                 response.setHeader('x-frame-options', 'DENY');
                 response.setHeader('x-xss-protection', '1; mode=block');
                 response.setHeader('x-powered-by', 'Gina/'+ GINA_VERSION);
 
-                var filename  =  _(localAssets[0].path +'/'+ localAssets[0].file, true);
+                var filename  =  _(localAsset.path +'/'+ localAsset.file, true);
                 if (acceptEncodingArr) {
                     for (let e=0, eLen=preferedEncoding.length; e<eLen; e++) {
                         if ( acceptEncodingArr && acceptEncodingArr.indexOf(preferedEncoding[e]) > -1 ) {
@@ -294,7 +420,7 @@ function ServerEngineClass(options) {
                 }
 
                 if (!isBinary) {
-                    return response.end(localAssets[0].content);
+                    return response.end(localAsset.content);
                 }
 
                 return fs.createReadStream(filename)

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

@@ -6,7 +6,6 @@ const EventEmitter  = require('events').EventEmitter;
 const swig          = require('./deps/swig-1.4.2');
 const Busboy        = require('./deps/busboy-1.6.0');
 const Stream        = require('stream');
-const zlib          = require('zlib'); // gzip / deflate
 const util          = require('util');
 var https           = require('https');
 const sslChecker    = require('ssl-checker');
@@ -62,8 +61,8 @@ function Server(options) {
 
         try {
             // Allows you to get a bundle web root
-            // swig.setFilter('getWebroot', filters.getWebroot);
-            // swig.setFilter('nl2br', filters.nl2br);
+            // 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]);
@@ -150,7 +149,10 @@ function Server(options) {
                         protocol            : options.conf[self.appName][self.env].server.protocol,
                         scheme              : options.conf[self.appName][self.env].server.scheme,
                         coreConfiguration   : options.conf[self.appName][self.env].server.coreConfiguration,
-                        isCacheless         : options.conf[self.appName][self.env].isCacheless
+                        isCacheless         : options.conf[self.appName][self.env].isCacheless,
+                        routing             : options.conf[self.appName][self.env].routing,
+                        allRoutes           : options.conf.routing,
+                        cachePath           : options.conf[self.appName][self.env].cachePath
                     }
             );
 
@@ -166,9 +168,10 @@ function Server(options) {
             ;
 
             // locking port & protocol so it can't be changed by the user's settings
-            self.conf[self.appName][self.env].server.protocol = serverOpt.protocol;
-            self.conf[self.appName][self.env].server.scheme = serverOpt.scheme;
-            self.conf[self.appName][self.env].server.engine = serverOpt.engine;
+            self.conf[self.appName][self.env].server.protocol   = serverOpt.protocol;
+            self.conf[self.appName][self.env].server.scheme     = serverOpt.scheme;
+            self.conf[self.appName][self.env].server.engine     = serverOpt.engine;
+            self.conf[self.appName][self.env].server.cachePath  = serverOpt.cachePath;
 
             serverOpt.port      = self.conf[self.appName][self.env].server.port = portsReverse[ self.appName +'@'+ self.projectName ][self.env][serverOpt.protocol][serverOpt.scheme];
             self.conf[self.appName][self.env].server.debugPort = getContext().debugPort;
@@ -339,6 +342,16 @@ function Server(options) {
             instance.getAssets          = getAssets;
             instance.completeHeaders    = completeHeaders;
 
+            if ( typeof(instance._cached) == 'undefined' ) {
+                instance._cached = {
+                    // Compiled templates
+                    templates: {}
+                }
+            }
+            if ( typeof(instance._cachedPath) == 'undefined' ) {
+                instance._cachePath = self.conf[self.appName][self.env].server.cachePath;
+            }
+
             router.setServerInstance(instance);
         }
 
@@ -1079,6 +1092,26 @@ 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
             assets = swig.compile( assetsStr.substring(1, assetsStr.length-1), swig.getOptions() )(data);
             return '{'+ assets +'}'
         } else {
@@ -1170,6 +1203,7 @@ function Server(options) {
 
             re = new RegExp(authority);
             allowedOrigin = ( typeof(conf.server.response.header['access-control-allow-origin']) != 'undefined' && conf.server.response.header['access-control-allow-origin'] != '' ) ? conf.server.response.header['access-control-allow-origin'] : authority;
+            // console.debug('[ server ][access-control-allow-origin] ', allowedOrigin);
             var found = null, origin = null, origins = null; // to handles multiple origins
 
             var originHostReplacement = function(name) {

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/core/template/conf/env.json

@@ -34,13 +34,12 @@
       "bundlesPath": "{homedir}/bundles",
       "bundlePath": "{bundlesPath}/{bundle}",
       "sharedPath": "{executionPath}/shared",
-      "cachePath": "{executionPath}/cache",
+      "cachePath": "{homedir}/cache",
       "connectorsPath": "{frameworkDir}/core/connectors",
       "cronsPath": "{bundlesPath}/{bundle}/crons",
       "modelsPath": "{bundlesPath}/{bundle}/models",
       "libPath": "{bundlesPath}/{bundle}/lib",
       "releases": "{homedir}/releases",
-      // "releases": "{executionPath}/releases",
       "sources": "{executionPath}/src",
       "tmpPath": "{executionPath}/tmp",
       "publicPath": "{bundlesPath}/{bundle}/public",

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/helpers/json/src/main.js

@@ -45,6 +45,7 @@ module.exports = function(){
                 delete require.cache[require.resolve(filename)];
             }
             jsonStr = fs.readFileSync(filename).toString();
+
         } catch (err) {
             if ( typeof(console.emerg) != 'undefined' ) {
                 console.emerg(err.stack);

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/helpers/path.js

@@ -1621,7 +1621,7 @@ function PathHelper() {
     setPath = function(name, path) {
 
         if ( !path || typeof(path) == 'undefined' || path == '' ) {
-            throw new Error('setPath(name, path): path cannot be empty or undefined')
+            throw new Error('setPath("'+ name +'", path): path cannot be empty or undefined')
         }
         // check if symlink to get realpath
         // var stats = fs.lstatSync(path);

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/helpers/prototypes.js

@@ -81,7 +81,14 @@ function PrototypesHelper(instance) {
         } else {
             // For unit tests
             if (!envVars) {
-                var ginaDir = process.cwd().match(/.*\/gina/)[0];
+                var ginaDir = null;
+                try {
+                    ginaDir = process.cwd().match(/.*\/gina/)[0];
+                } catch (ginaDirErr) {
+                    // running outside of gina
+                    ginaDir = __dirname +'/../../../';
+                }
+
                 require(ginaDir +'/utils/helper');
                 setEnvVar('GINA_DIR', ginaDir, true);
                 envVars = getEnvVars();

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/lib/cmd/framework/tail.js

@@ -224,7 +224,7 @@ function Tail(opt, cmd) {
                                     project= bundleDesc[2];
                                 } // else, must be `gina` (the framework)
 
-                                if (opt.argv.indexOf('--follow') < 0 || opt.argv.indexOf('-f') < 0) {
+                                if (opt.argv.indexOf('--follow') < 0 && opt.argv.indexOf('-f') < 0) {
                                     // TODO - exits only if no other bundle is runing in the project
                                     // let projectStatus = execSync("$(which gina) project:status @"+project);
                                     // if ( /is\ running/.test(projectStatus) ) {

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/lib/cmd/helper.js

@@ -635,6 +635,29 @@ function CmdHelper(cmd, client, debug) {
             }
             projectTmpPathObj = null;
 
+            // cache
+            var projectCachePathObj = new _(cmd.projects[cmd.projectName].homedir +'/cache', true);
+            if (!projectCachePathObj.existsSync() ) {
+                projectCachePathObj.mkdirSync();
+            }
+            cmd.projectCachePath = projectCachePathObj.toString();
+            // cache symlink
+            var cacheLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/cache', true);
+            if (
+                cacheLinkPathObj.existsSync()
+                && !cacheLinkPathObj.isSymlinkSync()
+                ||
+                cacheLinkPathObj.existsSync()
+                && fs.readlinkSync(cacheLinkPathObj.toString()) != cmd.projectCachePath
+            ) {
+                cacheLinkPathObj.rmSync();
+            }
+            if (!cacheLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectCachePathObj.toString() +'] to [ '+ cacheLinkPathObj.toString() +' ] ');
+                projectCachePathObj.symlinkSync(cacheLinkPathObj.toString());
+            }
+            projectCachePathObj = null;
+
 
             cmd.projectLocation     = _(cmd.projects[cmd.projectName].path, true);
             cmd.bundlesLocation     = _(cmd.projects[cmd.projectName].path +'/src', true);

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/lib/domain/src/main.js

@@ -205,7 +205,7 @@ function Domain(options, cb) {
             }
 
             opt.isUpdating = false;
-            // cb(false);
+
             myEventBus.dispatchEvent(
                 new CustomEvent('domain_psl.loaded', {
                     detail: {

package/framework/{v0.1.6-alpha.145 → v0.1.6-alpha.147}/lib/logger/src/containers/file/index.js

@@ -132,9 +132,11 @@ function FileContainer(opt, loggers) {
         // console.debug('logger::file write env: ', bundleName, process.env.NODE_ENV, getEnvVar('GINA_ENV'), JSON.stringify(process.gina, null, 2) );// jshint ignore:line
 
         var env         = process.env.NODE_ENV || getEnvVar('GINA_ENV');// jshint ignore:line
+        var scope       = process.env.NODE_SCOPE || getEnvVar('GINA_SCOPE');// jshint ignore:line
         var Config      = require(getEnvVar('GINA_CORE') + '/config');
         var conf = new Config({
             env: env,
+            scope: scope,
             projectName: projectName,
             executionPath: projectPath,
             startingApp: bundleName,

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

@@ -62,6 +62,7 @@ function Routing() {
     }
     // BO - In case of partial rendering whithout handler defined for the partial
     else {
+
         if ( !merge || typeof(merge) != 'function' ) {
             merge = require('lib/merge');
         }
@@ -994,8 +995,17 @@ function Routing() {
             rule = arr[0].toLowerCase() +'@'+ bundle;
         }
 
-
         var routing = config.getRouting(bundle, env);
+        // TODO- change the way it is done
+        // var routing = null;
+        // if ( config.bundle != bundle) {
+        //     // We are going to try to retrieved an exposed route (single)
+        //     routing = config.getRouting(rule, env);
+        // } else {
+        //     // We are getting the current bundle routing (all routes)
+        //     routing = config.getRouting(bundle, env);
+        // }
+
 
         if ( typeof(routing[rule]) == 'undefined' ) {
             throw new Error('[ RoutingHelper::getRouting(rule, params) ] : `' +rule + '` not found !')
@@ -1266,12 +1276,12 @@ function Routing() {
      * @param {string} [bundle] targeted bundle
      * @param {string} [method] 2nd or 3rd -  request method (GET|PUT|PUT|DELETE) - GET is set by default
      * @param {object} [request]
-     * @param {boolean} [isOverridinMethod] // will replace request.method by the provided method - Used for redirections
+     * @param {boolean} [isOverridingMethod] // will replace request.method by the provided method - Used for redirections
      *
      * @returns {object|boolean} route - when route is found; `false` when not found
      * */
 
-    self.getRouteByUrl = function (url, bundle, method, request, isOverridinMethod) {
+    self.getRouteByUrl = function (url, bundle, method, request, isOverridingMethod) {
 
         if (
             arguments.length == 2
@@ -1324,7 +1334,7 @@ function Routing() {
             }
         }
 
-        isOverridinMethod = ( typeof(arguments[arguments.length-1]) != 'boolean') ? false : arguments[arguments.length-1];
+        isOverridingMethod = ( typeof(arguments[arguments.length-1]) != 'boolean') ? false : arguments[arguments.length-1];
 
         var matched             = false
             , config            = null
@@ -1345,8 +1355,8 @@ function Routing() {
             config          = window.gina.config;
             bundle          = (typeof (bundle) != 'undefined') ? bundle : config.bundle;
             env             = config.env;
-            routing         = routing || config.getRouting(bundle);
-            reverseRouting  = reverseRouting || config.reverseRouting;
+            routing         = config.routing || config.getRouting(bundle);
+            reverseRouting  = config.reverseRouting;
             isXMLRequest    = ( typeof(isXMLRequest) != 'undefined' ) ? isXMLRequest : false; // TODO - retrieve the right value
 
             hostname        = hostname || config.hostname;
@@ -1386,7 +1396,7 @@ function Routing() {
                     url: url
                 }
             }
-            if (isOverridinMethod) {
+            if (isOverridingMethod) {
                 request.method = method;
             }
             isXMLRequest    = request.isXMLRequest || false;
@@ -1596,8 +1606,10 @@ if ((typeof (module) !== 'undefined') && module.exports) {
     }
 
     // Publish as node.js module
-    module.exports = Routing()
+    module.exports = Routing();
 } else if (typeof (define) === 'function' && define.amd) {
     // Publish as AMD module
-    define('lib/routing', ['require', 'lib/form-validator', 'lib/merge'], function() { return Routing() })
+    define('lib/routing', ['require', 'lib/form-validator', 'lib/merge'], function() {
+        return Routing();
+    });
 }