gina 0.1.1-alpha.170 → 0.1.1-alpha.172

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/core/plugins/lib/validator/src/form-validator.js

@@ -615,6 +615,8 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             throw new Error('external url/domain not  handled at this moment, please contact us if you need support for it.')
         }
         var route       = JSON.clone(routing.getRoute(options.url, options.data));
+        // var route       = routing.getRoute(options.url, options.data);
+
         var env         = config.env;
         var conf        = config[bundle][env];
         if (!opt) { // setup opt by default if no proxy conf found
@@ -647,11 +649,11 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
          * Any modification on this part must be reflected on `router.js`
          */
         // default param setting
-         var params = {
+        var params = {
             method              : route.method,
             requirements        : route.requirements,
             namespace           : route.namespace || undefined,
-            url                 : unescape(route.url), /// avoid %20
+            url                 : decodeURI(route.url), /// avoid %20
             rule                : rule + '@' + bundle,
             param               : JSON.clone(route.param),
             middleware          : JSON.clone(route.middleware),
@@ -673,8 +675,6 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             //bundle          : bundle,//module
             // bundlePath      : conf.bundlesPath + '/' + bundle,
             // rootPath        : self.executionPath,
-            // We don't want to keep original conf untouched
-            conf            : JSON.clone(conf),
             //instance: self.serverInstance,
             //template: (routeHasViews) ? conf.content.templates[templateName] : undefined,
             //isUsingTemplate: local.isUsingTemplate,
@@ -687,7 +687,9 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
         // BO - Template outside of namespace fix added on 2021-08-19
         // We want to keep original conf untouched
-        controllerOptions.conf = JSON.clone(conf);
+        var _conf = JSON.clone(conf);
+        // controllerOptions.conf = JSON.clone(conf);
+        controllerOptions.conf = _conf;
         controllerOptions.conf.content.routing[controllerOptions.rule].param = params.param;
         // inheriting from _common
         if (
@@ -724,7 +726,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 if (i > 0) {
                     urlParams += '&';
                 }
-                let val = (typeof(data[p]) == 'object') ? encodeURIComponent(JSON.stringify(data[p])) : data[p];
+                let val = (typeof(data[p]) == 'object') ? encodeRFC5987ValueChars(JSON.stringify(data[p])) : data[p];
                 urlParams += p +'='+ val;
                 i++;
             }

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/core/router.js

@@ -133,6 +133,9 @@ function Router(env) {
                 if (isAuthenticated) {
                     request.session.user = this[property]
                 }
+                if (isAuthenticated && typeof(request.session.user.cached) == 'undefined' ) {
+                    request.session.user.cached = {}
+                }
                 return isAuthenticated;
             };
         }

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/core/server.js

@@ -2829,9 +2829,10 @@ function Server(options) {
         }
         var isMethodAllowed = null, hostname = null;
         out:
-            for (var name in routing) {
-                if (typeof(routing[name]['param']) == 'undefined')
+            for (let name in routing) {
+                if ( typeof(routing[name]['param']) == 'undefined' ) {
                     break;
+                }
 
                 // updating hostname
                 // if (
@@ -2859,7 +2860,7 @@ function Server(options) {
                     method              : method,
                     requirements        : routing[name].requirements,
                     namespace           : routing[name].namespace || undefined,
-                    url                 : unescape(pathname), /// avoid %20
+                    url                 : decodeURI(pathname), /// avoid %20
                     rule                : routing[name].originalRule || name,
                     param               : JSON.clone(routing[name].param),
                     middleware          : JSON.clone(routing[name].middleware),
@@ -3047,7 +3048,7 @@ function Server(options) {
                 //console.error('[ BUNDLE ][ '+self.appName+' ] '+ local.request.method +' [ '+code+' ] '+ local.request.url);
                 console.error(local.request.method +' [ '+code+' ] '+ local.request.url);
                 // intercept none HTML mime types
-                var url                     = unescape(local.request.url) /// avoid %20
+                var url                     = decodeURI(local.request.url) /// avoid %20
                     , ext                   = null
                     , isHtmlContent         = false
                     , hasCustomErrorFile    = false

package/framework/v0.1.1-alpha.172/core/template/boilerplate/bundle/config/settings.json

@@ -0,0 +1,12 @@
+// bundle needs to be restarted on changes !!
+{
+    "region": {
+        // <language>_<COUNTRY_ISO_SHORT_CODE>
+        "culture": "en_CM",
+        // <country_iso_short_code>
+        "isoShort": "en",
+        "date": "yyyy/mm/dd",
+        // https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+        "timeZone": "Africa/Douala"
+    }
+}

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/helpers/json/src/main.js

@@ -20,6 +20,32 @@ module.exports = function(){
 
     // `JSON.clone()` is a prototype defined in `GINA_DIR//lib/prototypes.json_clone`
 
+    encodeRFC5987ValueChars = function(str) {
+        // return encodeURIComponent(str).
+        //   // Bien que la RFC 3986 réserve "!", RFC 5987 ne réserve pas ce caractère,
+        //   // il n'est donc pas nécessaire l'échapper
+        //   replace(/['()*]/g, c => '%' + c.charCodeAt(0).toString(16)). // i.e., %27 %28 %29 %2a
+        //   // on notera que l'encodage valide pour "*" est %2A et qui faut donc appeler toUpperCase()
+        //   // pour encoder exactement.
+
+        //   // Selon la RFC 5987 ce qui suit n'est pas nécessairement requis
+        //   // on peut donc bénéficier d'un peu plus de lisibilité : |`^
+        //   replace(/%(7C|60|5E)/g, (str, hex) => String.fromCharCode(parseInt(hex, 16)));
+
+        // return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
+        //     return '%' + c.charCodeAt(0).toString(16);
+        //   });
+
+        return encodeURIComponent(str).
+        // Bien que la RFC 3986 réserve "!", RFC 5987 ne réserve pas ce caractère,
+        // il n'est donc pas nécessaire l'échapper
+        replace(/['()]/g, escape). // c'est-à-dire %27 %28 %29
+        replace(/\*/g, '%2A').
+            // Selon la RFC 5987 ce qui suit n'est pas nécessairement requis
+            // on peut donc bénéficier d'un peu plus de lisibilité : |`^
+            replace(/%(?:7C|60|5E)/g, unescape);
+    };
+
     /**
      * Load a json file and removing comments if found
      *

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/bundle/add.js

@@ -14,10 +14,15 @@ var scan        = require('../port/inc/scan');
  *
  * Usage:
  * $ gina bundle:add <bundle_name> @<project_name>
+ * or
+ * $ gina bundle:add <bundle_name> @<project_name> --start-port-from=<port_number>
  * */
 function Add(opt, cmd) {
 
-    var self    = {}
+    var self    = {
+            // --start-port-from
+            startFrom: null
+        }
         , local     = {
             // bundle index while searching or browsing
             b : 0,
@@ -34,6 +39,31 @@ function Add(opt, cmd) {
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
 
+        var portErr = null;
+        for (let i=3, len=process.argv.length; i<len; i++) {
+            if ( /^\-\-start\-port\-from\=/.test(process.argv[i]) ) {
+                let port = process.argv[i].split(/\=/)[1];
+                if ( /[^0-9]+/.test(port) ) {
+                    portErr = new Error('Port number must be an integer');
+                    break;
+                }
+                port = parseInt(port);
+                if (
+                    typeof(port) != 'number'
+                    || !Number.isInteger(port)
+                ) {
+                    portErr = new Error('Port number must be an integer');
+                    break;
+                }
+                self.startFrom = port
+            }
+        }
+
+        if (portErr) {
+            console.error(portErr.message||portErr);
+            return process.exit(1)
+        }
+
         // var i = 3, envs = [];
         // for (; i<process.argv.length; ++i) {
         //     if ( /^\@[a-z0-9_.]/.test(process.argv[i]) ) {
@@ -95,8 +125,9 @@ function Add(opt, cmd) {
 
             // find available port
             options = {
-                ignore  : getPortsList(),
-                limit   : getBundleScanLimit(bundle)
+                ignore      : getPortsList(),
+                limit       : getBundleScanLimit(bundle),
+                startFrom   : self.startFrom
             };
             console.log('['+bundle+'] starting ports scan' );
 
@@ -464,10 +495,10 @@ function Add(opt, cmd) {
             var f = null;
             f = (f=file.split(/\//))[f.length-1];
             var isJS = /\.js/.test(f.substring(f.length-3))
-                , isJSON = /\.js/.test(f.substring(f.length-5))
+                , isJSON = /\.json/.test(f.substring(f.length-5))
             ;
 
-            if ( isJS || isJSON && /config\/app\.json/.test(file) ) {
+            if ( isJS || isJSON /*&& /config\/app\.json/.test(file)*/ ) {
                 var contentFile = fs.readFileSync(file, 'utf8').toString();
                 var dic = {
                     "Bundle" : local.bundle.substring(0, 1).toUpperCase() + local.bundle.substring(1),

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/bundle/arguments.json

@@ -2,5 +2,6 @@
   "--env",
   "--force",
   "--import",
-  "--replace"
+  "--replace",
+  "--start-port-from"
 ]

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/bundle/help.txt

@@ -11,6 +11,8 @@
     To add a new bundle or to import an existing one, use the following command line.
 
     $ gina bundle:add <bundle_name> @<project_name>
+    Or
+    $ gina bundle:add <bundle_name> @<project_name> --start-port-from<port_number>
 
 
     Adding multiple

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/framework/set.js

@@ -75,6 +75,11 @@ function Set(opt){
                 setKeyVal('host_v4', v);
             break;
 
+            case '--iso_short':
+            case '--iso-short':
+                setKeyVal('iso_short', v);
+            break;
+
             case '--hostname':
                 setKeyVal('hostname', v);
             break;
@@ -83,6 +88,10 @@ function Set(opt){
                 setTimezone(v);
             break;
 
+            case '--date':
+                setKeyVal('date', v);
+            break;
+
             default:
                 return end(new Error('Setting environment variable `'+ k +'` is not supported'), 'error', true);
                 // err = new Error('Setting environment variable `'+ k +'` is not supported');

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/port/inc/scan.js

@@ -15,6 +15,7 @@ module.exports = function Scanner(opt, cb){
         // default binding for localhost
         // remote scan can be added later if needed (e.g: for remote setup)
         host: 'localhost',
+        // --start-port-from
         startFrom: null,
         start: 3100,
         // max 65535, but user assigned == 49151 - see [RFC6335](https://www.rfc-editor.org/rfc/rfc6335.html)
@@ -62,7 +63,7 @@ module.exports = function Scanner(opt, cb){
         }
 
         // skip port present in the `ignore list`
-        if ( opt.ignore.length > 0 && opt.ignore.indexOf( port ) > -1 ) {
+        if ( opt.ignore.length > 0 && opt.ignore.indexOf( ''+port ) > -1 ) {
             port++;
             return find(port);
         }

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/port/reset.js

@@ -11,7 +11,7 @@ const { setFips } = require('crypto');
  *
  * e.g.:
  *  gina port:reset @<project_name>
- *  gina port:reset @<project_name> --start-from=4100
+ *  gina port:reset @<project_name> --start-port-from=4100
  *
  * */
 function Reset(opt, cmd) {
@@ -36,7 +36,7 @@ function Reset(opt, cmd) {
         if (!isCmdConfigured()) return false;
 
         for (let i=3, len=process.argv.length; i<len; i++) {
-            if ( /^\-\-start\-from\=/.test(process.argv[i]) ) {
+            if ( /^\-\-start\-port\-from\=/.test(process.argv[i]) ) {
                 self.startFrom = process.argv[i].split(/\=/)[1]
             }
         }

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/project/add.js

@@ -29,7 +29,7 @@ function Add(opt, cmd) {
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
         for (let i=3, len=process.argv.length; i<len; i++) {
-            if ( /^\-\-start\-from\=/.test(process.argv[i]) ) {
+            if ( /^\-\-start\-port\-from\=/.test(process.argv[i]) ) {
                 self.startFrom = process.argv[i].split(/\=/)[1]
             }
         }

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/cmd/project/arguments.json

@@ -5,5 +5,6 @@
   "--more",
   "--with-bundles",
   "--with-envs",
-  "--scope"
+  "--scope",
+  "--start-port-from"
 ]