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

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.182}/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.182/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.182/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.182}/core/config.js

@@ -1316,8 +1316,8 @@ function Config(opt, contextResetNeeded) {
         //setting app param
         var urls = null;
         // bundle status
-        routing['status'] = {
-            url: '/status',
+        routing['bundle-status'] = {
+            url: '/_status',
             method: 'GET',
             param: {
                 control: 'getBundleStatus'
@@ -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.182}/core/controller/controller.js

@@ -1964,10 +1964,13 @@ function SuperController(options) {
     }
 
     this.getBundleStatus = function(req, res, next) {
+        var conf = self.getConfig();
         self.renderJSON({
             status: 200,
             isAlive: true,
-            message: 'I am alive !'
+            message: 'I am alive !',
+            // bundle: conf.bundle,
+            // project: conf.projectName
         });
     }
 
@@ -2387,6 +2390,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) {
@@ -3760,6 +3764,7 @@ function SuperController(options) {
             || typeof(arguments[arguments.length-1]) == 'string' && !(arguments[0] instanceof Error)
         ) {
 
+            msg    = ( !/^\d+$/.test(code) && typeof(msg) == 'undefined' ) ?  code : msg;
             code    = ( res && typeof(res.status) != 'undefined' ) ?  res.status : 500;
 
             if ( typeof(statusCodes[code]) != 'undefined' ) {
@@ -3785,7 +3790,8 @@ function SuperController(options) {
 
             } else if ( typeof(arguments[arguments.length-1]) == 'string' ) {
                 // formated error
-                errorObject.message = arguments[arguments.length-1]
+                errorObject.message = arguments[arguments.length-1] || msg
+                // errorObject = merge(arguments[arguments.length-1], errorObject)
             } else if (
                 arguments[arguments.length-1] instanceof Error
                 || typeof(res) == 'object' && typeof(res.stack) != 'undefined'
@@ -3893,7 +3899,8 @@ function SuperController(options) {
                     );
                 }
 
-                console.error('[ BUNDLE ][ '+ bundleConf.bundle +' ][ Controller ] '+ req.method +' ['+res.statusCode +'] '+ req.url +'\n'+ errorObject);
+                // console.error('[ BUNDLE ][ '+ bundleConf.bundle +' ][ Controller ] '+ req.method +' ['+res.statusCode +'] '+ req.url +'\n'+ errorObject);
+                console.error('[ BUNDLE ][ '+ bundleConf.bundle +' ][ Controller ] '+ req.method +' ['+res.statusCode +'] '+ req.url +'\n'+ errOutput);
                 return res.end(errOutput);
             } else {
 

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.182}/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.182}/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.182}/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.182}/core/plugins/lib/validator/src/main.js

@@ -5,6 +5,7 @@
  *  - lib/form-validator
  *  - lib/merge
  *  - utils/events
+ *  - utils/data
  *  - vendor/uuid
  *
  * Additional helpers for the backend are located in framwework/v{version}/helpers/plugins/validator-*.js
@@ -78,13 +79,17 @@
 
         require('utils/dom');
         require('utils/effects');
+        require('utils/data');
 
         envIsDev = gina.config.envIsDev;
     } else {
         envIsDev   = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false;
         if (envIsDev) {
-            delete require.cache[require.resolve('./form-validator')]
+            delete require.cache[require.resolve('./form-validator')];
+            delete require.cache[require.resolve('../../../../../helpers/data')];
         }
+
+        require('../../../../../helpers/data');
     }
 
     var uuid            = (isGFFCtx) ? require('vendor/uuid') : require('uuid');
@@ -827,10 +832,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 +1344,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 +1501,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 +1518,6 @@
                                 } else {
                                     newData[key] = value
                                 }
-
                             }
                         }
 
@@ -2436,6 +2440,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');
@@ -2854,62 +2859,64 @@
         }
     }
 
