gina 0.1.1-alpha.99 → 0.1.2-alpha.2

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/lib/session-store.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,22 +12,28 @@ var helpers = require('./../helpers');
 var console = require('./logger');
 
 function SessionStore(session) {
-    
+
     var ctx                 = getContext()
         , bundle            = ctx.bundle
         , env               = ctx.env
         , conf              = getConfig()[bundle][env]
         , connectorsPath    = conf.connectorsPath
-        , connector         = conf.content.connectors[session.name].connector
-    ; 
+        , connector         = null
+    ;
+    try {
+        connector         = conf.content.connectors[session.name].connector;
+    } catch (err) {
+        throw new Error('SessionStore could not be loaded: Connector issue. Please check your bundle configuration @config/connectors.json\n'+ err.stack);
+    }
+
     var connectorName = 'couchbase';
     var filename = _(connectorsPath + '/'+ connector +'/lib/session-store.js', true);
-    
+
     if ( !fs.existsSync(filename) ) {
         throw new Error('SessionStore could not be loaded: `'+ filename+'` is missing');
     }
-    
+
     return require(filename)(session, bundle)
 };
-    
+
 module.exports = SessionStore;

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/lib/shell.js

@@ -17,12 +17,12 @@ function Shell () {
     };
 
     this.setOptions = function(opt) {
-        
+
         for (let name in opt) {
             if ( Object.keys(local).indexOf(name) < 0 ) {
                 throw new Error('Option `'+ name +'` not supported !')
             }
-            console.log('Settings options for ', name);
+            console.debug('Setting up ['+ name +'] option');
             local[name] = opt[name]
         }
     }
