gina 0.1.1-alpha.15 → 0.1.1-alpha.150

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.150}/core/template/conf/templates.json

@@ -2,7 +2,7 @@
   "_common": {
     // if layout == "" or layout == false => isWithoutLayout will be set to `true`
     "layout": "{templatesPath}/html/layout.html",
-    "noLayout": "{gina}/framework/v{version}/core/asset/html/nolayout.html", 
+    "noLayout": "{gina}/framework/v{version}/core/asset/html/nolayout.html",
     "templates": "{templatesPath}", // only if hasView() - deprecated
     "html": "{templatesPath}/html",  // only if hasView()
     "theme": "default_theme", // only if hasView()
@@ -10,7 +10,7 @@
     "handlers": "{templatesPath}/handlers",
     "routeNameAsFilenameEnabled": true,
     "ginaEnabled": true, // set to false, this will exclude gina assets from being loaded
-    "pluginLoader": "{src:{gina}/framework/v{version}/core/asset/js/plugin/dist/gina.onload.min.js}",
+    "pluginLoader": "{src:{gina}/framework/v{version}/core/asset/plugin/dist/gina.onload.min.js}",
     "http-metas": {
       "content-type": "text/html"
     },

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.150}/helpers/context.js

@@ -5,8 +5,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-var fs      = require('fs');
-var os      = require('os');
+var fs              = require('fs');
+var os              = require('os');
+const {execSync}    = require('child_process');
 //var merge   = require('./../lib/merge');
 //var console = require('./../lib/logger');
 
@@ -41,6 +42,24 @@ function ContextHelper(contexts) {
         if ( typeof(ContextHelper.initialized) != 'undefined' && ContextHelper.instance) {
             self = ContextHelper.instance;
         } else {
+            // Get system environment variable
+            self.contexts['sysEnvVars'] = { '~/': getUserHome() +'/' };
+            var sysEnvVars = null;
+            try {
+                sysEnvVars = execSync('printenv').toString();
+                sysEnvVars = sysEnvVars.replace(/\n$/, '').split(/\n/g);
+                var len = sysEnvVars.length, i = 0;
+                while ( Array.isArray(sysEnvVars) && i < len ) {
+                    let arr = sysEnvVars[i].split(/\=/);
+                    self.contexts['sysEnvVars']['$'+arr[0]] = arr[1];
+                    i++
+                }
+                sysEnvVars = null;
+            } catch (err) {
+                return throwError(500, err, true)
+            }
+
+
             ContextHelper.initialized = true;
             ContextHelper.instance = self
         }
@@ -50,6 +69,24 @@ function ContextHelper(contexts) {
         return self
     }
 
+    var getUserHome = function() {
+        var home = os.homedir ? os.homedir : function() {
+            var homeDir = process.env[(isWin32()) ? 'USERPROFILE' : 'HOME'];
+
+            if ( !homeDir || homeDir == '' ) {
+                throw new Error('Home directory not defined or not found !');
+            }
+
+            if ( !isWritableSync(homeDir) ) {
+                throw new Error('Home directory found but not writable: need permissions for `'+ homeDir +'`');
+            }
+
+            return homeDir;
+        };
+
+        return home()
+    };
+
     self.configure = function(contexts) {
         joinContext(contexts)
     }
@@ -141,6 +178,92 @@ function ContextHelper(contexts) {
         }
     }
 
+    /**
+     * resetContext
+     *
+     * Mostly used by logger container definitions orout of context threads (workers ?)
+     *
+     * TODO - Check if it can be called in `gna.js` & remove at the same time useless calls of setPath() & setContext()
+     */
+    resetContext = function() {
+        setPath('gina.root', getEnvVar('GINA_DIR'));
+        var frameworkPath = getEnvVar('GINA_FRAMEWORK_DIR');
+        setPath('framework', frameworkPath);
+        setPath('gina.core', getEnvVar('GINA_CORE'));
+        setPath('gina.lib', _(frameworkPath +'/lib'));
+        setPath('gina.helpers', _(frameworkPath +'/helpers'));
+        setPath( 'node', _(process.argv[0]), true);
+        var projects    = require( _(getEnvVar('GINA_HOMEDIR') + '/projects.json', true) );
+        var projectName = getContext('projectName');
+        var root        = projects[projectName].path;
+        setPath('project', root);
+        var env         = getContext('env');
+        var isDev       = (env === projects[projectName]['dev_env']) ? true: false;
+        var bundlesPath = projects[projectName]['path'] + '/bundles'; // by default
+        var isProductionScope = ('production' === projects[projectName]['def_scope']) ? true: false;
+        if (isDev) {
+            bundlesPath = projects[projectName]['path'] + '/src'
+        } else if (isProductionScope) {
+            bundlesPath = projects[projectName]['path'] + '/releases'
+        }
+        setPath('bundles', _(bundlesPath, true));
+        var bundle = getContext('bundle');
+        var bundlePath = getPath('project') + '/';
+
+        var modulesPackage = _(root + '/manifest.json');
+        var project     = {}
+            , bundles   = []
+        ;
+
+        if ( fs.existsSync(modulesPackage) ) {
+            try {
+                var dep = require(modulesPackage);
+                if ( typeof(dep['bundles']) == "undefined") {
+                    dep['bundles'] = {};
+                }
+
+                if (
+                    typeof(dep['bundles']) != "undefined"
+                    && typeof(project['bundles']) != "undefined"
+                ) {
+
+                    for (let d in dep) {
+                        if (d == 'bundles') {
+                            for (var p in dep[d]) {
+                                project['bundles'][p] = dep['bundles'][p];
+                            }
+                        } else {
+                            project[d] = dep[d];
+                        }
+
+                    }
+                } else {
+                    project = dep;
+                }
+
+                for (let b in project.bundles) {
+                    bundles.push(b)
+                }
+            } catch (err) {
+                throw err
+            }
+        }
+
+        bundlePath += ( isDev ) ? project.bundles[ bundle ].src : project.bundles[ bundle ].link;
+        setPath('bundle', _(bundlePath, true));
+        setPath('helpers', _(bundlePath+'/helpers', true));
+        setPath('lib', _(bundlePath+'/lib', true));
+        setPath('models', _(bundlePath+'/models', true));
+        setPath('controllers', _(bundlePath+'/controllers', true));
+
+        setContext('envs', projects[projectName].envs);
+        setContext('bundles', bundles);
+        // setContext('gina.utils', lib);
+        // setContext('gina.Config', Config);
+        // setContext('gina.locales', locales);
+        // setContext('gina.plugins', plugins);
+    }
+
 
     var throwError = function(code, err, isFatal) {
         var router      = getContext('router');
@@ -255,7 +378,7 @@ function ContextHelper(contexts) {
             }
         }
 
