gina 0.1.1-alpha.180 → 0.1.1-alpha.181

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.180/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.181/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.180/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.181/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/config.js

@@ -1614,7 +1614,8 @@ function Config(opt, contextResetNeeded) {
                 files['settings'] = requireJSON(settingsPath)
             } else {
                 var defaultSettings = requireJSON(settingsPath);
-                files['settings'] = merge( JSON.clone(files['settings']), defaultSettings)
+                files['settings'] = merge(JSON.clone(files['settings']), defaultSettings)
+                // files['settings'] = merge(files['settings'], defaultSettings)
             }
 
             if (fs.existsSync(staticsPath))

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/controller/controller.js

@@ -2387,6 +2387,7 @@ function SuperController(options) {
 
         // options must be used as a copy in case of multiple calls of self.query(options, ...)
         options = merge(JSON.clone(options), defaultOptions);
+        // options = merge(options, defaultOptions);
 
         for (var o in options) {//cleaning
             if ( typeof(options[o]) == 'undefined' || options[o] == undefined) {

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/model/template/index.js

@@ -114,7 +114,8 @@ Model = function(namespace){
                                         var EntityFactory = new EntityFactoryClass( _this.getConfig() );
                                         console.log("Factory is ",  EntityFactory);
 
-                                        merge(Entity, EntityFactory, true);
+                                        // merge(Entity, EntityFactory, true);
+                                        Entity = merge(Entity, EntityFactory, true);
                                         //console.debug("\nEntity CONTENT ", Entity, " \nVS\n", EntityFactory);
 
                                     } else {

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/plugins/lib/storage/src/main.js

@@ -111,7 +111,8 @@ function StoragePlugin(options) {
             var filter          = this['_filter'];
             this['_updatedAt']  = new Date().format("isoDateTime");
 
-            merge(tmpCollections[ collection ][ index ], this, true);
+            // merge(tmpCollections[ collection ][ index ], this, true);
+            tmpCollections[ collection ][ index ] = merge(tmpCollections[ collection ][ index ], this, true);
 
             // cleaning
             delete tmpCollections[ collection ][ index ]['_index'];

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

@@ -84,8 +84,10 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         throw new Error('missing data param')
     } else {
         // cloning
-        self  = merge( JSON.clone(data), self );
-        local.data = merge( JSON.clone(data), local.data);
+        self  = merge(JSON.clone(data), self );
+        // self  = merge(data, self );
+        local.data = merge(JSON.clone(data), local.data);
+        // local.data = merge(data, local.data);
     }
 
     var getElementByName = function($form, name) { // frontend only

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/plugins/lib/validator/src/main.js

@@ -827,10 +827,10 @@
 
     /**
      * send
-     * N.B.: no validation here; if you want to validate against rules, use `.submit()` before
+     * N.B.: no validation here; if you want to validate against rules, use `.submit()` or `.validateFormById(formId)` before
      *
      *
-     * @param {object} data
+     * @param {object} data - FormData object (https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects)
      * @param {object} [ options ] : { isSynchrone: true, withCredentials: true }
      * */
     var send = function(data, options) {
@@ -1339,7 +1339,7 @@
                             if ( /^(\{|\[)/.test( xhr.responseText ) ) {
 
                                 try {
-                                    result = merge( JSON.parse(xhr.responseText), result )
+                                    result = merge(JSON.parse(xhr.responseText), result )
                                 } catch (err) {
                                     result = merge(err, result)
                                 }
@@ -1496,7 +1496,7 @@
                             data = JSON.stringify(data)
                         } else {
                             var uploadGroup   = event.currentTarget.getAttribute('data-gina-form-upload-group') || 'untagged';
-                            for (var [key, value] of data.entries()) {
+                            for (var [key, value] of data.entries() ) {
                                 // file upload case
                                 if (value instanceof File) {
                                     if (!hasBinaries)
@@ -1513,7 +1513,6 @@
                                 } else {
                                     newData[key] = value
                                 }
-
                             }
                         }
 
@@ -2436,6 +2435,7 @@
                             customRule = customRule.replace(/\-|\//g, '.');
                             if ( typeof(rules) != 'undefined' ) {
                                 instance.$forms[id].rules[customRule] = instance.rules[customRule] = local.rules[customRule] = merge(JSON.clone( eval('gina.forms.rules.'+ customRule)), instance.rules[customRule]);
+                                // instance.$forms[id].rules[customRule] = instance.rules[customRule] = local.rules[customRule] = merge(eval('gina.forms.rules.'+ customRule), instance.rules[customRule]);
                             }
                             if ( typeof(local.rules[customRule]) == 'undefined' ) {
                                 throw new Error('['+id+'] no rule found with key: `'+customRule+'`. Please check if json is not malformed @ /forms/rules/' + customRule.replace(/\./g, '/') +'.json');

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/router.js

@@ -345,6 +345,8 @@ function Router(env) {
 
         // Options need to be protected by a clone to allow overrides
         options = merge(JSON.clone(options), params);
+        // options = merge(options, params);
+
         // We want to keep original conf untouched
         options.conf = JSON.clone(conf);
         // inheriting from _common

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/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 = parseBodyString(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 = parseBodyString(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 = parseBodyString(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 = parseBodyString(bodyStr);
 
                             if ( typeof(obj) != 'undefined' && obj.count() == 0 && bodyStr.length > 1 ) {
                                 try {

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/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.181/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
+```