@@ -53,7 +53,7 @@ function Shell () {
             , error         = false
             , hasCalledBack = false
         ;
-        
+
         var _console = ( typeof(local.console) != 'undefined' ) ? local.console : console;
 
         var e = new EventEmitter();

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/lib/swig-filters/package.json

@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/lib/swig-filters/src/main.js

@@ -1,11 +1,12 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
+
 /**
  * SwigFilters
  * ------
@@ -16,37 +17,50 @@
  *   isProxyHost : isProxyHost,
  *   throwError  : self.throwError, // use ctx.throwError
  *   req         : local.req,
- *   res         : local.res 
+ *   res         : local.res
  * });
  * -----
  * Call
- * ----- 
+ * -----
  * swig.setFilter('getUrl', filters.getUrl);
  *
- * 
+ *
  * @package     Gina.Lib
  * @namespace   Gina.Lib.SwigFilters
  * @author      Rhinostone <contact@gina.io>
  * */
 function SwigFilters(conf) {
-    
-    var isGFFCtx    = ((typeof (module) !== 'undefined') && module.exports) ? false :  true;
-    
-    var self = { options: conf };  
+
+    var isGFFCtx    = ((typeof (module) !== 'undefined') && module.exports) ? false : true;
+
+    if ( typeof(merge) == 'undefined' ) {
+        var merge = null;
+    }
+    if ( !merge || typeof(merge) != 'function' ) {
+        merge = require(_(GINA_FRAMEWORK_DIR+"/lib/merge", true));
+    }
+    if ( typeof(routing) == 'undefined' ) {
+        var routing = null;
+    }
+    if ( !routing || typeof(routing) != 'function' ) {
+        routing = require(_(GINA_FRAMEWORK_DIR+"/lib/routing", true));
+    }
+
+    var self = { options: conf };
     var init = function() {
 
         if ( typeof(SwigFilters.initialized) != 'undefined' ) {
             return getInstance()
         } else {
-            
+
             SwigFilters.instance = self;
-            
+
             if (self.options) {
                 SwigFilters.instance._options = self.options;
             }
-            
-            SwigFilters.initialized = true;    
-            
+
+            SwigFilters.initialized = true;
+
             return SwigFilters.instance
         }
     }
@@ -55,14 +69,14 @@ function SwigFilters(conf) {
         if (conf) {
             self.options = SwigFilters.instance._options = JSON.clone(conf);
         }
-            
+
         return SwigFilters.instance
     }
-    
+
     self.getConfig = function() {
         return JSON.clone(self.options)
     }
-    
+
     // Allows you to get a bundle web root
     self.getWebroot = function (input, obj) {
         var url = null, prop = self.options.envObj.getConf(obj, options.conf.env);
@@ -71,25 +85,25 @@ function SwigFilters(conf) {
         } else {
             url = prop.server.scheme + '://'+ prop.host +':'+ prop.port[prop.server.protocol][prop.server.scheme];
         }
-            
+
         if ( typeof(prop.server['webroot']) != 'undefined') {
             url += prop.server['webroot']
         }
         return url
     }
-    
-    // var getRouteDefinition = function(routing, rule, method) {
+
+    // var getRouteDefinition = function(routingRules, rule, method) {
     //     var routeObject = null;
-    //     for (r in routing) {
-    //         if ( r == rule && routing[r].method.toLowerCase() == method.toLowerCase() ) {
-    //             routeObject = routing[r];
+    //     for (r in routingRules) {
+    //         if ( r == rule && routingRules[r].method.toLowerCase() == method.toLowerCase() ) {
+    //             routeObject = routingRules[r];
     //             break;
     //         }
     //     }
-        
+
     //     return routeObject;
     // }
-    
+
     /**
      * getUrl filter
      *
@@ -112,15 +126,15 @@ function SwigFilters(conf) {
      *
      * @returns {string} relativeUrl|absoluteUrl - /sample/url.html or http://domain.com/sample/url.html
      * */
-    self.getUrl = function (route, params, base) {                        
-        
+    self.getUrl = function (route, params, base) {
+
         //var ctx = SwigFilters().getConfig();
         //var ctx = self.options;
         if (typeof(params) == 'undefined') {
             params = {}
-        } 
+        }
         var ctx  = SwigFilters.instance._options || self.options;
-                
+
         var config              = null
             , hostname          = null
             , wroot             = null
@@ -128,22 +142,22 @@ function SwigFilters(conf) {
             , isStandalone      = null
             , isMaster          = null
             , isProxyHost       = ctx.isProxyHost
-            , routing           = null                        
+            , routingRules      = null
             , rule              = null
             , url               = NaN
             , urlStr            = null
             , method            = 'GET'
         ;
-        
+
         if (ctx.options.method != 'undefined') {
             method = ctx.options.method
         }
-            
+
         // if no route, returns current route
-        if ( !route || typeof(route) == 'undefined') {
+        if ( !route || typeof(route) == 'undefined') {
             route = ctx.options.rule
         }
-        
+
         config = {};
         if (/\@/.test(route) && typeof(base) == 'undefined') {
             var r = route.split(/\@/);
@@ -167,8 +181,8 @@ function SwigFilters(conf) {
         wroot           = config.server.webroot;
         isStandalone    = (config.bundles.length > 1) ? true : false;
         isMaster        = (config.bundles[0] === config.bundle) ? true : false;
-        routing         = config.routing;
-      
+        routingRules    = config.routing;
+
 
         if ( typeof(base) != 'undefined' ) {
 
@@ -179,8 +193,8 @@ function SwigFilters(conf) {
                 if ( mainConf.allBundles.indexOf(base) > -1 ) {
                     // config override
                     config          = mainConf.Env.getConf(base, mainConf.env);
-                    
-                    // retrieve hostname, webroot & routing
+
+                    // retrieve hostname, webroot & routingRules
                     hostname        = config.hostname + config.server.webroot;
                     // rewrite hostname vs ctx.req.headers.host
                     if ( isProxyHost ) {
@@ -196,103 +210,110 @@ function SwigFilters(conf) {
                 }
             }
         }
-        
+
         wrootRe = new RegExp('^'+ config.server.webroot);
 
         // is path ?
         if (/^\//.test(route)) {
-            
+
             if ( !wrootRe.test(route) ) {
                 route = config.server.webroot + route.substr(1);
                 hostname = hostname.replace(new RegExp( config.server.webroot +'$'), '')
             } else {
                 route = route.substr(1)
-            }                          
+            }
 
             return hostname + route;
         }
 
         // rules are now unique per bundle : rule@bundle
         rule = route + '@' + config.bundle;
-        //var ruleObj = getRouteDefinition(routing, rule, method);
-        var ruleObj = routing[rule];
-        if ( typeof(ruleObj) != 'undefined' && ruleObj != null ) { //found
-                        
-            url = ruleObj.url;
-            
-            if ( typeof(ruleObj.requirements) != 'undefined' ) {
-                var urls    = null
-                    , i     = 0
-                    , len   = null
-                    , p     = null
-                ;
-                
-                for (p in ruleObj.requirements) {
-                    
-                    if ( /\,/.test(url) ) {
-                        urls = url.split(/\,/g);
-                        i = 0; len = urls.length;
-                        for (; i< len; ++i) {
-                            if ( params && /:/.test(urls[i]) ) {
-                                urlStr = urls[i].replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1');
-                                break
-                            }
-                        }
-
-                        url = (urlStr != null) ? urlStr : urls[0];
-                    } else {
-                        try {
-                            url = url.replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1')
-                        } catch (err) {
-                            ctx.throwError(ctx.res, 500, new Error('template compilation exception encoutered: [ '+ url +' ]\nsounds like you are having troubles with the following call `{{ "'+route+'" | getUrl() }}` where `'+p+'` parameter is expected according to your `routing.json`'  +'\n'+ (err.stack||err.message)));
-                        }
-                    }
-                }
-            } else {
-                if ( /\,/.test(url) ) {
-                    url = url.split(/\,/g)[0] || null; // just taking the default one: using the first element unless it is empty.
-                    if (!url) {
-                        ctx.throwError(ctx.res, 500, new Error('please check your `routing.json` at the defined rule `'+ rule +'` : `url` attribute cannot be empty').stack)
-                    }
-                }
-            }
-            
-            
-            if (hostname.length > 0) {
-                url = url.replace(wrootRe, '');
-            }   
-            
-            // fix url in case of empty param value allowed by the routing rule
-            // to prevent having a folder.
-            // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
-            if ( /\/$/.test(url) && url != '/' )
-                url = url.substr(0, url.length-1);
-                
-            url = hostname + url;
-
-        } else {
-            
-            if ( typeof(routing['404@'+ config.bundle]) != 'undefined' && typeof(routing['404@'+ config.bundle].url) != 'undefined' ) {                              
-                //url = ( /^\//.test(routing['404@'+ config.bundle].url) ) ? hostname + routing['404@'+ config.bundle].url.substr(1) : hostname + routing['404@'+ config.bundle].url;
-                url = routing['404@'+ config.bundle].url.replace(wrootRe, '');
-                if (hostname.length > 0) {
-                    url = url.replace(wrootRe, '');
-                }  
-                url = hostname + url;
-            } else {
-                url = route;
-                if (hostname.length > 0) {
-                    url = url.substr(1);
-                } 
-                url = hostname + url
-            }
-            
-            return '404:['+ ctx.req.method +']'+rule                            
+        //var ruleObj = getRouteDefinition(routingRules, rule, method);
+        try {
+            url = routing.getRoute(route +'@'+ config.bundle, params).toUrl();
+        } catch (routingErr) {
+            url = '404:['+ ctx.req.method +']'+rule
         }
 
+
+        // var ruleObj = routingRules[rule];
+        // if ( typeof(ruleObj) != 'undefined' && ruleObj != null ) { //found
+
+        //     url = ruleObj.url;
+
+        //     if ( typeof(ruleObj.requirements) != 'undefined' ) {
+        //         var urls    = null
+        //             , i     = 0
+        //             , len   = null
+        //             , p     = null
+        //         ;
+
+        //         for (p in ruleObj.requirements) {
+
+        //             if ( /\,/.test(url) ) {
+        //                 urls = url.split(/\,/g);
+        //                 i = 0; len = urls.length;
+        //                 for (; i< len; ++i) {
+        //                     if ( params && /:/.test(urls[i]) ) {
+        //                         urlStr = urls[i].replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1');
+        //                         break
+        //                     }
+        //                 }
+
+        //                 url = (urlStr != null) ? urlStr : urls[0];
+        //             } else {
+        //                 try {
+        //                     url = url.replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1')
+        //                 } catch (err) {
+        //                     ctx.throwError(ctx.res, 500, new Error('template compilation exception encoutered: [ '+ url +' ]\nsounds like you are having troubles with the following call `{{ "'+route+'" | getUrl() }}` where `'+p+'` parameter is expected according to your `routing.json`'  +'\n'+ (err.stack||err.message)));
+        //                 }
+        //             }
+        //         }
+        //     } else {
+        //         if ( /\,/.test(url) ) {
+        //             url = url.split(/\,/g)[0] || null; // just taking the default one: using the first element unless it is empty.
+        //             if (!url) {
+        //                 ctx.throwError(ctx.res, 500, new Error('please check your `routing.json` at the defined rule `'+ rule +'` : `url` attribute cannot be empty').stack)
+        //             }
+        //         }
+        //     }
+
+
+        //     if (hostname.length > 0) {
+        //         url = url.replace(wrootRe, '');
+        //     }
+
+        //     // fix url in case of empty param value allowed by the routing rule
+        //     // to prevent having a folder.
+        //     // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
+        //     if ( /\/$/.test(url) && url != '/' )
+        //         url = url.substr(0, url.length-1);
+
+        //     url = hostname + url;
+
+        // } else {
+
+        //     if ( typeof(routingRules['404@'+ config.bundle]) != 'undefined' && typeof(routingRules['404@'+ config.bundle].url) != 'undefined' ) {
+        //         //url = ( /^\//.test(routingRules['404@'+ config.bundle].url) ) ? hostname + routingRules['404@'+ config.bundle].url.substr(1) : hostname + routingRules['404@'+ config.bundle].url;
+        //         url = routingRules['404@'+ config.bundle].url.replace(wrootRe, '');
+        //         if (hostname.length > 0) {
+        //             url = url.replace(wrootRe, '');
+        //         }
+        //         url = hostname + url;
+        //     } else {
+        //         url = route;
+        //         if (hostname.length > 0) {
+        //             url = url.substr(1);
+        //         }
+        //         url = hostname + url
+        //     }
+
+        //     return '404:['+ ctx.req.method +']'+rule
+        // }
+
         return url
     }
-    
+
     // Extends default `length` filter
     self.length = function (input, obj) {
 
@@ -302,15 +323,15 @@ function SwigFilters(conf) {
             return input.length
         }
     }
-    
+
     self.nl2br = function(text, replacement) {
         replacement = ( typeof( replacement ) != 'undefined' ) ? replacement : '<br/>';
         return text.replace(/(\n|\r)/g, replacement);
     }
-    
-    
+
+
     return init()
-    
+
 }
 
 if ((typeof (module) !== 'undefined') && module.exports) {

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/lib/validator.js

@@ -400,7 +400,7 @@ function Validator(data, errorLabels) {
          *
          * @param {string} [mask] - by default "yyyy-mm-dd"
          *
-         * @returns {date} date - extended by gina::utils::dateFormat; an adaptation of Steven Levithan's code
+         * @returns {date} date - extended by gina::lib::helpers::dateFormat; an adaptation of Steven Levithan's code
          * */
         self[el].isDate = function(mask) {
             var val = this.value;
@@ -431,7 +431,7 @@ function Validator(data, errorLabels) {
 
         /**
          * Formating date using DateFormatHelper
-         * Check out documentation in the helper source: `utils/helpers/dateFormat.js`
+         * Check out documentation in the helper source: `lib/helpers/dateFormat.js`
          * e.g.:
          *      d.start
          *        .isDate('dd/mm/yyyy')

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/package.json

@@ -4,7 +4,7 @@
     "colors": "^1.4.0",
     "engine.io": "^6.2.0",
     "engine.io-client": "^6.2.2",
-    "requirejs": "^2.3.6",
+    "requirejs": "2.3.6",
     "sanitize-html": "^2.7.0",
     "ssl-checker": "^2.0.7",
     "swig": "^1.4.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.99",
+  "version": "0.1.2-alpha.2",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -39,10 +39,10 @@
       "url": "https://fdelaneau.com"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
-  "engine": [
-    "node >=0.10.25"
-  ],
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
+  "engine": {
+    "node": ">= 0.10.0 <18"
+  },
   "config": {
     "optionalPrefix": "~/.npm-global",
     "prefix": "/usr/local",
@@ -51,12 +51,12 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.99/core/gna",
+  "main": "./framework/v0.1.2-alpha.2/core/gna",
   "scripts": {
-    "prepare": "node ./script/prepare_version.js",
-    "postpublish": "node ./script/post_publish.js",
-    "preinstall": "node ./script/pre_install.js",
-    "postinstall": "node ./script/post_install.js"
+    "prepare": "node script/prepare_version.js",
+    "postpublish": "node script/post_publish.js",
+    "preinstall": "node script/pre_install.js",
+    "postinstall": "node script/post_install.js"
   },
   "license": "MIT",
   "readmeFilename": "README.md"

package/resources/home/main.json

@@ -9,18 +9,46 @@
     "def_global_mode": {
         "{release}": "{global_mode}"
     },
+    "archs": {
+        "{release}": [
+            "arm",
+            "arm64",
+            "x64",
+            "amd64"
+        ]
+    },
+    "def_arch": {
+        "{release}": "x64"
+    },
+    "platforms": {
+        "{release}": [
+            "darwin",
+            "linux",
+            "win32",
+            "freebsd",
+            "openbsd",
+            "sunos",
+            "aix"
+        ]
+    },
+    "def_platform": {
+        "{release}": "linux"
+    },
     "scopes": {
         "{release}": [
             "local",
             "production"
         ]
     },
-    "local_scope": {
+    "def_scope": {
         "{release}": "local"
     },
-    "def_scope": {
+    "local_scope": {
         "{release}": "local"
     },
+    "production_scope": {
+        "{release}": "production"
+    },
     "envs": {
         "{release}": [ "dev", "prod" ]
     },
@@ -46,15 +74,21 @@
         "{release}": "http"
     },
     "cultures": {
-        "_comment": "e.g.:  en-US, fr-FR ... available for the framework then used to translate the admin dashboard",
-        "{release}": [  "en-US", "fr-FR" ]
+        "_comment": "e.g.:  en_US, fr_FR etc. available for the framework then used to translate the admin dashboard",
+        "{release}": [  "en_CM", "fr_CM" ]
     },
     "def_culture": {
-        "{release}": "en-US"
+        "{release}": "en_CM"
+    },
+    "def_iso_short": {
+        "{release}": "cm"
     },
     "def_timezone": {
         "{release}": "Africa/Douala"
     },
+    "def_date": {
+        "{release}": "yyyy/mm/dd"
+    },
     "log_levels": {
         "_comment": "hierarchy",
         "{release}": [  "trace", "debug", "info", "warn", "error", "fatal" ]

package/resources/home/settings.json

@@ -3,13 +3,19 @@
     "prefix": "{prefix}",
     "global_mode": "{global_mode}",
     "version": "{version}",
+    "arch": "{arch}",
+    "platform": "{platform}",
     "env": "{env}",
     "env_is_dev": "{env_is_dev}",
     "scope": "{scope}",
     "scope_is_local": "{scope_is_local}",
+    "scope_is_production": "{scope_is_production}",
     "node_version": "{node_version}",
     "port": "{port}",
     "debug_port": "{debug_port}",
+    "mq_port": "{mq_port}",
+    "host_v4": "{host_v4}",
+    "hostname": "{hostname}",
     "user": "{user}",
     "uid": "{uid}",
     "gid": "{gid}",
@@ -19,6 +25,8 @@
     "tmpdir": "{tmp_dir}",
     "logdir": "{log_dir}",
     "culture": "{culture}",
+    "iso_short": "{iso_short}",
     "timezone": "{timezone}",
+    "date": "{date}",
     "log_level": "{log_level}"
 }

package/resources/package.json.template

@@ -39,7 +39,7 @@
       "url": "https://fdelaneau.com"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engine": [
     "node >=0.10.25"
   ],