gina 0.1.1-alpha.180 → 0.1.1-alpha.182

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.182}/core/server.js

@@ -15,7 +15,7 @@ const swig          = require( _(GINA_FRAMEWORK_DIR +'/node_modules/swig', true)
 var Config          = require('./config');
 var Router          = require('./router');
 var lib             = require('./../lib');
-var routingLib    = lib.routing;
+var routingLib      = lib.routing;
 var inherits        = lib.inherits;
 var merge           = lib.merge;
 var Proc            = lib.Proc;
@@ -538,149 +538,149 @@ function Server(options) {
         return _hasViews
     }
 
-    var parseCollection = function (collection, obj) {
+    // var parseCollection = function (collection, obj) {
 
-        for(var i = 0, len = collection.length; i<len; ++i) {
-            obj[i] = parseObject(collection[i], obj);
-        }
-
-        return obj
-    }
-
-    var parseObject = function (tmp, obj) {
-        var el      = []
-            , key   = null
-        ;
-
-        for (var o in tmp) {
-
-            el[0]   = o;
-            el[1]   = tmp[o];
-
-            if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
-                key = el[0].replace(/\]/g, '').split(/\[/g);
-                obj = parseLocalObj(obj, key, 0, el[1])
-            } else {
-                obj[ el[0] ] = el[1]
-            }
-        }
-
-        return obj
-    }
-
-    var parseBody = function(body) {
-        var obj = null, tmp = null, arr = null;
-        if ( /^(\{|\[|\%7B|\%5B)/.test(body) ) {
-            try {
-                obj = {};
-
-                if ( /^(\%7B|\%5B)/.test(body) ) {
-                    tmp = JSON.parse(decodeURIComponent(body))
-                } else {
-                    tmp = JSON.parse(body)
-                }
-
-                if ( Array.isArray(tmp) ) {
-                    obj = parseCollection(tmp, obj)
-                } else {
-                    obj = parseObject(tmp, obj)
-                }
-
-                return obj
-            } catch (err) {
-                console.error('[365] could not parse body:\n' + body)
-            }
-
-        } else {
-            obj = {};
-            arr = body.split(/&/g);
-            if ( /(\"false\"|\"true\"|\"on\")/.test(body) )
-                body = body.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
-
-
-            var el      = {}
-                , value = null
-                , key   = null;
-
-            for (var i = 0, len = arr.length; i < len; ++i) {
-                if (!arr[i]) continue;
+    //     for(var i = 0, len = collection.length; i<len; ++i) {
+    //         obj[i] = parseObject(collection[i], obj);
+    //     }
 
-                arr[i] = decodeURIComponent(arr[i]);
+    //     return obj
+    // }
 
-                if ( /^\{/.test(arr[i]) || /\=\{/.test(arr[i]) || /\=\[/.test(arr[i]) ) {
-                    //if ( /^\{/.test(arr[i]) ) { // is a json string
-                    try {
-                        if (/^\{/.test(arr[i])) {
-                            obj = JSON.parse(arr[i]);
-                            break;
-                        } else {
-                            el = arr[i].match(/\=(.*)/);
-                            el[0] =  arr[i].split(/\=/)[0];
-                            obj[ el[0] ] = JSON.parse( el[1] );
-                        }
+    // var parseObject = function (tmp, obj) {
+    //     var el      = []
+    //         , key   = null
+    //     ;
 
+    //     for (var o in tmp) {
 
-                    } catch (err) {
-                        console.error('[parseBody#1] could not parse body:\n' + arr[i])
-                    }
-                } else {
-                    el = arr[i].split(/=/);
-                    if ( /\{\}\"\:/.test(el[1]) ) { //might be a json
-                        try {
-                            el[1] = JSON.parse(el[1])
-                        } catch (err) {
-                            console.error('[parseBody#2] could not parse body:\n' + el[1])
-                        }
-                    }
+    //         el[0]   = o;
+    //         el[1]   = tmp[o];
 
-                    if ( typeof(el[1]) == 'string' && !/\[object /.test(el[1])) {
-                        key     = null;
-                        el[0]   = decodeURIComponent(el[0]);
-                        el[1]   = decodeURIComponent(el[1]);
+    //         if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
+    //             key = el[0].replace(/\]/g, '').split(/\[/g);
+    //             obj = parseLocalObj(obj, key, 0, el[1])
+    //         } else {
+    //             obj[ el[0] ] = el[1]
+    //         }
+    //     }
 
-                        if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
-                            key = el[0].replace(/\]/g, '').split(/\[/g);
-                            obj = parseLocalObj(obj, key, 0, el[1])
-                        } else {
-                            obj[ el[0] ] = el[1]
-                        }
-                    }
-                }
-            }
+    //     return obj
+    // }
 
-            return obj
-        }
+    // var parseBody = function(body) {
+    //     var obj = null, tmp = null, arr = null;
+    //     if ( /^(\{|\[|\%7B|\%5B)/.test(body) ) {
+    //         try {
+    //             obj = ( /^(\{|\%7B)/.test() ) ? {} : [];
+
+    //             if ( /^(\%7B|\%5B)/.test(body) ) {
+    //                 tmp = JSON.parse(decodeURIComponent(body))
+    //             } else {
+    //                 tmp = JSON.parse(body)
+    //             }
+
+    //             if ( Array.isArray(tmp) ) {
+    //                 obj = parseCollection(tmp, obj)
+    //             } else {
+    //                 obj = parseObject(tmp, obj)
+    //             }
+
+    //             return obj
+    //         } catch (err) {
+    //             console.error('[365] could not parse body:\n' + body)
+    //         }
+
+    //     } else {
+    //         obj = {};
+    //         arr = body.split(/&/g);
+    //         if ( /(\"false\"|\"true\"|\"on\")/.test(body) )
+    //             body = body.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
+
+
+    //         var el      = {}
+    //             , value = null
+    //             , key   = null;
+
+    //         for (var i = 0, len = arr.length; i < len; ++i) {
+    //             if (!arr[i]) continue;
+
+    //             arr[i] = decodeURIComponent(arr[i]);
+
+    //             if ( /^\{/.test(arr[i]) || /\=\{/.test(arr[i]) || /\=\[/.test(arr[i]) ) {
+    //                 //if ( /^\{/.test(arr[i]) ) { // is a json string
+    //                 try {
+    //                     if (/^\{/.test(arr[i])) {
+    //                         obj = JSON.parse(arr[i]);
+    //                         break;
+    //                     } else {
+    //                         el = arr[i].match(/\=(.*)/);
+    //                         el[0] =  arr[i].split(/\=/)[0];
+    //                         obj[ el[0] ] = JSON.parse( el[1] );
+    //                     }
+
+
+    //                 } catch (err) {
+    //                     console.error('[parseBody#1] could not parse body:\n' + arr[i])
+    //                 }
+    //             } else {
+    //                 el = arr[i].split(/=/);
+    //                 if ( /\{\}\"\:/.test(el[1]) ) { //might be a json
+    //                     try {
+    //                         el[1] = JSON.parse(el[1])
+    //                     } catch (err) {
+    //                         console.error('[parseBody#2] could not parse body:\n' + el[1])
+    //                     }
+    //                 }
+
+    //                 if ( typeof(el[1]) == 'string' && !/\[object /.test(el[1])) {
+    //                     key     = null;
+    //                     el[0]   = decodeURIComponent(el[0]);
+    //                     el[1]   = decodeURIComponent(el[1]);
+
+    //                     if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
+    //                         key = el[0].replace(/\]/g, '').split(/\[/g);
+    //                         obj = parseLocalObj(obj, key, 0, el[1])
+    //                     } else {
+    //                         obj[ el[0] ] = el[1]
+    //                     }
+    //                 }
+    //             }
+    //         }
+
+    //         return obj
+    //     }
 
 
-    }
+    // }
 
-    var parseLocalObj = function(obj, key, k, value) {
+    // var parseLocalObj = function(obj, key, k, value) {
 
-        if ( typeof(obj[ key[k] ]) == 'undefined' ) {
-            obj[ key[k] ] = {};
-        }
+    //     if ( typeof(obj[ key[k] ]) == 'undefined' ) {
+    //         obj[ key[k] ] = {};
+    //     }
 
-        for (var prop in obj) {
+    //     for (var prop in obj) {
 
-            if (k == key.length-1) {
+    //         if (k == key.length-1) {
 
-                if (prop == key[k]) {
-                    obj[prop] = ( typeof(value) != 'undefined' ) ? value : '';
-                }
+    //             if (prop == key[k]) {
+    //                 obj[prop] = ( typeof(value) != 'undefined' ) ? value : '';
+    //             }
 
-            } else if ( key.indexOf(prop) > -1 ) {
-                ++k;
-                if ( !obj[prop][ key[k] ] )
-                    obj[prop][ key[k] ] = {};
+    //         } else if ( key.indexOf(prop) > -1 ) {
+    //             ++k;
+    //             if ( !obj[prop][ key[k] ] )
+    //                 obj[prop][ key[k] ] = {};
 
 
-                parseLocalObj(obj[prop], key, k, value)
+    //             parseLocalObj(obj[prop], key, k, value)
 
-            }
-        }
+    //         }
+    //     }
 
-        return obj;
-    }
+    //     return obj;
+    // }
 
     var getAssetFilenameFromUrl = function(bundleConf, url) {
 
@@ -2364,7 +2364,8 @@ function Server(options) {
                                 bodyStr = bodyStr.replace(/\"null\"/ig, null);
 
                             try {
-                                obj = parseBody(bodyStr);
+                                // obj = parseBody(bodyStr);
+                                obj = formatDataFromString(bodyStr);
                                 if ( !obj) {
                                     exception = new Error('Could not convert POST::BODY_STRING to POST::OBJECT. Possible JSON error in `bodyStr`');
                                     throwError(response, 500, exception, next);
@@ -2453,7 +2454,7 @@ function Server(options) {
 
 
                         if ( typeof(request.query.inheritedData) == 'string' ) {
-                            inheritedDataObj = parseBody(decodeURIComponent(request.query.inheritedData));
+                            inheritedDataObj = formatDataFromString(decodeURIComponent(request.query.inheritedData));
                         } else {
                             inheritedDataObj = JSON.clone(request.query.inheritedData);
                         }
@@ -2470,7 +2471,7 @@ function Server(options) {
                         bodyStr = bodyStr.replace(/\"null\"/ig, null);
 
 
-                    obj = parseBody(decodeURIComponent(bodyStr));
+                    obj = formatDataFromString(decodeURIComponent(bodyStr));
 
                     request.query = merge(obj, inheritedDataObj);
                     delete obj;
@@ -2513,7 +2514,7 @@ function Server(options) {
                             if ( /(\"null\")/i.test(bodyStr) )
                                 bodyStr = bodyStr.replace(/\"null\"/ig, null);
 
-                            obj = parseBody(bodyStr);
+                            obj = formatDataFromString(bodyStr);
 
                             if ( typeof(obj) != 'undefined' && obj.count() == 0 && bodyStr.length > 1 ) {
                                 try {

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.182}/helpers/context.js

@@ -92,7 +92,8 @@ function ContextHelper(contexts) {
     }
 
     joinContext = function(context) {
-        merge(self.contexts, context, true)
+        // merge(self.contexts, context, true)
+        self.contexts = merge(self.contexts, context, true)
     }
 
     var parseCtxObject = function (o, obj) {

package/framework/v0.1.1-alpha.182/helpers/data/README.md

@@ -0,0 +1,12 @@
+# json()
+
+**Package:** gina.helpers
+**Name:** json
+
+
+
+## Debuging your test with nodeunit
+
+```tty
+ node --inspect-brk=6959 `which nodeunit` ./test/01-format-data.js
+```

package/framework/v0.1.1-alpha.182/helpers/data/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "data",
+  "version": "1.0.0",
+  "description": "Data helper",
+
+  "author": {
+    "name": "Maritn-Luther ETOUMAN",
+    "email": "martin-luther@gina.io"
+  },
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
+  "engines": {
+    "node": ">=0.10.22"
+  },
+  "main": "src/main",
+  "scripts": {
+    "test": "nodeunit test"
+  },
+  "license": "MIT",
+  "readmeFilename": "README.md"
+}

package/framework/v0.1.1-alpha.182/helpers/data/src/main.js

@@ -0,0 +1,295 @@
+/*
+ * This file is part of the gina package.
+ * 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.
+ */
+
+
+/**
+* DataHelper
+*
+* @package     Gina.Lib.Helpers
+* @author      Rhinostone <contact@gina.io>
+* @api public
+* */
+
+function DataHelper(){
+
+    /** imports */
+    var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
+    // if (!isGFFCtx) {
+    //     var console = require('./../../../lib/logger');
+    // }
+
+    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);
+    };
+
+    /**
+     * Convert JSON string with structured keys to object
+     *
+     * @param {string} JSON string with structured keys
+     * */
+    formatDataFromString = function(bodyStr){
+
+        if ( typeof(bodyStr) == 'object' ) {
+            bodyStr = JSON.stringify(bodyStr)
+        }
+
+        try {
+            bodyStr = decodeURIComponent(bodyStr);
+        } catch (err) {
+            // Already decoded - ignoring
+        }
+
+        // false & true case
+        if ( /(\"false\"|\"true\"|\"on\")/.test(bodyStr) ) {
+            bodyStr = bodyStr.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
+        }
+        if ( /(\"null\")/i.test(bodyStr) ) {
+            bodyStr = bodyStr.replace(/\"null\"/ig, null);
+        }
+
+        return parseBody(bodyStr);
+    }
+
+    var parseCollection = function (collection, obj) {
+
+        for(var i = 0, len = collection.length; i<len; ++i) {
+            obj[i] = parseObject(collection[i], obj);
+        }
+
+        return obj
+    }
+
+    var parseObject = function (tmp, obj) {
+        var el      = []
+            , key   = null
+        ;
+
+        if (!obj) {
+            obj = {}
+        }
+
+        for (let o in tmp) {
+
+            el[0]   = o;
+            el[1]   = tmp[o];
+
+            if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
+                key = el[0].replace(/\]/g, '').split(/\[/g);
+                obj = parseLocalObj(obj, key, 0, el[1])
+            } else {
+                obj[ el[0] ] = el[1]
+            }
+        }
+
+        return obj
+    }
+
+    var parseBody = function(body) {
+        var obj             = null
+            , tmp           = null
+            , arr           = null
+            , isArrayType   = null
+        ;
+        if ( /^(\{|\[|\%7B|\%5B)/.test(body) ) {
+            try {
+                isArrayType = ( /^(\{|\%7B)/.test(body) ) ? false : true;
+                obj = ( isArrayType ) ? [] : {};
+
+                if ( /^(\%7B|\%5B)/.test(body) ) {
+                    tmp = JSON.parse(decodeURIComponent(body))
+                } else {
+                    tmp = JSON.parse(body)
+                }
+
+                if ( Array.isArray(tmp) ) {
+                    obj = parseCollection(tmp, obj)
+                } else {
+                    obj = parseObject(tmp, obj)
+                }
+
+                return obj
+            } catch (err) {
+                console.error('[365] could not parse body:\n' + body)
+            }
+
+        } else {
+            obj = {};
+            arr = body.split(/&/g);
+            if ( /(\"false\"|\"true\"|\"on\")/.test(body) )
+                body = body.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
+
+
+            var el      = {}
+                , value = null
+                , key   = null;
+
+            for (var i = 0, len = arr.length; i < len; ++i) {
+                if (!arr[i]) continue;
+
+                arr[i] = decodeURIComponent(arr[i]);
+
+                if ( /^\{/.test(arr[i]) || /\=\{/.test(arr[i]) || /\=\[/.test(arr[i]) ) {
+                    try {
+                        if (/^\{/.test(arr[i])) {
+                            obj = JSON.parse(arr[i]);
+                            break;
+                        } else {
+                            el = arr[i].match(/\=(.*)/);
+                            el[0] =  arr[i].split(/\=/)[0];
+                            obj[ el[0] ] = JSON.parse( el[1] );
+                        }
+
+
+                    } catch (err) {
+                        console.error('[parseBody#1] could not parse body:\n' + arr[i])
+                    }
+                } else {
+                    el = arr[i].split(/=/);
+                    if ( /\{\}\"\:/.test(el[1]) ) { //might be a json
+                        try {
+                            el[1] = JSON.parse(el[1])
+                        } catch (err) {
+                            console.error('[parseBody#2] could not parse body:\n' + el[1])
+                        }
+                    }
+
+                    if ( typeof(el[1]) == 'string' && !/\[object /.test(el[1])) {
+                        key     = null;
+                        el[0]   = decodeURIComponent(el[0]);
+                        el[1]   = decodeURIComponent(el[1]);
+
+                        if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
+                            key = el[0].replace(/\]/g, '').split(/\[/g);
+                            obj = parseLocalObj(obj, key, 0, el[1])
+                        } else {
+                            obj[ el[0] ] = el[1]
+                        }
+                    }
+                }
+            }
+
+            return obj
+        }
+    }
+
+    // var parseLocalObj = function(obj, key, k, value) {
+    //     if ( typeof(obj[ key[k] ]) == 'undefined' ) {
+    //         obj[ key[k] ] = {};
+    //     }
+
+    //     for (var prop in obj) {
+
+    //         if (k == key.length-1) {
+
+    //             if (prop == key[k]) {
+    //                 obj[prop] = ( typeof(value) != 'undefined' ) ? value : '';
+    //             }
+
+    //         } else if ( key.indexOf(prop) > -1 ) {
+    //             ++k;
+    //             if ( !obj[prop][ key[k] ] )
+    //                 obj[prop][ key[k] ] = {};
+
+
+    //             parseLocalObj(obj[prop], key, k, value)
+
+    //         }
+    //     }
+
+    //     return obj;
+    // }
+
+    var parseLocalObj = function(obj, key, k, value) {
+
+        for (let i=0,len=key.length; i<len; i++) {
+            // by default
+            let _key = key[k];
+            if (i == k) {
+                // Array or Object ?
+                if ( typeof(obj[ key[k] ]) == 'undefined' || typeof(obj[ key[k] ]) == 'string' ) {
+                    if ( Array.isArray(obj) ) {
+                        // index
+                        // _key = obj.length;
+                        _key = ~~key[k];
+                        obj[ _key ] = ( /^\d+$/.test(key[k+1]) ) ? [] : {};
+                    } else {
+                        obj[ key[k] ] = ( /^\d+$/.test(key[k+1]) ) ? [] : {};
+                    }
+                }
+
+                // Assinging value
+                if (k == key.length-1) {
+                    let _value = ( typeof(value) != 'undefined' ) ? value : '';
+                    if ( Array.isArray( obj[key[k]] ) ) {
+                        obj[key[k]].push(_value);
+                        // _key = (obj.length > 0) ? obj.length-1 : 0;
+                        // obj[ _key ] = _value;
+                    }
+                    else {
+                        obj[ key[k] ] = _value;
+                    }
+                    break;
+                }
+                // Assinging index or key
+                else {
+                    if ( /^\d+$/.test(key[k]) && !Array.isArray(obj) ) {
+                        obj = [];
+                        // _key = (obj.length > 0) ? obj.length-1 : 0;
+                    }
+                    // Handle unstructured array from object
+                    // E.G.: design[1][id] where design is starting with `1` index instead of `0`
+                    // if ( Array.isArray(obj) ) {
+                    //     // current Index
+                    //     _key = ~~key[k];
+                    //     // _key = (obj.length > 0) ? obj.length-1 : 0;
+                    // }
+                    // Init array or object
+                    if ( typeof(obj[ _key ]) == 'undefined' ) {
+                        // obj[ _key ] = ( /^\d+$/.test(key[k+1]) ) ? [] : {};
+                        obj[ _key ] = null;
+                    }
+
+                    parseLocalObj(obj[ _key ], key, k+1, value);
+                }
+            }
+        }
+
+        return obj;
+    }
+
+} //EO DataHelper
+
+if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
+    // Publish as node.js module
+    module.exports  = DataHelper
+} else if ( typeof(define) === 'function' && define.amd) {
+    // Publish as AMD module
+    define(function(){ return DataHelper() })
+}

package/framework/v0.1.1-alpha.182/helpers/json/README.md

@@ -0,0 +1,12 @@
+# json()
+
+**Package:** gina.helpers
+**Name:** json
+
+
+
+## Debuging your test with nodeunit
+
+```tty
+ node --inspect-brk=6959 `which nodeunit` ./test/01-require_json.js
+```