gina 0.1.1-alpha.176 → 0.1.1-alpha.178

package/framework/{v0.1.1-alpha.176 → v0.1.1-alpha.178}/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.176/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.178/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"AAeAA,MAAA,CAAA,eAAA,CAA8BA,MAAA,CAAA,MAC9BA,OAAA,CAAA,WAAA,CAA8B,IAE9BA;MAAA,CAAA,YAAA,CAA8B,QAAQ,CAACC,CAAD,CAAO,CAEzC,GAAKA,CAAL,CAIO,CACH,GAAKA,CAAA,CAAA,iBAAL,CACI,MAAO,CAAA,CAGX,KAAIC,EAAUD,CAAA,CAAA,MAAVC,CAA2B,CAE3B,OAAU,+BAFiB,CAI3B,IAAY,4BAJe,CAM3B,SAAe,QAASC,CAAAA,IAAT,CAAc,iCAAd,CAAF,CAAuD,CAAA,CAAvD,CAA8D,CAAA,CANhD,CAQ3B,SAAY,iCARe,CAU3B,QAAWC,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,gCAAnB,CAAX,CAVgB,CAY3B,eAAkBF,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,uCAAnB,CAAX,CAZS,CAgB3BC,QAAU,gCAhBiB,CAkB3B,QAAY,gCAlBe;AAoB3B,SAAa,iCApBc,CAgC/BN,EAAA,CAAA,MAAA,CAAA,UAAA,CAA+B,QAAQ,CAACO,CAAD,CAAS,CAE5C,GAAuB,WAAvB,EAAK,MAAOA,EAAZ,CACI,MAAOP,EAAA,CAAA,MAAA,CAAA,OAGX,KAAIQ,EAAc,EAAlB,CACIC,EAAcT,CAAA,CAAA,MAAA,CAAA,OACdU,EAAAA,CAAK,IAAIC,MAAJ,CAAW,KAAX,CAAmBJ,CAAnB,CAA4BK,MAAOC,CAAAA,YAAP,CAAoB,EAApB,CAA5B,CAET,KAAIC,EAAc,IAClB,KAAKA,CAAL,GAAcL,EAAd,CACSC,CAAGR,CAAAA,IAAH,CAAQY,CAAR,CAAL,GACGN,CAAA,CAAOM,CAAP,CADH,CACmBL,CAAA,CAAQK,CAAR,CADnB,CAIJ,OAA4B,EAArB,CAACN,CAAA,CAAA,KAAA,EAAD,CAA0BA,CAA1B,CAAmC,IAhBE,CAoBhDT,OAAA,CAAA,QAAA,CAAkC,4BAClCA,OAAA,CAAA,eAAA,CAAkC,SAAUG,CAAAA,IAAV,CAAe,iCAAf,CAAA,CAAoD,CAAA,CAApD,CAA0D,CAAA,CAC5F,IAC+B,WAD/B,EACI,MAAOa,SAASC,CAAAA,MADpB,EAC8C,SAAWd,CAAAA,IAAX,CAAgBa,QAASC,CAAAA,MAAzB,CAD9C,EAGI,CAACD,QAASC,CAAAA,MAHd,EAGwB,IAAKd,CAAAA,IAAL,CAAUa,QAASE,CAAAA,IAAnB,CAHxB,CAIE,CAEE,IAAID;AAAiCE,CAAvB,GAAuBA,CAAjBH,QAASC,CAAAA,MAAQE,EAAAA,KAAxB,CAA8B,CAA9B,CACT,EAACF,CAAL,EAAe,IAAKd,CAAAA,IAAL,CAAUa,QAASE,CAAAA,IAAnB,CAAf,GACID,CACA,CADSD,QAASE,CAAAA,IAAKE,CAAAA,KAAd,CAAoB,MAApB,CACT,CAAIC,KAAMC,CAAAA,OAAN,CAAcL,CAAd,CAAJ,EAA6C,CAA7C,CAA6BA,CAAOM,CAAAA,MAApC,GACIN,CADJ,CACaA,CAAA,CAAO,CAAP,CADb,CAFJ,CAOA,EADIO,CACJ,CADcP,CAAOG,CAAAA,KAAP,CAAa,oBAAb,CACd,IACIpB,MAAA,CAAA,eADJ,CACgCC,CAAA,CAAA,MAAA,CAAA,QADhC,CAC+D,SAAUE,CAAAA,IAAV,CAAeqB,CAAA,CAAQ,CAAR,CAAWC,CAAAA,KAAX,CAAiB,GAAjB,CAAA,CAAuB,CAAvB,CAAf,CAAF,CAAgD,CAAA,CAAhD,CAAsD,CAAA,CADnH,CAVF,CAcFxB,CAAA,CAAA,iBAAA,CAAkC,CAAA,CAClCA,EAAA,CAAA,UAAA,CAAmBC,CAAnB,CAEA,IAAI,CACAD,CAAA,CAAA,KAAA,CAA8BG,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,8BAAnB,CAAX,CAD9B,CAEF,MAAOoB,CAAP,CAAY,CACV,KAAMA,EAAN,CADU,CAMVC,CAAAA,CAAc,IAGdC,EAAAA,CAAcC,QAASC,CAAAA,IAAKC,CAAAA,oBAAd,CAAmC,MAAnC,CAOlB,KAlGG,IA4FGC,EAAY,CA5Ff,CA6FGC,EAAYL,CAAML,CAAAA,MA7FrB,CA8FGW,EAAY,CAAA,CA9Ff,CA+FGvB,EAAgBC,MAAJ,CAPgBuB,8BAOhB,CAGlB,CAAOH,CAAP;AAAWC,CAAX,CAAgB,EAAED,CAAlB,CACI,GAAKrB,CAAGR,CAAAA,IAAH,CAAQyB,CAAA,CAAMI,CAAN,CAASd,CAAAA,IAAjB,CAAL,CAA8B,CAC1BgB,CAAA,CAAQ,CAAA,CACR,MAF0B,CAM7BA,CAAL,GACIP,CAMA,CANkBE,QAASO,CAAAA,aAAT,CAAuB,MAAvB,CAMlB,CALAT,CAAKT,CAAAA,IAKL,CALkBhB,CAAA,CAAA,OAKlB,CAxB8BiC,8BAwB9B,CAJAR,CAAKU,CAAAA,KAIL,CAJkB,QAIlB,CAHAV,CAAKW,CAAAA,GAGL,CAHkB,YAGlB,CAFAX,CAAKY,CAAAA,IAEL,CAFkB,UAElB,CAAAV,QAASE,CAAAA,oBAAT,CAA8B,MAA9B,CAAA,CAAsC,CAAtC,CAAyCS,CAAAA,WAAzC,CAAqDb,CAArD,CAPJ,CAWK,UAAUxB,CAAAA,IAAV,CAAeD,CAAA,CAAA,QAAf,CAAL,GACQuC,CACJ,CAD0BzC,MAAA,CAAA,OAAA,CAAkB,cAAlB,CAC1B,CAAAA,MAAA,CAAA,WAAA,CAA0B,IAAIyC,CAFlC,CAKA,OAAO,CAAA,CAzHJ,CAFH,MAAO,CAAA,CAJ8B;",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.176/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.178/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.176 → v0.1.1-alpha.178}/core/config.js

