gina 0.1.1-alpha.179 → 0.1.1-alpha.180

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/lib/swig-filters/src/main.js

@@ -6,6 +6,7 @@
  * file that was distributed with this source code.
  */
 
+
 /**
  * SwigFilters
  * ------
@@ -30,10 +31,20 @@
  * */
 function SwigFilters(conf) {
 
-    var isGFFCtx    = ((typeof (module) !== 'undefined') && module.exports) ? false :  true;
+    var isGFFCtx    = ((typeof (module) !== 'undefined') && module.exports) ? false : true;
+
+    if ( typeof(merge) == 'undefined' ) {
+        var merge = null;
+    }
     if ( !merge || typeof(merge) != 'function' ) {
         merge = require(_(GINA_FRAMEWORK_DIR+"/lib/merge", true));
     }
+    if ( typeof(routing) == 'undefined' ) {
+        var routing = null;
+    }
+    if ( !routing || typeof(routing) != 'function' ) {
+        routing = require(_(GINA_FRAMEWORK_DIR+"/lib/routing", true));
+    }
 
     var self = { options: conf };
     var init = function() {
@@ -81,11 +92,11 @@ function SwigFilters(conf) {
         return url
     }
 
-    // var getRouteDefinition = function(routing, rule, method) {
+    // var getRouteDefinition = function(routingRules, rule, method) {
     //     var routeObject = null;
-    //     for (r in routing) {
-    //         if ( r == rule && routing[r].method.toLowerCase() == method.toLowerCase() ) {
-    //             routeObject = routing[r];
+    //     for (r in routingRules) {
+    //         if ( r == rule && routingRules[r].method.toLowerCase() == method.toLowerCase() ) {
+    //             routeObject = routingRules[r];
     //             break;
     //         }
     //     }
@@ -131,7 +142,7 @@ function SwigFilters(conf) {
             , isStandalone      = null
             , isMaster          = null
             , isProxyHost       = ctx.isProxyHost
-            , routing           = null
+            , routingRules      = null
             , rule              = null
             , url               = NaN
             , urlStr            = null
@@ -143,7 +154,7 @@ function SwigFilters(conf) {
         }
 
         // if no route, returns current route
-        if ( !route || typeof(route) == 'undefined') {
+        if ( !route || typeof(route) == 'undefined') {
             route = ctx.options.rule
         }
 
@@ -170,7 +181,7 @@ function SwigFilters(conf) {
         wroot           = config.server.webroot;
         isStandalone    = (config.bundles.length > 1) ? true : false;
         isMaster        = (config.bundles[0] === config.bundle) ? true : false;
-        routing         = config.routing;
+        routingRules    = config.routing;
 
 
         if ( typeof(base) != 'undefined' ) {
@@ -183,7 +194,7 @@ function SwigFilters(conf) {
                     // config override
                     config          = mainConf.Env.getConf(base, mainConf.env);
 
-                    // retrieve hostname, webroot & routing
+                    // retrieve hostname, webroot & routingRules
                     hostname        = config.hostname + config.server.webroot;
                     // rewrite hostname vs ctx.req.headers.host
                     if ( isProxyHost ) {
@@ -217,81 +228,88 @@ function SwigFilters(conf) {
 
         // rules are now unique per bundle : rule@bundle
         rule = route + '@' + config.bundle;
-        //var ruleObj = getRouteDefinition(routing, rule, method);
-        var ruleObj = routing[rule];
-        if ( typeof(ruleObj) != 'undefined' && ruleObj != null ) { //found
-
-            url = ruleObj.url;
-
-            if ( typeof(ruleObj.requirements) != 'undefined' ) {
-                var urls    = null
-                    , i     = 0
-                    , len   = null
-                    , p     = null
-                ;
-
-                for (p in ruleObj.requirements) {
-
-                    if ( /\,/.test(url) ) {
-                        urls = url.split(/\,/g);
-                        i = 0; len = urls.length;
-                        for (; i< len; ++i) {
-                            if ( params && /:/.test(urls[i]) ) {
-                                urlStr = urls[i].replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1');
-                                break
-                            }
-                        }
-
-                        url = (urlStr != null) ? urlStr : urls[0];
-                    } else {
-                        try {
-                            url = url.replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1')
-                        } catch (err) {
-                            ctx.throwError(ctx.res, 500, new Error('template compilation exception encoutered: [ '+ url +' ]\nsounds like you are having troubles with the following call `{{ "'+route+'" | getUrl() }}` where `'+p+'` parameter is expected according to your `routing.json`'  +'\n'+ (err.stack||err.message)));
-                        }
-                    }
-                }
-            } else {
-                if ( /\,/.test(url) ) {
-                    url = url.split(/\,/g)[0] || null; // just taking the default one: using the first element unless it is empty.
-                    if (!url) {
-                        ctx.throwError(ctx.res, 500, new Error('please check your `routing.json` at the defined rule `'+ rule +'` : `url` attribute cannot be empty').stack)
-                    }
-                }
-            }
-
-
-            if (hostname.length > 0) {
-                url = url.replace(wrootRe, '');
-            }
-
-            // fix url in case of empty param value allowed by the routing rule
-            // to prevent having a folder.
-            // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
-            if ( /\/$/.test(url) && url != '/' )
-                url = url.substr(0, url.length-1);
-
-            url = hostname + url;
-
-        } else {
+        //var ruleObj = getRouteDefinition(routingRules, rule, method);
+        try {
+            url = routing.getRoute(route +'@'+ config.bundle, params).toUrl();
+        } catch (routingErr) {
+            url = '404:['+ ctx.req.method +']'+rule
+        }
 
-            if ( typeof(routing['404@'+ config.bundle]) != 'undefined' && typeof(routing['404@'+ config.bundle].url) != 'undefined' ) {
-                //url = ( /^\//.test(routing['404@'+ config.bundle].url) ) ? hostname + routing['404@'+ config.bundle].url.substr(1) : hostname + routing['404@'+ config.bundle].url;
-                url = routing['404@'+ config.bundle].url.replace(wrootRe, '');
-                if (hostname.length > 0) {
-                    url = url.replace(wrootRe, '');
-                }
-                url = hostname + url;
-            } else {
-                url = route;
-                if (hostname.length > 0) {
-                    url = url.substr(1);
-                }
-                url = hostname + url
-            }
 
-            return '404:['+ ctx.req.method +']'+rule
-        }
+        // var ruleObj = routingRules[rule];
+        // if ( typeof(ruleObj) != 'undefined' && ruleObj != null ) { //found
+
+        //     url = ruleObj.url;
+
+        //     if ( typeof(ruleObj.requirements) != 'undefined' ) {
+        //         var urls    = null
+        //             , i     = 0
+        //             , len   = null
+        //             , p     = null
+        //         ;
+
+        //         for (p in ruleObj.requirements) {
+
+        //             if ( /\,/.test(url) ) {
+        //                 urls = url.split(/\,/g);
+        //                 i = 0; len = urls.length;
+        //                 for (; i< len; ++i) {
+        //                     if ( params && /:/.test(urls[i]) ) {
+        //                         urlStr = urls[i].replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1');
+        //                         break
+        //                     }
+        //                 }
+
+        //                 url = (urlStr != null) ? urlStr : urls[0];
+        //             } else {
+        //                 try {
+        //                     url = url.replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1')
+        //                 } catch (err) {
+        //                     ctx.throwError(ctx.res, 500, new Error('template compilation exception encoutered: [ '+ url +' ]\nsounds like you are having troubles with the following call `{{ "'+route+'" | getUrl() }}` where `'+p+'` parameter is expected according to your `routing.json`'  +'\n'+ (err.stack||err.message)));
+        //                 }
+        //             }
+        //         }
+        //     } else {
+        //         if ( /\,/.test(url) ) {
+        //             url = url.split(/\,/g)[0] || null; // just taking the default one: using the first element unless it is empty.
+        //             if (!url) {
+        //                 ctx.throwError(ctx.res, 500, new Error('please check your `routing.json` at the defined rule `'+ rule +'` : `url` attribute cannot be empty').stack)
+        //             }
+        //         }
+        //     }
+
+
+        //     if (hostname.length > 0) {
+        //         url = url.replace(wrootRe, '');
+        //     }
+
+        //     // fix url in case of empty param value allowed by the routing rule
+        //     // to prevent having a folder.
+        //     // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
+        //     if ( /\/$/.test(url) && url != '/' )
+        //         url = url.substr(0, url.length-1);
+
+        //     url = hostname + url;
+
+        // } else {
+
+        //     if ( typeof(routingRules['404@'+ config.bundle]) != 'undefined' && typeof(routingRules['404@'+ config.bundle].url) != 'undefined' ) {
+        //         //url = ( /^\//.test(routingRules['404@'+ config.bundle].url) ) ? hostname + routingRules['404@'+ config.bundle].url.substr(1) : hostname + routingRules['404@'+ config.bundle].url;
+        //         url = routingRules['404@'+ config.bundle].url.replace(wrootRe, '');
+        //         if (hostname.length > 0) {
+        //             url = url.replace(wrootRe, '');
+        //         }
+        //         url = hostname + url;
+        //     } else {
+        //         url = route;
+        //         if (hostname.length > 0) {
+        //             url = url.substr(1);
+        //         }
+        //         url = hostname + url
+        //     }
+
+        //     return '404:['+ ctx.req.method +']'+rule
+        // }
 
         return url
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.179",
+  "version": "0.1.1-alpha.180",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.179/core/gna",
+  "main": "./framework/v0.1.1-alpha.180/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "postpublish": "node ./script/post_publish.js",

package/framework/v0.1.1-alpha.179/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.179