-        var env = ctx.env || GINA_ENV;
+        var env = ctx.env || getEnvVar('GINA_ENV');
         var envIsDev = ( /^true$/i.test(process.env.NODE_ENV_IS_DEV) ) ? true : false;
         var Config = ctx.gina.Config;
         var conf = null;
@@ -424,6 +547,7 @@ function ContextHelper(contexts) {
 
     }
 
+
     /**
      * Whisper
      * Convert replace constant names dictionary by its value
@@ -434,7 +558,6 @@ function ContextHelper(contexts) {
      * @returns {object} revealed
      * */
     whisper = function(dictionary, replaceable, rule) {
-
         if ( typeof(rule) != 'undefined') {
             return replaceable
                 // inline rule
@@ -491,6 +614,23 @@ function ContextHelper(contexts) {
                         .replace(/\{(\w+)\}/g, function(s, key) {
                             return dictionary[key] || s;
                         })
+                        // OS Environment Variables
+                        .replace(/\"\~\/\"|\"\$([_A-Z0-9]+)\"/g, function(s, key) {
+                            if ( /^(true|false|null)$/i.test(self.contexts['sysEnvVars'][s]) ) {
+                                return (/^(true|false|null)$/i.test(self.contexts['sysEnvVars'][s])) ? self.contexts['sysEnvVars'][s] : null
+                            }
+                            // When "$SINGLE" and not "$SINGLE/something"
+                            if ( /^\"\$([_A-Z0-9]+)\"$/i.test(s) && !self.contexts['sysEnvVars'][s]) {
+                                return '"'+ (self.contexts['sysEnvVars'][s] || null) +'"';
+                            }
+                            if ( /^\"\~\/\"$/i.test(s) && !self.contexts['sysEnvVars'][s]) {
+                                return '"'+ (self.contexts['sysEnvVars'][s] || null) +'"';
+                            }
+                            return '"'+ (self.contexts['sysEnvVars'][s] || null) +'"';
+                        })
+                        .replace(/\~\/|\$([_A-Z0-9]+)/g, function(s, key) {
+                            return self.contexts['sysEnvVars'][s] || null;
+                        })
                 )
             }
         }

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.150}/helpers/dateFormat.js

@@ -65,6 +65,7 @@ function DateFormatHelper() {
         shortIsoTime:        "HH:MM",
         longIsoTime:        "HH:MM:ss TT",
         isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
+        longIsoDateTime:    "yyyy-mm-dd'T'HH:MM:ss.L",
         isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
     };
 
@@ -209,7 +210,8 @@ function DateFormatHelper() {
                 s:    s,
                 ss:   pad(s),
                 l:    pad(L, 3),
-                L:    pad(L > 99 ? Math.round(L / 10) : L),
+                // L:    pad(L > 99 ? Math.round(L / 10) : L),
+                L:    pad(L),
                 t:    H < 12 ? "a"  : "p",
                 tt:   H < 12 ? "am" : "pm",
                 T:    H < 12 ? "A"  : "P",

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.150}/helpers/index.js

@@ -43,7 +43,7 @@ var helpers         = {}
 
 var PrototypesHelper = null, PluginsHelper = null;
 // loading main helpers
-for (; f < len; ++f) {            
+for (; f < len; ++f) {
     if ( ! /^\./.test(files[f]) && files[f] != 'index.js') {
         helper          = files[f].replace(/.js/, '');
         if (/prototypes/i.test(helper)) {
@@ -63,11 +63,11 @@ new PrototypesHelper({
 });
 
 // loading plugins helpers
-if ( 
+if (
     typeof(getContext) != 'undefined'
-    && typeof(getContext().gina) != 'undefined' 
+    && typeof(getContext().gina) != 'undefined'
 ) {
-    new PluginsHelper(getContext('gina').plugins);    
+    new PluginsHelper(getContext('gina').plugins);
 }
 // adding ApiError to helper in case Validator plugin is not loaded
 if ( typeof(getContext) != 'undefined' && typeof(ApiError) == 'undefined' /*&& typeof(helpers.ApiError) == 'undefined'*/ ) {
@@ -75,5 +75,10 @@ if ( typeof(getContext) != 'undefined' && typeof(ApiError) == 'undefined' /*&& t
     ApiError = require('./plugins/src/api-error');
 }
 
+// loading `gina/utils/helper` if not yet loaded
+if ( typeof(getTmpDir) == 'undefined' ) {
+    _require(__dirname + '/../../../utils/helper')
+}
+
 // Publish as node.js module
 module.exports = helpers;