gina 0.1.1-alpha.166 → 0.1.1-alpha.167

package/framework/{v0.1.1-alpha.166 → 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.166 → 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.166 → 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.166 → 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.166 → 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.166 → 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.166 → 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')

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

@@ -2,8 +2,8 @@
  * ValidatorPlugin
  *
  * Dependencies:
- *  - utils/form-validator
- *  - utils/merge
+ *  - lib/form-validator
+ *  - lib/merge
  *  - utils/events
  *  - vendor/uuid
  *
@@ -88,11 +88,11 @@
     }
 
     var uuid            = (isGFFCtx) ? require('vendor/uuid') : require('uuid');
-    var merge           = (isGFFCtx) ? require('utils/merge') : require('../../../../../lib/merge');
-    var inherits        = (isGFFCtx) ? require('utils/inherits') : require('../../../../../lib/inherits');
-    var FormValidator   = (isGFFCtx) ? require('utils/form-validator') : require('./form-validator');
-    //var Collection      = (isGFFCtx) ? require('utils/collection') : require('../../../../../lib/collection');
-    var routing         = (isGFFCtx) ? require('utils/routing') : require('../../../../../lib/routing');
+    var merge           = (isGFFCtx) ? require('lib/merge') : require('../../../../../lib/merge');
+    var inherits        = (isGFFCtx) ? require('lib/inherits') : require('../../../../../lib/inherits');
+    var FormValidator   = (isGFFCtx) ? require('lib/form-validator') : require('./form-validator');
+    //var Collection      = (isGFFCtx) ? require('lib/collection') : require('../../../../../lib/collection');
+    var routing         = (isGFFCtx) ? require('lib/routing') : require('../../../../../lib/routing');
 
     /** definitions */
     var instance    = {
@@ -6934,5 +6934,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', 'utils/form-validator'], function(){ return ValidatorPlugin })
+    define('gina/validator', ['utils/events', 'utils/dom', 'lib/form-validator'], function(){ return ValidatorPlugin })
 }

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.167}/core/server.isaac.js

@@ -34,7 +34,7 @@ var refreshCore = function() {
     //update lib & helpers
     delete require.cache[require.resolve(_(libPath +'/index.js', true))];
     require.cache[_(libPath +'/index.js', true)] = require( _(libPath +'/index.js', true) );
-    require.cache[_(corePath + '/gna.js', true)].exports.utils = require.cache[_(libPath +'/index.js', true)];
+    require.cache[_(corePath + '/gna.js', true)].exports.lib = require.cache[_(libPath +'/index.js', true)];
 
     //update plugins
     delete require.cache[require.resolve(_(corePath +'/plugins/index.js', true))];

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.167}/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 routingUtils    = lib.routing;
+var routingLib    = lib.routing;
 var inherits        = lib.inherits;
 var merge           = lib.merge;
 var Proc            = lib.Proc;
