gina 0.1.1-alpha.165 → 0.1.1-alpha.167

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/controller/controller.js

@@ -24,7 +24,7 @@ var merge           = lib.merge;
 var inherits        = lib.inherits;
 var console         = lib.logger;
 var Collection      = lib.Collection;
-var routingUtils    = lib.routing;
+var routingLib      = lib.routing;
 var swig            = require('swig');
 var SwigFilters     = lib.SwigFilters;
 var statusCodes     = requireJSON( _( getPath('gina').core + '/status.codes') );
@@ -1518,7 +1518,7 @@ function SuperController(options) {
     /**
      * redirect
      *
-     * TODO - improve redirect based on `utils.routing`
+     * TODO - improve redirect based on `lib.routing`
      * e.g.: self.redirect('project-get', { companyId: companyId, clientId: clientId, id: projectId }, true)
      *
      * How to avoid redirect inside popin context
@@ -1949,6 +1949,12 @@ function SuperController(options) {
      *  OR
      *  - locally: `Controller.store(target, cb)` must be called to store on `onComplete` event
      *
+     *      - Will trigger on frontend : Failed to load resource: Frame load interrupted
+     *        because there is no `res.end()`: whitch is normal, we want to stay on the referrer page
+     *
+     *      - To avoid this, add to your download link the attribute `data-gina-link`
+     *        This will convert the regular HTTP Request to an XML Request
+     *
      * @param {string} url - eg.: https://upload.wikimedia.org/wikipedia/fr/2/2f/Firefox_Old_Logo.png
      * @param {object} [options]
      *
@@ -2062,33 +2068,32 @@ function SuperController(options) {
         var browser = require(''+ scheme);
         //console.debug('requestOptions: \n', JSON.stringify(requestOptions, null, 4));
 
-        browser.get(requestOptions, function(response) {
+        browser
+            .get(requestOptions, function(response) {
 
-            local.res.setHeader('content-type', contentType + '; charset='+ local.options.conf.encoding);
-            local.res.setHeader('content-disposition', opt.contentDisposition);
-            if (opt.fileSize) {
-                local.res.setHeader('content-length', opt.fileSize);
-            }
-            //local.res.setHeader('content-length', opt.fileSize);
-            // local.res.setHeader('cache-control', 'must-revalidate');
-            // local.res.setHeader('pragma', 'must-revalidate');
+                local.res.setHeader('content-type', contentType + '; charset='+ local.options.conf.encoding);
+                local.res.setHeader('content-disposition', opt.contentDisposition);
+                if (opt.fileSize) {
+                    local.res.setHeader('content-length', opt.fileSize);
+                }
+                //local.res.setHeader('content-length', opt.fileSize);
+                // local.res.setHeader('cache-control', 'must-revalidate');
+                // local.res.setHeader('pragma', 'must-revalidate');
 
-            // response.on('end', function onResponsePipeEnd(){
-            //     self.renderJSON({ url: url});
-            //     //local.res.end( Buffer.from(data) );
-            //     //local.res.headersSent = true;
 
-            //     // if ( typeof(local.next) != 'undefined')
-            //     //     local.next();
-            //     // else
-            //     //     return;
-            // });
+                response.pipe(local.res);
+            })
+            .on('error', function onDownloadError(err) {
+                self.throwError(local.res, 500, err);
+            });
 
-            response.pipe(local.res);
-        });
 
-        return;
 
+        // Will trigger on frontend : Failed to load resource: Frame load interrupted
+        // because there is no `res.end()`: whitch is normal, we want to stay on the referrer page
+
+        // To avoid this, add to your download link the attribute `data-gina-link`
+        // This will convert the regular HTTP Request to an XML Request
     }
 
 
@@ -2096,6 +2101,12 @@ function SuperController(options) {
      * Download to targeted filename.ext - Will create target if new
      * Use `cb` callback or `onComplete` event
      *
+     *      - Will trigger on frontend : Failed to load resource: Frame load interrupted
+     *        because there is no `res.end()`: whitch is normal, we want to stay on the referrer page
+     *
+     *      - To avoid this, add to your download link the attribute `data-gina-link`
+     *        This will convert the regular HTTP Request to an XML Request
+     *
      * @param {string} filename
      * @param {object} options
      **/
@@ -3784,12 +3795,13 @@ function SuperController(options) {
                     errOutput = JSON.stringify(
                         {
                             status  : errorObject.status,
-                            error   : output
+                            error   : output,
+                            stack   : errorObject.stack || null
                         }
                     );
                 }
 
-                console.error('[ BUNDLE ][ '+ bundleConf.bundle +' ][ Controller ] '+ req.method +' ['+res.statusCode +'] '+ req.url +'\n'+ errOutput);
+                console.error('[ BUNDLE ][ '+ bundleConf.bundle +' ][ Controller ] '+ req.method +' ['+res.statusCode +'] '+ req.url +'\n'+ errorObject);
                 return res.end(errOutput);
             } else {
 

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/dev/lib/class.js

@@ -4,7 +4,7 @@ var Class = function() {
      *
      * Usage :
      *  var YourSingletonObject = {...};
-     *  var YourClass = Utils.construct(YourSingletonObject);
+     *  var YourClass = Lib.construct(YourSingletonObject);
      *
      * @param {object} Class
      * @param {boolean} [autoInit]

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/dev/lib/factory.js

@@ -1,4 +1,4 @@
-/* Gina.Utils.Dev.Factory
+/* Gina.Dev.Lib.Factory
  *
  * This file is part of the gina package.
  * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/gna.js

@@ -41,7 +41,7 @@ var modelUtil   = new lib.Model();
 gna.initialized = process.initialized = false;
 gna.routed      = process.routed = false;
 
-gna.utils       = lib;
+gna.lib         = lib;
 gna.locales     = locales;
 gna.plugins     = plugins;
 
@@ -51,7 +51,7 @@ gna.plugins     = plugins;
 var isLoadedThroughCLI      = false; // with gina
 var isLoadedThroughWorker   = false;
 
-//copy & backup for utils/cmd/app.js.
+//copy & backup for lib/cmd/app.js.
 var tmp         = JSON.clone(process.argv); // by default
 var projectName = null;
 
@@ -186,7 +186,7 @@ setPath('project', root);
 
 
 
-setContext('gina.utils', lib);
+setContext('gina.lib', lib);
 setContext('gina.Config', Config);
 setContext('gina.locales', locales);
 setContext('gina.plugins', plugins);
@@ -461,7 +461,7 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
 
     if ( isSourceFound ) {
         //will override existing each time you restart.
-        gna.utils.generator.createPathSync(bundlesPath, function onPathCreated(err){
+        gna.lib.generator.createPathSync(bundlesPath, function onPathCreated(err){
             if (!err) {
                 try {
                     var targetObj = new _(target);

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/model/entity.js

@@ -7,12 +7,12 @@
  */
 var fs              = require('fs');
 var EventEmitter    = require('events').EventEmitter;
-var utils           = require('gina').utils;
-var console         = utils.logger;
-var helpers         = utils.helpers;
-var inherits        = utils.inherits;
-var merge           = utils.merge;
-var modelUtil       = new utils.Model();
+var lib             = require('gina').lib;
+var console         = lib.logger;
+var helpers         = lib.helpers;
+var inherits        = lib.inherits;
+var merge           = lib.merge;
+var modelUtil       = new lib.Model();
 
 /**
  * @class Model.EntitySuper class

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/model/index.js

@@ -12,16 +12,15 @@ var EventEmitter    = require('events').EventEmitter;
 var corePath        = getPath('gina').core;
 var Config          = require( corePath + '/config' );
 var config          = new Config();
-var utils           = require('gina').utils;
-var console         = utils.logger;
-var math            = utils.math;
-var inherits        = utils.inherits;
-//var merge           = utils.merge;
-var utilsConfig     = new utils.Config();
-var modelUtil       = new utils.Model();
+var lib             = require('gina').lib;
+var console         = lib.logger;
+var math            = lib.math;
+var inherits        = lib.inherits;
+//var merge           = lib.merge;
+var configLib     = new lib.Config();
+var modelUtil       = new lib.Model();
 var Module          = require('module');
 
-//UtilsConfig = Utils.Config(),
 //dev     = require(_(corePath + '/dev') ),
 
 
@@ -222,7 +221,7 @@ function Model(namespace, _config) {
 
         // try {
 
-        //     var locals = _locals = utilsConfig.getSync('gina', 'locals.json')
+        //     var locals = _locals = configLib.getSync('gina', 'locals.json')
         // } catch (err) {
         //     console.emerg('[ MODEL ][ ' + _connector +' ] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
         //     if ( i < 10) {

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

@@ -21,9 +21,8 @@ var Model;
 //Imports.
 var fs      = require('fs');
 var Module  = require('module');
-var utils   = require('gina').utils;
-var merge   = utils.merge;
-//var Dev     = Utils.Dev;
+var lib     = require('gina').lib;
+var merge   = lib.merge;
 var EventEmitter  = require('events').EventEmitter;
 var Config  = require('./../config');
 
@@ -42,25 +41,27 @@ Model = function(namespace){
         //TODO - if intance...
 
 
-        if ( typeof(namespace) == "undefined" || namespace == "") {
+        if ( typeof(namespace) == "undefined" || namespace == "") {
             //logger.error('gina', 'MODEL:ERR:1', 'EEMPTY: Model namespace', __stack);
             console.error(new Error('EEMPTY: Model namespace'));
         }
         var suffix = 'Entity';
-        var namespace = namespace.split(/\//g);
+        namespace = namespace.split(/\//g);
         var bundle = namespace[0];
         namespace.shift();
+
+        var model = null;
         //Capitalize - Normalize
         if (namespace.length > 1) {
             for (var i; i<namespace.length; ++i)
                 namespace[i] = namespace[i].substring(0, 1).toUpperCase() + namespace[i].substring(1);
 
-            var model = namespace.join(".");
+            model = namespace.join(".");
         } else {
             //Dir name.
             var modelDirName = namespace[0];
             namespace[0] = namespace[0].substring(0, 1).toUpperCase() + namespace[0].substring(1);
-            var model = namespace[0];
+            model = namespace[0];
         }
 
         //console.log("\nBundle", bundle);
@@ -84,11 +85,11 @@ Model = function(namespace){
 
                     var entityName, exluded = ['index.js'];
 
-                    //Will be in Utils.Dev.Factory soon.
+                    //Will be in Dev.Lib.Factory soon.
                     var produce = function(entityName, i){
                         console.debug("producing ", files[i]);
 
-                        utils.config.get('gina', 'project.json', function(err, config){
+                        lib.config.get('gina', 'project.json', function(err, config){
                             //if (err) logger.error('gina', 'MODEL:ERR:2', 'EEMPTY: EntitySuper' + err, __stack);
                             if (err) console.error(err.stack||err.message);
 
@@ -104,7 +105,7 @@ Model = function(namespace){
                                 try {
                                     if (entityName != "undefiend") {
                                         console.log("preparing entity ", entityName);
-                                        //TODO - Would be great to implement in Utils.Dev.
+                                        //TODO - Would be great to implement in Dev.Lib
                                         var EntityFactorySource = source
                                             .replace(/\{Entity\}/g, entityName)
                                             .replace(/\{Model\}/g, model);
@@ -125,7 +126,7 @@ Model = function(namespace){
                                 }
 
                                 //Entity = new entitiesManager[model]();
-                                //utils.merge(_this, Entity, true);
+                                //lib.merge(_this, Entity, true);
                                 //console.debug("EntityManager  \n",  entitiesManager,"\n VS \n",  EntityFactory);
                                 if (i == files.length-1) {
                                     //console.debug("All done !");
@@ -135,7 +136,7 @@ Model = function(namespace){
 
                             })//EO loadFile
 
-                        })//EO Utils.Config.get
+                        })//EO lib.config.get()
 
                     };//EO produce
 
@@ -158,7 +159,7 @@ Model = function(namespace){
 
                 });//EO fs.readdir.
 
-            } else {
+            } else {
                 _this.emit('ready', 'no configuration found for your model: ' + model);
                 console.log("no configuration found...");
             }

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/plugins/lib/intl/src/main.js

@@ -1,8 +1,8 @@
 
 function IntlPlugin() {
 
-    var merge       = merge || require('utils/merge');
-    var Collection  = Collection || require('utils/collection');
+    var merge       = merge || require('lib/merge');
+    var Collection  = Collection || require('lib/collection');
 
     var self = {
         options : {
@@ -10,7 +10,7 @@ function IntlPlugin() {
             locale: 'en' // by default
         }
     };
-    
+
     // load phrases
     var phrases = {
         'amendment' : {
@@ -24,8 +24,8 @@ function IntlPlugin() {
 
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     // Publish as node.js module
-    var merge       = require('utils/merge');
-    var Collection  = require('utils/collection');
+    var merge       = require('lib/merge');
+    var Collection  = require('lib/collection');
 
     module.exports  = IntlPlugin
 

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

@@ -7,8 +7,8 @@
  * */
 function StoragePlugin(options) {
 
-    var merge       = merge || require('utils/merge');;
-    var Collection  = Collection || require('utils/collection');
+    var merge       = merge || require('lib/merge');;
+    var Collection  = Collection || require('lib/collection');
     var uuid        = uuid || require('vendor/uuid');
     var dateFormat  = dateFormat || require('helpers/dateFormat');
 
@@ -415,8 +415,8 @@ function StoragePlugin(options) {
 
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     // Publish as node.js module
-    var merge       = require('utils/merge'); //require('../../../../../lib/merge');
-    var Collection  = require('utils/collection'); //require('../../../../../lib/collection');
+    var merge       = require('lib/merge'); //require('../../../../../lib/merge');
+    var Collection  = require('lib/collection'); //require('../../../../../lib/collection');
     var uuid        = require('uuid');
 
     module.exports = StoragePlugin

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

@@ -2,10 +2,10 @@
  * FormValidatorUtil
  *
  * Dependencies:
- *  - utils/helpers
- *  - utils/helpers/dateFormat
- *  - utils/merge
- *  - utils/routing (for API calls)
+ *  - lib/helpers
+ *  - lib/helpers/dateFormat
+ *  - lib/merge
+ *  - lib/routing (for API calls)
  *
  * @param {object} data
  * @param {object} [ $fields ] - isGFFCtx only
@@ -19,10 +19,10 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
     // if (isGFFCtx && !$fields )
     //     throw new Error('No `Validator` instance found.\nTry:\nvar FormValidator = require("gina/validator"):\nvar formValidator = new FormValidator(...);')
 
-    var merge           = (isGFFCtx) ? require('utils/merge') : require('../../../../../lib/merge');
+    var merge           = (isGFFCtx) ? require('lib/merge') : require('../../../../../lib/merge');
     var helpers         = (isGFFCtx) ? {} : require('../../../../../helpers');
     var dateFormat      = (isGFFCtx) ? require('helpers/dateFormat') : helpers.dateFormat;
-    var routing         = (isGFFCtx) ? require('utils/routing') : require('../../../../../lib/routing');
+    var routing         = (isGFFCtx) ? require('lib/routing') : require('../../../../../lib/routing');
 
     var hasUserValidators = function() {
 
@@ -1492,7 +1492,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
          *
          * @param {string|boolean} [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
@@ -1573,7 +1573,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
         /**
          * 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')