gina 0.1.1-alpha.99 → 0.1.2-alpha.1

package/services/src/toolbar/config/app.json

@@ -0,0 +1,6 @@
+// bundle needs to be restarted on changes !!
+{
+  "name": "toolbar",
+  "version": "0.0.1",
+  "greeting": "Hello World !"
+}

package/services/src/toolbar/config/routing.json

@@ -0,0 +1,11 @@
+// bundle needs to be restarted on changes !!
+{
+  "homepage": {
+    "namespace": "content",
+    "url": "/",
+    "method": "GET",
+    "param": {
+      "control": "home"
+    }
+  }
+}

package/services/src/toolbar/config/settings.server.json

@@ -0,0 +1,30 @@
+// bundle needs to be restarted on changes !!
+{
+    "webroot": "/toolbar" // do not forget to add a coma here if you add other options ;)
+    /**
+    * `webrootAutoredirect` settings
+    * Default is `true`: set to false if you have describe a redirection rule from your `routing.json`
+    */
+    // "webrootAutoredirect": false,
+
+    /**
+    * `template` settings
+    * Default is `false`: will automatically be set to `true` when you add a view/template (`false` is right for APIs only)
+    */
+    // "template": false,
+
+    /**
+    * `response` settings
+    * This section is mostly used to setup CORS
+    */
+    // "response": {
+    //        // CORS settings sample
+    //     "header": {
+    //         "access-control-allow-origin": "toolbar@{project}, https://checkout.stripe.com",
+    //         "access-control-allow-headers": "X-Requested-With", // To allow AJAX request
+    //         "access-control-allow-methods": "POST, GET, OPTIONS",
+    //         "access-control-allow-credentials": true,
+    //         "vary": "Origin"
+    //     }
+    // }
+}

package/services/src/toolbar/controllers/controller.content.js

@@ -0,0 +1,39 @@
+//Imports goes here.
+
+/**
+ * ToolbarContentController
+ * Here are handled all contents
+ * */
+function ToolbarContentController() {
+    var self = this;
+    // get config/app.json content
+    var appConf = this.getConfig('app');
+
+    /**
+     * Home action
+     *
+     * @param {object} req
+     * @param {object} res
+     * @callback [next]
+     * */
+    this.home = function(req, res) {
+        var data = {
+            msg: appConf.greeting
+        };
+
+        self.renderJSON(data);
+
+        // use this to render errors
+        // self.throwError( new Error('Error sample') );
+    }
+
+    // The onReady Event is called when the controller is loaded
+    // You can use this to define, overwrite and customise default controller methods & even swig filters
+    //this.onReady = function(req, res, next){
+    //    // e.g: Define a setup function that you call when the controller is ready
+    //    //setup(req, res, next)
+    //    // Or better, you can just complete and reuse the `setup.js` and call self.setup(req, res, next)
+    //}
+};
+
+module.exports = ToolbarContentController

package/services/src/toolbar/controllers/controller.js

@@ -0,0 +1,30 @@
+//Imports goes here.
+
+/**
+ * ToolbarController
+ * This controller is inherited by all the namespace controllers.
+ * This means that all public methods written here are reusable by the other controllers
+ * without calling `require` in case you decide to add a namespace.
+ * It is strongly advised to use namespaces to organize you code :
+ * E.g.:
+ *      gina namespace:add toolbar/blogpost @{project}
+ *      gina namespace:add toolbar/account @{project}
+ *      ...
+ * */
+function ToolbarController() {
+    var self = this;
+    // get config/app.json content
+    // var appConf = this.getConfig('app');
+
+    
+
+    // The onReady Event is called when the controller is loaded
+    // You can use this to define, overwrite and customise default controller methods & swig filters
+    this.onReady = function(req, res, next){
+       // e.g: Define a `setup` function (inside this coontroller) that you can call when the controller is ready
+       // Or better, you can just complete and reuse the `setup.js` and call self.setup(req, res, next)
+       self.setup(req, res, next)
+    }
+};
+
+module.exports = ToolbarController

package/services/src/toolbar/controllers/setup.js