@@ -1171,7 +1171,12 @@ function Server(options) {
 
             var headerValue = null;
             for (var h in resHeaders) {
-                if (!response.headersSent) {
+                if (
+                    // typeof(response.finished) != 'undefined' && !response.finished
+                    // || typeof(response.writableEnded) != 'undefined' && !response.writableEnded
+                    // ||
+                    !response.headersSent
+                ) {
                     // handles multiple origins
                     if ( /access\-control\-allow\-origin/i.test(h) ) { // re.test(resHeaders[h]
                         if (sameOrigin) {
@@ -1194,13 +1199,26 @@ function Server(options) {
                                 origin = sameOrigin;
 
 
-                            response.setHeader(h, origin);
+                            // if (
+                            //     typeof(response.finished) != 'undefined' && !response.finished
+                            //     || typeof(response.writableEnded) != 'undefined' && !response.writableEnded
+                            //     || !response.headersSent
+                            // ) {
+                                response.setHeader(h, origin);
+                            // }
+
                         }
                         sameOrigin = false;
                     } else {
                         headerValue = resHeaders[h];
                         try {
-                            response.setHeader(h, headerValue)
+                            // if (
+                            //     typeof(response.finished) != 'undefined' && !response.finished
+                            //     || typeof(response.writableEnded) != 'undefined' && !response.writableEnded
+                            //     || !response.headersSent
+                            // ) {
+                                response.setHeader(h, headerValue)
+                            // }
                         } catch (headerError) {
                             console.error(headerError)
                         }
@@ -1230,6 +1248,7 @@ function Server(options) {
             , cacheless = conf.cacheless
         ;
 
+
         if (
             headers[':path'] == '/'
             || headers[':path'] == this._options.conf.server.webroot
@@ -1247,6 +1266,10 @@ function Server(options) {
 
         var url = (isWebroot) ? this._referrer : headers[':path'];
 
+        var hanlersPath     = conf.handlersPath
+            , isHandler     = ( new RegExp('^'+ hanlersPath).test(assets[ url ].filename) ) ? true: false
+        ;
+
         if (!stream.pushAllowed) {
             asset = {
                 url         : url,
@@ -1255,13 +1278,39 @@ function Server(options) {
                 isAvailable : assets[ url ].isAvailable,
                 mime        : assets[ url ].mime,
                 encoding    : conf.encoding,
-                isHandler   : false
+                isBinary    : assets[ url ].isBinary,
+                isHandler   : assets[ url ].isHandler
             };
             header = merge({ ':status': 200 }, response.getHeaders());
             header['content-type'] = ( !/charset/.test(asset.mime ) ) ? asset.mime + '; charset='+ asset.encoding : asset.mime;
             header = completeHeaders(header, local.request, response);
-            if (assets[ url ].isBinary) {
-                header['content-length'] = fs.statSync(assets[ url ].filename).size;
+            if (asset.isBinary || asset.isHandler ) {
+
+
+                if (asset.isHandler) {
+                    // adding handler `gina.ready(...)` wrapper
+                    var file = null;
+                    if ( !fs.existsSync(asset.filename) ) {
+                        throwError({stream: stream}, 404, 'Page not found: \n' + headers[':path']);
+                        return;
+                    }
+
+                    if (!assets[ url ].file) {
+                        file      = fs.readFileSync(asset.filename, asset.encoding).toString();
+                        file      = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));';
+                        this._options.template.assets[ headers[':path'] ].file = file;
+                    } else {
+                        file = assets[ url ].file;
+                    }
+
+                    // header['content-length'] = fs.statSync(file).size;
+                    stream.respond(header);
+                    stream.end(file);
+
+                    return;
+                }
+
+                header['content-length'] = fs.statSync(asset.filename).size;
                 stream.respondWithFile(
                     asset.filename
                     , header
@@ -1336,7 +1385,7 @@ function Server(options) {
                 isAvailable : assets[ url ].isAvailable,
                 mime        : assets[ url ].mime,
                 encoding    : conf.encoding,
-                isHandler   : false
+                isHandler   : isHandler
             };
 
             console.debug('h2 pushing: '+ headers[':path'] + ' -> '+ asset.filename);
@@ -1349,7 +1398,7 @@ function Server(options) {
                     return;
                 }
 
-                asset.isHandler = true;
+                asset.isHandler = this._options.template.assets[ headers[':path'] ].isHandler  = true;
                 asset.file      = fs.readFileSync(asset.filename, asset.encoding).toString();
                 asset.file      = '(gina.ready(function onGinaReady($){\n'+ asset.file + '\n},window["originalContext"]));';
 
@@ -1473,6 +1522,7 @@ function Server(options) {
         var isFilenameDir   = null
             , dirname       = null
             , isBinary      = null
+            , isHandler     = null
             , hanlersPath   = null
         ;
 
@@ -1565,7 +1615,8 @@ function Server(options) {
 
                     if (!response.headersSent) {
 
-                        isBinary = true;
+                        isBinary    = true;
+                        isHandler   = false;
 
                         try {
                             contentType = getHead(response, filename);
@@ -1585,7 +1636,8 @@ function Server(options) {
                                 hanlersPath = bundleConf.handlersPath;
 
                                 if ( new RegExp('^'+ hanlersPath).test(filename) ) {
-                                    isBinary = false;
+                                    isBinary    = false;
+                                    isHandler   = true;
                                     file = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));'
                                 }
                             }
@@ -1611,7 +1663,8 @@ function Server(options) {
                                         mime: contentType,
                                         url: request.url,
                                         filename: filename,
-                                        isBinary: isBinary
+                                        isBinary: isBinary,
+                                        isHandler: isHandler
                                     }
                                 }
 
@@ -1691,12 +1744,14 @@ function Server(options) {
                                                     mime: contentType,
                                                     url: request.url,
                                                     filename: filename,
-                                                    isBinary: isBinary
+                                                    isBinary: isBinary,
+                                                    isHandler: isHandler
                                                 }
                                             }
 
                                             if (!fs.existsSync(filename)) return;
-                                            isBinary = ( /text\/html/i.test(contentType) ) ? false : true;
+                                            isBinary    = ( /text\/html/i.test(contentType) ) ? false : true;
+                                            isHandler   = ( new RegExp('^'+ bundleConf.handlersPath).test(filename) ) ? true : false;
                                             if ( isBinary ) {
                                                 // override
                                                 self._options.template.assets[request.url] = {
@@ -1705,7 +1760,18 @@ function Server(options) {
                                                     mime: contentType,
                                                     url: request.url,
                                                     filename: filename,
-                                                    isBinary: isBinary
+                                                    isBinary: isBinary,
+                                                    isHandler: isHandler
+                                                }
+                                            }
+
+                                            if ( isHandler ) {
+                                                // adding handler `gina.ready(...)` wrapper
+                                                var file = null;
+                                                if (!self._options.template.assets[request.url].file) {
+                                                    file      = fs.readFileSync(filename, bundleConf.encoding).toString();
+                                                    file      = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));';
+                                                    self._options.template.assets[request.url].file = file;
                                                 }
                                             }
                                             self.onHttp2Stream(stream, headers, response);
@@ -2732,7 +2798,7 @@ function Server(options) {
             , wroot             = null
         ;
 
-        //matched = routingUtils.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
+        //matched = routingLib.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
 
         req = checkPreflightRequest(req);
         var params      = {}
@@ -2798,7 +2864,7 @@ function Server(options) {
 
                 //Parsing for the right url.
                 try {
-                    isRoute = await routingUtils.compareUrls(params, routing[name].url, req, res, next);
+                    isRoute = await routingLib.compareUrls(params, routing[name].url, req, res, next);
                 } catch (err) {
                     var msg = 'Internal server error.\nRule [ '+name+' ] needs your attention.\n';
                     // TODO - Refactor `ApiError`to handle the following param
@@ -2918,7 +2984,7 @@ function Server(options) {
         }
 
         if (!res.headersSent) {
-            res.headersSent = true;
+            // res.headersSent = true;
             local.request = checkPreflightRequest(local.request);
             // updated filter on controller.js : 2020/09/25
             //if (isXMLRequest || !withViews || !isUsingTemplate ) {
@@ -3037,7 +3103,7 @@ function Server(options) {
                     }
 
                     var eRule = 'custom-error-page@'+ self.appName;
-                    var routeObj = routingUtils.getRoute(eRule);
+                    var routeObj = routingLib.getRoute(eRule);
                     routeObj.rule = eRule;
                     routeObj.url = url;
                     routeObj.param.title = ( typeof(eData.title) != 'undefined' ) ? eData.title : 'Error ' + eData.status;