-    var formatData = function (data) {
-
-        var args        = null
-            , obj       = {}
-            , key       = null
-            , fields    = {}
-            , altName   = null
-        ;
-
-        var makeFields = function(fields, isObject, data, len, i) {
-            if (i == len ) { // exit
-                return fields
-            }
-
-            var name = (isObject) ? Object.keys(data)[i] : i;
-
-            if ( /\[(.*)\]/.test(name) ) {
-                // backup name key
-                key = name;
-                // properties
-                args    = name.match(/(\[[-_\[a-z 0-9]*\]\]|\[[-_\[a-z 0-9]*\])/ig);
-                // root
-                name    = name.match(/^[-_a-z 0-9]+\[{0}/ig);
-                //altName = name.replace(/.*\[(.+)\]$/, "$1");
-
-                if ( typeof(fields[name]) == 'undefined' ) {
-                    fields[name] = ( Array.isArray(data[key]) ) ? [] : {};
-                }
-                // building object tree
-                makeObject(obj, data[key], args, args.length, 0);
-
-                fields[name] = merge(fields[name], obj);
-                obj = {};
-
-            } else { // normal case
-                fields[name] = data[name];
-            }
-            name = null;
-            altName = null;
-
-            ++i;
-            return makeFields(fields, isObject, data, len, i);
-        }
-
-        var len = ( typeof(data) == 'undefined' ) ? 0 : 1;// by default
-        var isObject = false;
-        if (Array.isArray(data)) {
-            len = data.length;
-        } else if ( typeof(data) == 'object' ) {
-            len = data.count();
-            isObject = true;
-        }
-
-        return makeFields(fields, isObject, data, len, 0);
-        //return fields
-    }
+    var formatData = formatDataFromString;
+
+    // var formatData = function (data) {
+
+    //     var args        = null
+    //         , obj       = {}
+    //         , key       = null
+    //         , fields    = {}
+    //         , altName   = null
+    //     ;
+
+    //     var makeFields = function(fields, isObject, data, len, i) {
+    //         if (i == len ) { // exit
+    //             return fields
+    //         }
+
+    //         var name = (isObject) ? Object.keys(data)[i] : i;
+
+    //         if ( /\[(.*)\]/.test(name) ) {
+    //             // backup name key
+    //             key = name;
+    //             // properties
+    //             args    = name.match(/(\[[-_\[a-z 0-9]*\]\]|\[[-_\[a-z 0-9]*\])/ig);
+    //             // root
+    //             name    = name.match(/^[-_a-z 0-9]+\[{0}/ig);
+    //             //altName = name.replace(/.*\[(.+)\]$/, "$1");
+
+    //             if ( typeof(fields[name]) == 'undefined' ) {
+    //                 fields[name] = ( Array.isArray(data[key]) ) ? [] : {};
+    //             }
+    //             // building object tree
+    //             makeObject(obj, data[key], args, args.length, 0);
+
+    //             fields[name] = merge(fields[name], obj);
+    //             obj = {};
+
+    //         } else { // normal case
+    //             fields[name] = data[name];
+    //         }
+    //         name = null;
+    //         altName = null;
+
+    //         ++i;
+    //         return makeFields(fields, isObject, data, len, i);
+    //     }
+
+    //     var len = ( typeof(data) == 'undefined' ) ? 0 : 1;// by default
+    //     var isObject = false;
+    //     if (Array.isArray(data)) {
+    //         len = data.length;
+    //     } else if ( typeof(data) == 'object' ) {
+    //         len = data.count();
+    //         isObject = true;
+    //     }
+
+    //     return makeFields(fields, isObject, data, len, 0);
+    //     //return fields
+    // }
 
     var checkForDuplicateForm = function(id) {
         // check for duplicate form ids
@@ -4369,15 +4376,18 @@
                                 }
                             }
 
-                            if (eventOnSuccess)
+                            // Success event
+                            if (eventOnSuccess) {
                                 $uploadForm.setAttribute('data-gina-form-event-on-submit-success', eventOnSuccess);
-                            else
+                            } else {
                                 $uploadForm.setAttribute('data-gina-form-event-on-submit-success', 'onGenericXhrResponse');
-
-                            if (eventOnError)
+                            }
+                            // Error event
+                            if (eventOnError) {
                                 $uploadForm.setAttribute('data-gina-form-event-on-submit-error', eventOnError);
-                            else
+                            } else {
                                 $uploadForm.setAttribute('data-gina-form-event-on-submit-error', 'onGenericXhrResponse');
+                            }
 
 
                             // adding for to current document
@@ -6947,5 +6957,5 @@ if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     module.exports  = ValidatorPlugin
 } else if ( typeof(define) === 'function' && define.amd) {
     // Publish as AMD module
-    define('gina/validator', ['utils/events', 'utils/dom', 'lib/form-validator'], function(){ return ValidatorPlugin })
+    define('gina/validator', ['utils/events', 'utils/dom', 'utils/effects', 'utils/data', 'lib/form-validator'], function(){ return ValidatorPlugin })
 }

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