gina 0.1.2-alpha.5 → 0.1.3-alpha.1

package/framework/{v0.1.2-alpha.5 → v0.1.3-alpha.1}/core/router.js

@@ -9,7 +9,7 @@
 
 
 //Imports.
-var fs                = require('fs')
+var fs                  = require('fs')
     , lib               = require('./../lib')
     , console           = lib.logger
     , inherits          = lib.inherits
@@ -81,6 +81,8 @@ function Router(env, scope) {
         require.cache[_(corePath +'/controller/index.js', true)] = require( _(corePath +'/controller/index.js', true) );
 
         SuperController = require.cache[_(corePath +'/controller/index.js', true)];
+
+        corePath = null;
     }
 
     this.setServerInstance = function(serverInstance) {
@@ -350,7 +352,7 @@ function Router(env, scope) {
 
         setContext('router', routerObj);
 
-        var middleware      = params.middleware || [];
+        var middleware      = params.middleware || [];
         var actionFile      = params.param.file || null; // matches rule name
         var namespace       = params.namespace;
         var routeHasViews   = routerObj.hasViews;
@@ -367,24 +369,25 @@ function Router(env, scope) {
         //Getting superCleasses & extending it with super Models.
         var mainControllerFile          = conf.bundlesPath +'/'+ bundle + '/controllers/controller.js'
             , controllerFile            = null
-            , setupFile                 = null
             , MainController            = {} // controller.js
             , Controller                = {} // controller.namespace.js
             , hasControllerNamespace    = (namespace) ? true : false
         ;
 
         // TODO -  ?? Merge all controllers into a single file while building for other env than `dev`
-
-        setupFile = conf.bundlesPath +'/'+ bundle + '/controllers/setup.js';
-        var filename = '';
+        var filename        = ''
+            , filenameObj   = null
+        ;
         if (hasControllerNamespace) {
-            filename = conf.bundlesPath +'/'+ bundle + '/controllers/controller.'+ namespace +'.js';
-            if ( !fs.existsSync(filename) ) {
+            filenameObj = new _(conf.bundlesPath +'/'+ bundle + '/controllers/controller.'+ namespace +'.js', true);
+            filename    = filenameObj.toString();
+            if ( !filenameObj.existsSync() ) {
                 hasControllerNamespace = false;
                 console.warn('Namespace `'+ namespace +'` found, but no related controller file found at `'+filename+'` to load: just ignore this message if this is ok with you');
                 filename = conf.bundlesPath +'/'+ bundle + '/controllers/controller.js';
                 console.info('Switching to default controller: '+ mainControllerFile);
             }
+            filenameObj = null;
         } else {
             filename = mainControllerFile;
         }
@@ -443,11 +446,15 @@ function Router(env, scope) {
         /**
          * EO routing configuration
          */
-
+        var setupFileObj    = new _(conf.bundlesPath +'/'+ bundle + '/controllers/setup.js', true)
+            , setupFile     = setupFileObj.toString()
+        ;
         try {
 
-            if ( fs.existsSync(_(setupFile, true)) )
+            if ( setupFileObj.existsSync() ) {
                 hasSetup = true;
+            }
+            setupFileObj = null;
 
             if (cacheless) {
                 if (hasControllerNamespace) {
@@ -467,8 +474,7 @@ function Router(env, scope) {
             // means that you have a syntax errors in you controller file
             // TODO - increase `stack-trace` from 10 (default value) to 500 or more to get the exact error --stack-trace-limit=1000
             // TODO - also check `stack-size` why not set it to at the same time => --stack-size=1024
-            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (err.stack || err.message) );
-            return;
+            return serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (err.stack || err.message) );
         }
 
 
@@ -623,14 +629,13 @@ function Router(env, scope) {
                             var superController = new SuperController(options);
                             superController.setOptions(request, response, next, options);
                             if (typeof (controller) != 'undefined' && typeof (controller[action]) == 'undefined') {
-                                serverInstance.throwError(response, 500, (new Error('control not found: `' + action + '`. Please, check your routing.json ('+ options.rule +') or the related control in your `' + controllerFile + '`.')).stack);
-                            } else {
-                                serverInstance.throwError(response, 500, err.stack);
+                                return serverInstance.throwError(response, 500, (new Error('control not found: `' + action + '`. Please, check your routing.json ('+ options.rule +') or the related control in your `' + controllerFile + '`.')).stack);
                             }
-                            return;
+
+                            return serverInstance.throwError(response, 500, err.stack);
                         }
 
-                    })
+                    });
             } else {
                 // handle superController events
                 // e.g.: inside your controller, you can defined: `this.onReady = function(){...}` which will always be called before the main action
@@ -674,87 +679,106 @@ function Router(env, scope) {
 
     var processMiddlewares = function(serverInstance, middlewares, controller, action, req, res, next, cb){
 
-        var filename        = _(local.conf.bundlePath)
+
+        if (!middlewares || middlewares.length == 0) {
+            return cb(action, req, res, next);
+        }
+
+        var bundlePath      = _(local.conf.bundlePath, true)
+            , sharedPath    = _(local.conf.sharedPath, true)
             , middleware    = null
             , constructor   = null
-            , re            = new RegExp('^'+filename);
-
-        if ( middlewares.length > 0 ) {
-            for (let m=0; m<middlewares.length; ++m) {
-                constructor = middlewares[m].split(/\./g);
-                constructor = constructor
-                    .splice(constructor.length-1,1)
-                    .toString();
-                middleware = middlewares[m].split(/\./g);
-                middleware.splice(middleware.length-1);
-                middleware = middleware.join('/');
-                filename = _(filename +'/'+ middleware + '/index.js');
-                if ( !fs.existsSync( filename ) ) {
+            , re            = new RegExp('^'+bundlePath)
+        ;
+
+        for (let m=0; m<middlewares.length; ++m) {
+            constructor = middlewares[m].split(/\./g);
+            constructor = constructor
+                .splice(constructor.length-1,1)
+                .toString();
+            middleware = middlewares[m].split(/\./g);
+            middleware.splice(middleware.length-1);
+            middleware = middleware.join('/');
+
+            let filenameObj         = new _(bundlePath +'/'+ middleware + '/index.js', true);
+            let filename            = filenameObj.toString();
+            let sharedFilenameObj   = new _(sharedPath +'/'+ middleware + '/index.js', true);
+            let sharedFilename      = sharedFilenameObj.toString();
+            if ( !filenameObj.existsSync() ) {
+                if ( !sharedFilenameObj.existsSync() ) {
                     // no middleware found with this alias
-                    serverInstance.throwError(res, 501, new Error('middleware not found '+ middleware).stack);
-                    return;
+                    return serverInstance.throwError(res, 501, new Error('middleware not found '+ middleware).stack);
                 }
 
-                if (local.cacheless) delete require.cache[require.resolve(_(filename, true))];
-
-                var MiddlewareClass = function(req, res, next) {
-
-                    return function () { // getting rid of the middleware context
-
-                        var Middleware = require(_(filename, true));
-                        // TODO - loop on a defined SuperController property like SuperController._allowedForExport
-
-
-                        // Exporting config & common methods
-                        Middleware.prototype.checkBundleStatus      = controller.checkBundleStatus;
-                        Middleware.prototype.getConfig              = controller.getConfig;
-                        Middleware.prototype.getFormsRules          = controller.getFormsRules;
-                        Middleware.prototype.getLocales             = controller.getLocales;
-                        Middleware.prototype.isCacheless            = controller.isCacheless;
-                        Middleware.prototype.isHaltedRequest        = controller.isHaltedRequest;
-                        Middleware.prototype.isWithCredentials      = controller.isWithCredentials;
-                        Middleware.prototype.isXMLRequest           = controller.isXMLRequest;
-                        Middleware.prototype.pauseRequest           = controller.pauseRequest;
-                        Middleware.prototype.query                  = controller.query;
-                        Middleware.prototype.redirect               = controller.redirect;
-                        Middleware.prototype.render                 = controller.render;
-                        Middleware.prototype.renderJSON             = controller.renderJSON;
-                        Middleware.prototype.renderWithoutLayout    = controller.renderWithoutLayout;
-                        Middleware.prototype.resumeRequest          = controller.resumeRequest;
-                        Middleware.prototype.requireController      = controller.requireController;
-                        Middleware.prototype.throwError             = controller.throwError;
-
-                        return Middleware;
-                    }(req, res, next)
-                }(req, res, next);
-
-                middleware = new MiddlewareClass();
+                filename = sharedFilename;
+            }
 
+            if (local.cacheless) delete require.cache[require.resolve(_(filename, true))];
+
+            var MiddlewareClass = function(req, res, next) {
+                // getting rid of the middleware context
+                return function () {
+
+                    var Middleware = require(_(filename, true));
+                    // LOCAL vs GLOBAL
+                    if (
+                        sharedFilenameObj.existsSync()
+                        && filename != sharedFilename
+                    ) {
+                        if (local.cacheless) delete require.cache[require.resolve(_(sharedFilename, true))];
+                        // sharedFilename as SuperClass
+                        Middleware = inherits(require(_(filename, true)), require(_(sharedFilename, true)));
+                    }
 
-                if ( !middleware[constructor] ) {
-                    serverInstance.throwError(res, 501, new Error('contructor [ '+constructor+' ] not found @'+ middlewares[m]).stack);
-                    return;
-                }
+                    // TODO - loop on a defined SuperController property like SuperController._allowedForExport
+
+
+                    // Exporting config & common methods
+                    Middleware.prototype.checkBundleStatus      = controller.checkBundleStatus;
+                    Middleware.prototype.getConfig              = controller.getConfig;
+                    Middleware.prototype.getFormsRules          = controller.getFormsRules;
+                    Middleware.prototype.getLocales             = controller.getLocales;
+                    Middleware.prototype.isCacheless            = controller.isCacheless;
+                    Middleware.prototype.isHaltedRequest        = controller.isHaltedRequest;
+                    Middleware.prototype.isWithCredentials      = controller.isWithCredentials;
+                    Middleware.prototype.isXMLRequest           = controller.isXMLRequest;
+                    Middleware.prototype.pauseRequest           = controller.pauseRequest;
+                    Middleware.prototype.query                  = controller.query;
+                    Middleware.prototype.redirect               = controller.redirect;
+                    Middleware.prototype.render                 = controller.render;
+                    Middleware.prototype.renderJSON             = controller.renderJSON;
+                    Middleware.prototype.renderWithoutLayout    = controller.renderWithoutLayout;
+                    Middleware.prototype.resumeRequest          = controller.resumeRequest;
+                    Middleware.prototype.requireController      = controller.requireController;
+                    Middleware.prototype.throwError             = controller.throwError;
+
+                    return Middleware;
+                }(req, res, next)
+            }(req, res, next);
+
+            middleware = new MiddlewareClass();
+
+
+            if ( !middleware[constructor] ) {
+                return serverInstance.throwError(res, 501, new Error('contructor [ '+constructor+' ] not found @'+ middlewares[m]).stack);
+            }
 
-                if ( typeof(middleware[constructor]) != 'undefined') {
+            if ( typeof(middleware[constructor]) != 'undefined') {
 
-                    middleware[constructor](req, res, next,
-                        function onMiddlewareProcessed(req, res, next){
-                            middlewares.splice(m, 1);
-                            if (middlewares.length > 0) {
-                                processMiddlewares(serverInstance, middlewares, controller, action,  req, res, next, cb)
-                            } else {
-                                cb(action, req, res, next)
-                            }
+                middleware[constructor](req, res, next,
+                    function onMiddlewareProcessed(req, res, next){
+                        middlewares.splice(m, 1);
+                        if (middlewares.length > 0) {
+                            return processMiddlewares(serverInstance, middlewares, controller, action,  req, res, next, cb)
                         }
-                    );
+                        // else {
+                            cb(action, req, res, next)
+                        // }
+                    }
+                );
 
-                    break
-                }
+                break
             }
-
-        } else {
-            cb(action, req, res, next)
         }
     };
 

package/framework/{v0.1.2-alpha.5 → v0.1.3-alpha.1}/core/server.js

@@ -2606,36 +2606,33 @@ function Server(options) {
         var expressMiddlewares  = self.instance._expressMiddlewares;
 
         if (err) {
-            throwError(nextMiddleware._response, 500, (err.stack|err.message|err), nextMiddleware._next, nextMiddleware._nextAction);
-            return;
+            return throwError(nextMiddleware._response, 500, (err.stack|err.message|err), nextMiddleware._next, nextMiddleware._nextAction);
         }
 
         expressMiddlewares[nextMiddleware._index](nextMiddleware._request, nextMiddleware._response, function onNextMiddleware(err, request, response) {
 
             if (err) {
-                throwError(nextMiddleware._response, 500, (err.stack||err.message||err), nextMiddleware._next, nextMiddleware._nextAction);
-                return;
+                return throwError(nextMiddleware._response, 500, (err.stack||err.message||err), nextMiddleware._next, nextMiddleware._nextAction);
             }
 
             ++nextMiddleware._index;
-            if (request)
+            if (request) {
                 nextMiddleware._request  = request;
+            }
 
-            if (response)
+            if (response) {
                 nextMiddleware._response = response;
+            }
 
             if (nextMiddleware._index > nextMiddleware._count) {
 
                 if ( nextMiddleware._nextAction == 'route' ) {
-
                     router._server = self.instance;
-                    router.route(nextMiddleware._request, nextMiddleware._response, nextMiddleware._next, nextMiddleware._request.routing)
-
+                    router.route(nextMiddleware._request, nextMiddleware._response, nextMiddleware._next, nextMiddleware._request.routing);
                 } else { // handle statics
                     self._responseHeaders = nextMiddleware._response.getHeaders();
                     handleStatics(nextMiddleware._staticProps, nextMiddleware._request, nextMiddleware._response, nextMiddleware._next);
                 }
-
             } else {
                 nextMiddleware.call(this, err, true)
             }
@@ -2764,14 +2761,16 @@ function Server(options) {
                     method = req.method
                 }
 
-                //Preparing params to relay to the router.
+                // Preparing params to relay to the router.
                 params = {
                     method              : method,
                     requirements        : routing[name].requirements,
                     namespace           : routing[name].namespace || undefined,
                     url                 : decodeURI(pathname), /// avoid %20
                     rule                : routing[name].originalRule || name,
+                    // We clone because we are going to modify it while comparing urls
                     param               : JSON.clone(routing[name].param),
+                    // We clone because we are going to modify it while routing (.splice(..))
                     middleware          : JSON.clone(routing[name].middleware),
                     bundle              : routing[name].bundle,
                     isXMLRequest        : req.isXMLRequest,

package/framework/{v0.1.2-alpha.5 → v0.1.3-alpha.1}/lib/cmd/framework/init.js

@@ -119,7 +119,7 @@ function Initialize(opt) {
 
         if ( !fs.existsSync(path) ) {
             try {
-                fs.mkdirSync(path, 0775)
+                fs.mkdirSync(path, '0775')
             } catch (err) {
                 // console.error(err.stack);
                 // process.exit(1)
@@ -158,7 +158,7 @@ function Initialize(opt) {
 
         if ( !fs.existsSync(releasePath) ) {
             try {
-                fs.mkdirSync(releasePath, 0775)
+                fs.mkdirSync(releasePath, '0775')
             } catch (err) {
                 // console.error(err.stack);
                 // process.exit(1)

package/framework/{v0.1.2-alpha.5 → v0.1.3-alpha.1}/lib/cmd/helper.js

@@ -124,7 +124,7 @@ function CmdHelper(cmd, client, debug) {
         }
 
         console.debug('process.argv: ', process.argv);
-        for (var a in process.argv) {
+        for (let a in process.argv) {
 
 
             if ( /^\-\-(inspect|debug)\-brk/.test(process.argv[a]) ) {
@@ -621,6 +621,8 @@ function CmdHelper(cmd, client, debug) {
                             && typeof(cmd.projects[cmd.projectName]['dev_env']) != 'undefined'
                             && cmd.projects[cmd.projectName]['dev_env']
                         ) ? cmd.projects[cmd.projectName]['dev_env'] : cmd.mainConfig['dev_env'][ GINA_SHORT_VERSION ];
+
+
             //cmd.bundlesByProject[cmd.projectName][cmd.name].def_env = cmd.defaultEnv; // by default
             // project or bundle environment override through : --env=<some env>
             if ( typeof(cmd.params.env) != 'undefined' && /\:(start|stop|restart|build|deploy)/i.test(cmd.task) ) {
@@ -631,7 +633,15 @@ function CmdHelper(cmd, client, debug) {
                     return false;
                 }
                 cmd.defaultEnv = process.env.NODE_ENV = cmd.params.env;
+                // override
+                //cmd.bundlesByProject[cmd.projectName][cmd.name].def_env = cmd.params.env;
+            } else {
+                delete process.env.NODE_ENV
+            }
+            cmd.envs.sort();
 
+            // project or bundle scope override through : --scope=<some scope>
+            if ( typeof(cmd.params.scope) != 'undefined' && /\:(start|stop|restart|build|deploy)/i.test(cmd.task) ) {
                 console.debug('Overriding default project scope: '+ cmd.defaultScope +' => '+ cmd.params.scope);
                 if (cmd.scopes.indexOf(cmd.params.scope) < 0) {
                     errMsg = 'Scope `'+ cmd.params.scope +'` not found in your project ['+ cmd.projectName +']';
@@ -639,14 +649,13 @@ function CmdHelper(cmd, client, debug) {
                     return false;
                 }
                 cmd.defaultScope = process.env.NODE_SCOPE = cmd.params.scope;
-
-
                 // override
-                //cmd.bundlesByProject[cmd.projectName][cmd.name].def_env = cmd.params.env;
+                //cmd.bundlesByProject[cmd.projectName][cmd.name].def_scope = cmd.params.scope;
             } else {
-                delete process.env.NODE_ENV
+                delete process.env.NODE_SCOPE
             }
-            cmd.envs.sort();
+            cmd.scopes.sort();
+
 
 
             // updating default protocols list

package/framework/{v0.1.2-alpha.5 → v0.1.3-alpha.1}/lib/inherits/src/main.js

@@ -21,6 +21,8 @@ function Inherits(a, b) {
     /**
      * init
      * @constructor
+     * @param {class} child class
+     * @param {class} super class
      * */
     var init = function(a, b) {
         var err = check(a, b);

package/package.json

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

package/framework/v0.1.2-alpha.5/VERSION

@@ -1 +0,0 @@
-0.1.2-alpha.5

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

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