@@ -1625,7 +1625,8 @@ function Config(opt, contextResetNeeded) {
                 files['statics'] = requireJSON(staticsPath)
             } else if ( typeof(files['statics']) != 'undefined' ) {
                 var defaultAliases = requireJSON(staticsPath);
-                files['statics'] = merge(defaultAliases, files['statics'], true)
+                // files['statics'] = merge(defaultAliases, files['statics'], true)
+                files['statics'] = merge(files['statics'], defaultAliases);
             }
 
 

package/framework/{v0.1.1-alpha.176 → v0.1.1-alpha.178}/core/controller/controller.js

@@ -109,6 +109,24 @@ function SuperController(options) {
 
         return /http2/.test(httpLib)
     }
+
+    var headersSent = function(res) {
+        var _res = ( typeof(res) != 'undefined' ) ? res : local.res;
+
+        if ( typeof(_res.headersSent) != 'undefined' ) {
+            return _res.headersSent
+        }
+
+        if (
+            typeof(_res.stream) != 'undefined'
+            && typeof(_res.stream.headersSent) != 'undefined'
+            && _res.stream.headersSent != 'null'
+        ) {
+            return true
+        }
+
+        return false;
+    }
     /**
      * isSecured
      * Returns `true` if server configured to handle a HTTPS exchanges
@@ -1025,7 +1043,8 @@ function SuperController(options) {
             */
 
 
-            if ( !local.res.headersSent ) {
+            // if ( !local.res.headersSent ) {
+            if ( !headersSent() ) {
                 local.res.statusCode = ( typeof(localOptions.conf.server.coreConfiguration.statusCodes[data.page.data.status])  != 'undefined' ) ? data.page.data.status : 200; // by default
                 //catching errors
                 if (
@@ -1088,7 +1107,7 @@ function SuperController(options) {
                 // Last compilation before rendering
                 layout = swig.compile(layout, mapping)(data);
 
-                if ( !local.res.headersSent ) {
+                if ( !headersSent() ) {
                     if ( local.options.isRenderingCustomError ) {
                         local.options.isRenderingCustomError = false;
                     }
@@ -1190,7 +1209,7 @@ function SuperController(options) {
                 response.setHeader('content-type', local.options.conf.server.coreConfiguration.mime['json'] + '; charset='+ local.options.conf.encoding)
             }
 
-            if ( !response.headersSent ) {
+            if ( !headersSent(response) ) {
                 console.info(request.method +' ['+ response.statusCode +'] '+ request.url);
 
                 if ( local.options.isXMLRequest && self.isWithCredentials() )  {
@@ -1204,7 +1223,7 @@ function SuperController(options) {
                         len = data.length
                     }
 
-                    if (!response.headersSent)
+                    if (!headersSent(response))
                         response.setHeader("content-length", len);
 
 
@@ -1237,7 +1256,7 @@ function SuperController(options) {
 
                 } else { // normal case
                     response.end(JSON.stringify(jsonObj));
-                    if (!response.headersSent) {
+                    if (!headersSent(response)) {
                         try {
                             response.headersSent = true;
                         } catch(err) {
@@ -1278,7 +1297,7 @@ function SuperController(options) {
             local.res.setHeader('content-type', 'text/plain' + '; charset='+ local.options.conf.encoding);
         }
 
-        if ( !local.res.headersSent ) {
+        if ( !headersSent() ) {
             console.info(local.req.method +' ['+local.res.statusCode +'] '+ local.req.url);
             local.res.end(content);
             try {
@@ -1601,7 +1620,7 @@ function SuperController(options) {
      *      only means that the ID you are using for the form might be
      *      a duplicate one from the the main document !!!
      *
-     * @param {object|string} req|rule - Request Object or Rule/Route name
+     * @param {object|string} req|rule|url - Request Object or Rule/Route name
      * @param {object|boolean} res|ignoreWebRoot - Response Object or Ignore WebRoot & start from domain root: /
      * @param {object} [params] TODO
      *
@@ -1783,7 +1802,7 @@ function SuperController(options) {
 
 
 
-            if (!local.res.headersSent) {
+            if (!headersSent()) {
 
                 // backing up oldParams
                 var oldParams = local.req[originalMethod.toLowerCase()];
@@ -1805,6 +1824,7 @@ function SuperController(options) {
                     code = 303;
                 }
 
+                var inheritedDataIsNeeded = ( req.method.toLowerCase() == originalMethod.toLowerCase() ) ? false: true;
 
                 // merging new & olds params
                 requestParams = merge(requestParams, oldParams);
@@ -1847,7 +1867,9 @@ function SuperController(options) {
                         return;
                     }
 
-                    path += inheritedData;
+                    if (inheritedDataIsNeeded) {
+                        path += inheritedData;
+                    }
                 }
 
                 var ext = 'html';
@@ -3668,6 +3690,20 @@ function SuperController(options) {
         self.render(data, displayToolbar, errOptions);
     }
 
+    var getResponseProtocol = function (response) {
+        // var options =  local.options;
+        // var protocolVersion = ~~options.conf.server.protocol.match(/\/(.*)$/)[1].replace(/\.\d+/, '');
+
+        var protocol    = 'http/'+ local.req.httpVersion; // inheriting request protocol version by default
+        var bundleConf  = options.conf;
+        // switching protocol to h2 when possible
+        if ( /http\/2/.test(bundleConf.server.protocol) && response.stream ) {
+            protocol    = bundleConf.server.protocol;
+        }
+
+        return protocol;
+    }
+
 
     /**
      * Throw error
@@ -3679,6 +3715,11 @@ function SuperController(options) {
      * @returns {void}
      * */
     this.throwError = function(res, code, msg) {
+
+        var protocol        = getResponseProtocol(res);
+        var stream          = ( /http\/2/.test(protocol) && res.stream ) ? res.stream : null;
+        var header          = ( /http\/2/.test(protocol) && res.stream ) ? {} : null;
+
         self.isProcessingError = true;
         var errorObject = null; // to be returned
 
@@ -3744,10 +3785,16 @@ function SuperController(options) {
             res           = local.res;
         }
 
-        var responseHeaders = res.getHeaders() || local.res.getHeaders();
+        var responseHeaders = null;
+        if ( typeof(res.getHeaders) == 'undefined' && typeof(res.stream) != 'undefined' ) {
+            responseHeaders = res.stream.sentHeader;
+        } else {
+            responseHeaders = res.getHeaders() || local.res.getHeaders();
+        }
+        // var responseHeaders = res.getHeaders() || local.res.getHeaders();
         var req             = local.req;
         var next            = local.next;
-        if (!res.headersSent) {
+        if (!headersSent()) {
             // DELETE request methods don't normaly use a view,
             // but if we are calling it from a view, we should render the error back to the view
             if ( self.isXMLRequest() || !hasViews() && !/delete/i.test(req.method) || !local.options.isUsingTemplate && !hasViews() || hasViews() && !local.options.isUsingTemplate ) {
@@ -4000,8 +4047,12 @@ function SuperController(options) {
             if (typeof(next) != 'undefined')
                 return next();
         }
-        res.end();
-        return;
+
+        if ( /http\/2/.test(protocol) ) {
+            return stream.end();
+        }
+
+        return res.end();
     }
 
     // converting references to objects

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

@@ -5214,7 +5214,7 @@
                                     event.currentTarget.setAttribute('method', newFormMethod);
                                 }
                             } else if ($el.parentNode.form) {
-                                if ($el.form.setAttribute) {
+                                if ($el.parentNode.form.setAttribute) {
                                     $el.parentNode.form.setAttribute('method', newFormMethod);
                                 } else {
                                     event.currentTarget.setAttribute('method', newFormMethod);

package/framework/{v0.1.1-alpha.176 → v0.1.1-alpha.178}/core/router.js

@@ -10,13 +10,10 @@
 
 //Imports.
 var fs                = require('fs')
-
     , lib               = require('./../lib')
     , console           = lib.logger
     , inherits          = lib.inherits
     , merge             = lib.merge
-    , routing           = lib.routing
-
     , SuperController   = require('./controller')
     , Config            = require('./config')
 ;
@@ -108,18 +105,18 @@ function Router(env) {
     this.route = function(request, response, next, params) {
 
         /**
-        * BO e
         * ExpressJS modules + HTTP2 fix
-        * Hack required until `express-<plugin>` get support for http2 (express-session)
+        * Hack required until `express-<plugin>` get support for http2 `express-session`
+        * or similar modules
         */
         if (!response._implicitHeader) {
             response._implicitHeader = function(){ return; }; // we need to force it
         }
+
         /**
         * EO Passport JS HTTP2 fix
         */
 
-
         /**
         * BO Passport JS HTTP2 fix : taken from passport/request.js
         */
@@ -190,7 +187,7 @@ function Router(env) {
         }
 
         // for redirect with `hidden inheritedData`
-        if ( /get/i.test(request.method) && typeof(request.session) != 'undefined' ) {
+        if ( /^get$/i.test(request.method) && typeof(request.session) != 'undefined' ) {
             var userSession = request.session.user || request.session;
             if ( typeof(userSession.inheritedData) != 'undefined' ) {
                 if (!request.get) {
@@ -489,8 +486,6 @@ function Router(env) {
                             // Inheriting SuperController functions & objects
                             // Exporting config & common methods
                             Setup.engine                = controller.engine;
-                            // This is working, but too heavy
-                            // TODO- Allow user to target selected methods to be exported
                             // TODO - loop on a defiend SuperController property like SuperController._allowedForExport
                             // for ( let f in controller) {
                             //     if ( typeof(controller[f]) != 'function' ) {
@@ -670,11 +665,6 @@ function Router(env) {
         }
     };
 
-    // var hasViews = function() {
-    //     return local.routeHasViews;
-    // };
-
     init()
-};
-
-module.exports = Router
+}
+module.exports = Router;