gina 0.1.6-alpha.18 → 0.1.6-alpha.19

package/framework/v0.1.6-alpha.19/VERSION

@@ -0,0 +1 @@
+0.1.6-alpha.19

package/framework/v0.1.6-alpha.19/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.19/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}

package/framework/{v0.1.6-alpha.18 → v0.1.6-alpha.19}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -7782,7 +7782,7 @@ function Routing() {
             urlProps.hostname = config.hostname;
             if ( typeof(bundle) != 'undefined' ) {
                 // get from webroot
-                _route = routing.getRoute('webroot@'+ bundle);
+                _route = this.getRoute('webroot@'+ bundle);
                 urlProps.hostname   = _route.hostname;
                 urlProps.host       = _route.host;
                 urlProps.webroot    = _route.webroot;
@@ -7883,9 +7883,11 @@ function Routing() {
             return foundRoute;
         }
 
+
         return await parseRouting(params, url, request, response, next);
     };
 
+
     /**
      * Check if rule has params
      *
@@ -8553,7 +8555,7 @@ function Routing() {
      * */
     self.getRoute = function(rule, params, urlIndex) {
 
-        var config = null, isProxyHost = null;
+        var config = null, isProxyHost = false;
         if (isGFFCtx) {
             if (
                 !window.location.port
@@ -8613,8 +8615,11 @@ function Routing() {
         var msg     = null;
         route = checkRouteParams(route, params);
 
+        route.isProxyHost = isProxyHost;
         if (isProxyHost) {
-            route.hostname = route.hostname.replace(/\:\d+/, '');
+            // route.hostname = route.hostname.replace(/\:\d+/, '');
+            route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : config.envConf._proxyHostname;
+            route.host      = route.hostname.replace(/^(https|http)\:\/\//, '');
         }
 
         if ( /\,/.test(route.url) ) {
@@ -8690,7 +8695,15 @@ function Routing() {
                 , path      = this.url
             ;
 
-            this.url = ( typeof(ignoreWebRoot) != 'undefined' && ignoreWebRoot == true ) ? path.replace(wroot, '/') : path;
+            this.url = (
+                    typeof(ignoreWebRoot) != 'undefined'
+                    && /^true$/i.test(ignoreWebRoot)
+                ) ? path.replace( new RegExp('^'+ wroot), '/') : path.replace( new RegExp('^('+wroot +'|\/$)'), wroot);
+
+            // this.url = (
+            //     typeof(ignoreWebRoot) != 'undefined'
+            //     && /^true$/i.test(ignoreWebRoot)
+            // ) ? path.replace( new RegExp('\/'+ wroot), '/') : path;
 
 
             return hostname + this.url
@@ -8836,12 +8849,13 @@ function Routing() {
     /**
      * Get route by url
      * N.B.: this will only work with rules declared with `GET` method property
+     * ATTENTION !!! Not fully working for frontend because of unresolved promises !!!!
      *
      * @function getRouteByUrl
      *
      * @param {string} url e.g.: /webroot/some/url/path or http
      * @param {string} [bundle] targeted bundle
-     * @param {string} [method] request method (GET|PUT|PUT|DELETE) - GET is set by default
+     * @param {string} [method] 2nd or 3rd -  request method (GET|PUT|PUT|DELETE) - GET is set by default
      * @param {object} [request]
      * @param {boolean} [isOverridinMethod] // will replace request.method by the provided method - Used for redirections
      *
@@ -8936,6 +8950,9 @@ function Routing() {
                 params: {},
                 url: url
             };
+            if (bundle) {
+                request.bundle = bundle;
+            }
         } else {
 
             var gnaCtx      = getContext('gina');
@@ -9023,11 +9040,8 @@ function Routing() {
                 // normal case
                 //Parsing for the right url.
                 try {
-
                     isRoute = self.compareUrls(params, routing[name].url, request);
-
                     if (isRoute.past) {
-
                         route = JSON.clone(routing[name]);
                         route.name = name;