@@ -0,0 +1,111 @@
+//Imports goes here.
+// var md       = require('marked'); // visit: https://github.com/jmcmanus/pagedown-extra
+// var lib      = require('gina').lib;
+// var merge    = lib.merge;
+
+/**
+ * Setup Class
+ * Allows you to extend setup to all your controllers
+ * Most of the things you can do inside a controller, you can do it here
+ *
+ * E.g.: use it inside the controller `onReady` by calling `self.setup(req, res, next)`
+ *
+ *
+ * @param {object} req
+ * @param {object} res
+ * @callback [next]
+ * */
+function SetupClass(req, res, next){
+    // get `app` config
+    // var conf = this.getConfig('app')
+
+    // 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.:
+     *      <a href="{{ '/homepage' | getUrl() }}">Homepage</a>
+     *      <a href="{{ 'users-add' | getUrl({ id: user.id }) }}">Add User</a>
+     *      <a href="{{ 'users-edit' | getUrl({ id: user.id }) }}">Edit user</a>
+     *      <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>
+     *
+     * [ 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,
+    //     gfm         : true, // Enable GitHub flavored markdown.
+    //     tables      : false,
+    //     breaks      : true, // Enable GFM line breaks. This option requires the gfm option to be true.
+    //     pedantic    : false, // Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
+    //     // deprecated since version 0.7.0
+    //     // sanitize    : false, // Sanitize the output. Ignore any HTML that has been input.
+    //     smartLists  : true, // Use smarter list behavior than the original markdown. May eventually be default with the old behavior moved into pedantic.
+    //     smartypants : false // Use "smart" typograhic punctuation for things like quotes and dashes.
+    // };
+
+    // md.setOptions(markdownOpt);
+
+    // var setupSwigFilters = function(swig) {
+
+    //     if ( typeof(swig) == 'undefined' ) return;
+
+    //     /*
+    //     * markdown filter
+    //     * Usage:
+    //     *      <p>{{ 'once **apuon** a time\nthere was a princess' | markdown('strong','em') }}"</p>
+    //     *
+    //     * @param {string} text - markdown text string
+    //     *
+    //     * @returns {string} html
+    //     */
+    //    swig.setFilter('markdownToHtml', function (text, options) {
+
+    //         if ( typeof(text) != 'undefined' ) { // found
+
+    //             if ( typeof(options) != 'undefined' ) {
+    //                 options = merge(options, markdownOpt);
+
+    //                 md.setOptions(options);
+    //             }
+
+    //             return md(text)
+    //         }
+
+    //         return text
+    //     });
+    // }
+
+    if (swig && typeof(setupSwigFilters) != 'undefined') { // not always available: redirect, xhr requests
+        setupSwigFilters(swig)
+    }
+
+};
+
+module.exports = SetupClass

package/services/src/toolbar/index.js

@@ -0,0 +1,43 @@
+/**
+ * Toolbar bundle
+ *
+ * */
+//import sample
+//var session = require('express-session');
+var toolbar = require('gina');
+
+// gina lib samples
+// var lib             = toolbar.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
+//toolbar.onInitialize( function(event, app, express){//
+//    var self = toolbar;
+//    // 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'}) );
+//
+//    //then notify the server that startup sequence can be resumed
+//    event.emit('complete', app);// this is important !
+//});
+
+// If you need to do something once the server has started
+// toolbar.onStarted(function(){
+//     console.info('toolbar has started ! ');
+// });
+
+// Catch unhandled errors
+// toolbar.onError(function(err, req, res, next){
+//     console.error('<toolbar> fatal error: ' + err.message + '\nstack:\n'+ err.stack);
+//     next(err);
+// });
+
+toolbar.start();

package/utils/helper.js

@@ -1,6 +1,6 @@
 var fs = require('fs');
 var os = require('os');
-const { execSync } = require('child_process');
+var { execSync } = require('child_process');
 
 var lib         = null;
 var console     = null;
@@ -29,9 +29,13 @@ function MainHelper(opt) {
         var pkg = null, cmd = null, prefix = null;
         self.isGlobalInstall = getEnvVar('GINA_GLOBAL_MODE') || ( typeof(packObj.config) != 'undefined' && typeof(packObj.config.globalMode) != 'undefined' ) ? packObj.config.globalMode : true;
         try {
-            lib         = require(frameworkPath + '/lib');
-            console     = lib.logger;
-            merge       = lib.merge;
+            // TODO - remove this code: it is creating a circular dependency
+            // lib         = require(frameworkPath + '/lib');
+            // console     = lib.logger;
+            // merge       = lib.merge;
+
+            console = require(frameworkPath + '/lib/logger');
+            merge   = require(frameworkPath + '/lib/merge');
 
             try {
                 pkg = packObj;
@@ -63,152 +67,11 @@ function MainHelper(opt) {
         }
     }
 
-    /**
-     * Check if object before extending.
-     * */
-    // var isObject = function(obj) {
-    //     if (
-    //         !obj ||
-    //         {}.toString.call(obj) !== '[object Object]' ||
-    //         obj.nodeType ||
-    //         obj.setInterval
-    //     ) {
-    //         return false
-    //     }
-
-    //     var hasOwn              = {}.hasOwnProperty;
-    //     var hasOwnConstructor   = hasOwn.call( obj, 'constructor');
-    //     var hasMethodPrototyped = hasOwn.call( obj.constructor.prototype, 'isPrototypeOf');
-
-
-    //     if (
-    //         obj.constructor &&
-    //         !hasOwnConstructor &&
-    //         !hasMethodPrototyped
-    //     ) {
-    //         return false
-    //     }
-
-    //     //Own properties are enumerated firstly, so to speed up,
-    //     //if last one is own, then all properties are own.
-    //     var key;
-    //     return key === undefined || hasOwn.call( obj, key )
-    // }
-
-
-
 
     isWin32 = function() {
         return ( os.platform() == 'win32' ) ? true : false;
     }
 
-
-    /**
-     *
-     * @param {boolean} deep - Deep copy
-     * @param {boolean} [override] - Override when copying
-     * @param {object} target - Target object
-     * @param {object} source - Source object
-     *
-     * @returns {object} [result]
-     * */
-    // extend = function() {
-    //     var target = arguments[ 0 ] || {};
-    //     var i      = 1;
-    //     var length = arguments.length;
-    //     var deep   = false;
-    //     var override = false;
-    //     var options, name, src, copy, copy_is_array, clone;
-
-    //     // Handle a deep copy situation
-    //     if ( typeof target === 'boolean' ) {
-    //         deep   = target;
-    //         target = arguments[ 1 ] || {};
-    //         // skip the boolean and the target
-    //         i = 2
-    //     }
-    //     // Handle an override copy situation
-    //     if ( typeof target === 'boolean' ) {
-    //         override   = target;
-    //         target = arguments[ 2 ] || {};
-    //         // skip the boolean and the target
-    //         i = 3
-    //     }
-
-
-    //     // Handle case when target is a string or something (possible in deep copy)
-    //     if ( typeof target !== 'object' && typeof target !== 'function' ) {
-    //         target = {};
-    //     }
-
-    //     for ( ; i < length; i++ ) {
-    //         // Only deal with non-null/undefined values
-    //         if (( options = arguments[ i ]) != null ) {
-    //             // Extend the base object
-    //             for (var name in options ) {
-    //                 src  = target[ name ];
-    //                 copy = options[ name ];
-
-    //                 // Prevent never-ending loop
-    //                 if ( target === copy ) {
-    //                     continue
-    //                 }
-
-    //                 // Recurse if we're merging plain objects or arrays
-    //                 if (
-    //                     deep &&
-    //                     copy &&
-    //                     (
-    //                         isObject( copy ) ||
-    //                         ( copy_is_array = Array.isArray( copy ) )
-    //                     )
-    //                 ) {
-
-    //                     if ( copy_is_array ) {
-    //                         copy_is_array = false;
-    //                         clone = src && Array.isArray( src ) ? src : []
-    //                     } else {
-    //                         clone = src && isObject( src) ? src : {}
-    //                     }
-
-    //                     //[propose] Supposed to go deep... deep... deep...
-    //                     if (!override) {
-    //                         for (var prop in copy) {
-    //                             if( typeof(clone[ prop ]) != "undefined" ){
-    //                                 copy[ prop ] = clone[ prop ];
-    //                             }
-    //                         }
-    //                     }
-
-    //                     // Never move original objects, clone them
-    //                     if (typeof(src) != "boolean") {//if property is not boolean
-    //                         target[ name ] = extend( deep, override, clone, copy )
-    //                     }
-    //                     // Don't bring in undefined values
-    //                 } else if ( copy !== undefined ) {
-    //                     //[propose]Don't override existing if prop defined or override @ false
-    //                     if (
-    //                         typeof(src) != "undefined" &&
-    //                         src != copy &&
-    //                         !override
-    //                     ) {
-    //                         target[ name ] = src
-    //                     } else {
-    //                         target[ name ] = copy
-    //                     }
-
-    //                 }
-    //             }
-    //         }
-    //     }
-    //     // Return the modified object
-    //     return target
-    // }
-
-    // isEmpty = function(obj) {
-    //     return Object.keys(obj).length === 0;
-    // }
-
     filterArgs = function() {
 
         var setget  = ( typeof(process.argv[2]) != 'undefined'
@@ -223,8 +86,14 @@ function MainHelper(opt) {
         }
 
         var newArgv = {};
-        for (var a in process.argv) {
+        for (let a in process.argv) {
             if ( /\-\-/.test(process.argv[a]) && process.argv[a].indexOf('=') > -1 ) {
+                // special cases
+                if (/\-\-(prefix|env|scope)/.test(process.argv[a])) {
+                    continue;
+                }
+
+
                 evar = ( (process.argv[a].replace(/--/, ''))
                     .replace(/-/, '_') )
                     .split(/=/);
@@ -264,7 +133,7 @@ function MainHelper(opt) {
             process.argv = newArgv;
 
         //Cleaning the rest.
-        for (var e in process.env) {
+        for (let e in process.env) {
             if (
                 e.substr(0, 5) === 'GINA_' || // 6?
                 e.substr(0, 7) === 'VENDOR_' ||
@@ -320,7 +189,7 @@ function MainHelper(opt) {
             return logDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         if ( isWin32() ) {
             logDir = process.env.LOG ||
@@ -396,7 +265,7 @@ function MainHelper(opt) {
             return runDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix + '/var/lock';
 
@@ -432,7 +301,7 @@ function MainHelper(opt) {
             }
 
             runDir = prefix +'/var/run';//by default.
-            if ( !existsSync(runDir) ) {
+            if ( ! new _(runDir).existsSync() ) {
                 fs.mkdirSync(runDir)
             }
         } catch (err) {
@@ -461,7 +330,7 @@ function MainHelper(opt) {
             return dir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix  || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         // support for node 0.10.x & 0.11.x
         var tmp = (os.tmpdir) ? os.tmpdir : function() {
@@ -479,12 +348,12 @@ function MainHelper(opt) {
 
                 if ( new RegExp('^'+ prefix).test(tmpDir) && !isWritableSync(prefix) ) {
                     tmpDir = getUserHome() +'/.gina/tmp';
-                    if ( !existsSync(tmpDir) ) {
+                    if ( ! new _(tmpDir).existsSync() ) {
                         fs.mkdirSync(tmpDir)
                     }
                 }
 
-                if ( new RegExp('^'+ prefix +'/var').test(tmpDir) && !existsSync(prefix +'/var') ) {
+                if ( new RegExp('^'+ prefix +'/var').test(tmpDir) && !new _(prefix +'/var').existsSync() ) {
                     fs.mkdirSync(prefix +'/var');
                 }
             }
@@ -611,10 +480,10 @@ function MainHelper(opt) {
             define(c, obj[c])
         }
         delete  obj
-    }
+    }// jshint ignore:line
 
     init(opt)
 
-};
+}
 
-module.exports = MainHelper()
+module.exports = MainHelper();

package/utils/prototypes.js

@@ -1,6 +1,6 @@
 /**
  * clone array
- * 
+ *
  * @returns {array} Return cloned array
  * @supress {misplacedTypeAnnotation}
  **/
@@ -21,14 +21,14 @@ if ( typeof(JSON.escape) == 'undefined' ) {
     /**
      * JSON.escape
      * Escape special characters
-     * 
-     * Changes made here must be reflected in: 
+     *
+     * Changes made here must be reflected in:
      *  - gina/utils/prototypes.js
      *  - gina/framework/version/helpers/prototypes.js
-     *  - gina/framework/version/core/asset/js/plugin/src/gina/utils/polyfill.js
-     * 
+     *  - gina/framework/version/core/asset/plugin/src/vendor/gina/js/utils/polyfill.js
+     *
      * @param {object} jsonStr
-     * 
+     *
      * @returns {object} escaped JSON string
      **/
      var escape = function(jsonStr){
@@ -38,11 +38,11 @@ if ( typeof(JSON.escape) == 'undefined' ) {
                        .replace(/\r/g, "\\r")
                        .replace(/\t/g, "\\t")
                    ;
-        } catch (err) {         
+        } catch (err) {
            throw err;
         }
     };
-    
+
     JSON.escape = escape;
 }
 
@@ -98,7 +98,7 @@ Object.defineProperty( Object.prototype, 'functionCount', {
 /**
  * __stack Get current stack
  * @returns {Object} stack Current stack
- * 
+ *
  * @suppress {es5Strict}
  **/
 Object.defineProperty(global, '__stack', {