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

package/framework/{v0.1.1-alpha.165 → 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.165 → 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;

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/template/boilerplate/bundle/controllers/controller.content.js

@@ -20,7 +20,7 @@ function {Bundle}ContentController() {
         var data = {
             msg: appConf.greeting
         };
-        
+
         self.renderJSON(data);
 
         // use this to render errors

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/template/boilerplate/bundle/controllers/setup.js

@@ -1,7 +1,7 @@
 //Imports goes here.
-// var md = require('marked'); // visit: https://github.com/jmcmanus/pagedown-extra
-// var utils   = require('gina').utils;
-// var merge   = utils.merge;
+// var md       = require('marked'); // visit: https://github.com/jmcmanus/pagedown-extra
+// var lib      = require('gina').lib;
+// var merge    = lib.merge;
 
 /**
  * Setup Class
@@ -21,14 +21,14 @@ function SetupClass(req, res, next){
 
     // defining filters
     var swig = this.engine;
-    
+
     /**
      * Inherited filters from Gina are:
      * [ getWebroot ]
      * Will get the current webroot
      *  e.g.:
      *      {{ '' | getWebroot() }}
-     * 
+     *
      * [ getUrl ]
      * Will tranlate a route name to an url
      *  e.g.:
@@ -38,25 +38,25 @@ function SetupClass(req, res, next){
      *      <a href="{{ 'users-get-empty' | getUrl({ id: '' }) }}">Get empty</a>
      *      <a href="{{ 'users-list' | getUrl(null, 'http://domain.com') }}">Display all users</a>
      *      <a href="{{ '/dashboard' | getUrl(null, 'admin') }}">Go to admin bundle's dashboard page</a>
-     *      <a href="{{ 'home@admin' | getUrl() }}">Go to admin bundle's dashboard page</a>      
-     * 
+     *      <a href="{{ 'home@admin' | getUrl() }}">Go to admin bundle's dashboard page</a>
+     *
      * [ length ]
      *  Extends default Swig `length` filter
-     *  
+     *
      * [ nl2br ]
      * Will replace all `\n` by `<br/>`
      *  e.g.:
      *      {{ contact.address | nl2br }}
      */
-    
-    
+
+
     /**
      * Sample of a swig filter to render markdown content
      * To activate this code, you will need :
      * 1) to install `marked` dependency : npm install marked --save
      * 2) uncomment imports on the top of this script
      * 3) uncomment the following filter definition
-     */    
+     */
     // // default markdown options
     // var markdownOpt = { // visit: https://github.com/jmcmanus/pagedown-extra
     //     //renderer    : mdRenderer,
@@ -71,11 +71,11 @@ function SetupClass(req, res, next){
     // };
 
     // md.setOptions(markdownOpt);
-    
+
     // var setupSwigFilters = function(swig) {
-        
+
     //     if ( typeof(swig) == 'undefined' ) return;
-        
+
     //     /*
     //     * markdown filter
     //     * Usage:
@@ -101,7 +101,7 @@ function SetupClass(req, res, next){
     //         return text
     //     });
     // }
-    
+
     if (swig && typeof(setupSwigFilters) != 'undefined') { // not always available: redirect, xhr requests
         setupSwigFilters(swig)
     }

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

@@ -6,10 +6,22 @@
 //var session = require('express-session');
 var {bundle} = require('gina');
 
+// gina lib samples
+// var lib             = {bundle}.lib;
+// var routing         = lib.routing;
+// var console         = lib.logger;
+// var operate         = lib.math.operate;
+// var Collection      = lib.Collection;
+// var SessionStore    = lib.SessionStore(session);
+// var Domain          = lib.Domain;
+
+
 // do whatever things you need to do before server starts
 //{bundle}.onInitialize( function(event, app, express){//
 //    var self = {bundle};
-//    var conf = self.getConfig(); // getting config/app.json would be: self.getConfig('app')
+//    // getting config/app.json would be: self.getConfig('app')
+//    // or self.getConfig().app
+//    var conf = self.getConfig();
 //    // you can use express middleware components
 //    // eg.: app.use( session({secret: '1234567890QWERTY'}) );
 //

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/template/command/gina.tpl

@@ -17,10 +17,10 @@ var fs = require('fs');
 
 try {
     require('./node_modules/gina/node_modules/colors');
-    var utils = require("./node_modules/gina/core/utils");
-    var console = utils.logger;
+    var lib     = require("./node_modules/gina/core/lib");
+    var console = lib.logger;
     console.log('Gina I/O Command Line Tool \r\n'.rainbow);
-    utils.cmd.load(__dirname, "/node_modules/gina/package.json")
+    lib.cmd.load(__dirname, "/node_modules/gina/package.json")
 } catch (err) {
     process.stdout.write(err.stack + '\r\n')
 }

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/helpers/console.js

@@ -9,8 +9,8 @@
 /**
  * ConsoleHelper
  *
- * @package     Gina.Utils.Helpers
- * @namespace   Gina.Utils.Helpers.ConsoleHelper
+ * @package     Gina.Lib.Helpers
+ * @namespace   Gina.Lib.Helpers.ConsoleHelper
  * @author      Rhinostone <contact@gina.io>
  * */
 

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/helpers/context.js

@@ -14,7 +14,7 @@ const {execSync}    = require('child_process');
 /**
  * ContextHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
@@ -258,7 +258,7 @@ function ContextHelper(contexts) {
 
         setContext('envs', projects[projectName].envs);
         setContext('bundles', bundles);
-        // setContext('gina.utils', lib);
+        // setContext('gina.lib', lib);
         // setContext('gina.Config', Config);
         // setContext('gina.locales', locales);
         // setContext('gina.plugins', plugins);

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/helpers/dateFormat.js

@@ -30,7 +30,7 @@
 function DateFormatHelper() {
 
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
-    var merge           = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+    var merge           = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
 
 
     // if ( typeof(define) === 'function' && define.amd ) {
@@ -126,7 +126,7 @@ function DateFormatHelper() {
     var format = function(date, mask, utc) {
 
         // if ( typeof(merge) == 'undefined' || !merge ) {
-        //     merge = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+        //     merge = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
 
         // }
 
@@ -141,7 +141,7 @@ function DateFormatHelper() {
         } catch( mergeErr) {
             // called from logger - redefinition needed for none-dev env: cache issue
             isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
-            merge           = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+            merge           = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
             masksList = merge(i18n.masks, dF.masks);
         }
 
@@ -280,8 +280,8 @@ function DateFormatHelper() {
     /**
      *  Will give an array of dates between the current date to a targeted date
      *
-     *  TODO - add a closure to `ignoreWeekend()` based on Utils::Validator
-     *  TODO - add a closure to `ignoreFromList(array)` based on Utils::Validator
+     *  TODO - add a closure to `ignoreWeekend()` based on Lib::Validator
+     *  TODO - add a closure to `ignoreFromList(array)` based on Lib::Validator
      *
      *  @param {object} dateTo
      *  @param {string} [ mask ]

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

@@ -10,10 +10,10 @@ var fs = require('fs');
 /**
  * @module Helpers
  *
- * Gina Utils Helpers
+ * Gina Lib Helpers
  *
- * @package     Gina.Utils
- * @namespace   Gina.Utils.Helpers
+ * @package     Gina.Lib
+ * @namespace   Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  */
 var _require = function(path) {

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/helpers/json/src/main.js

@@ -11,14 +11,14 @@
 /**
  * JSONHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
 
 module.exports = function(){
 
-    // `JSON.clone()` is a prototype defined in `GINA_DIR//utils/prototypes.json_clone`
+    // `JSON.clone()` is a prototype defined in `GINA_DIR//lib/prototypes.json_clone`
 
     /**
      * Load a json file and removing comments if found

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/helpers/path.js

@@ -23,7 +23,7 @@ e.setMaxListeners(100);
 /**
  * PathHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinzostone <contact@gina.io>
  * @api public
  *
@@ -866,7 +866,7 @@ function PathHelper() {
 //                if (err) {
 //                    logger.error(
 //                        'gina',
-//                        'UTILS:PATH:ERROR:7',
+//                        'LIB:HELPERS:PATH:ERROR:7',
 //                        err,
 //                        __stack
 //                    );

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

@@ -10,7 +10,7 @@
 /**
  * PluginsHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/helpers/text.js

@@ -9,7 +9,7 @@
 /**
  * TextHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */