gina 0.1.1-alpha.166 → 0.1.1-alpha.168

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/core/template/boilerplate/bundle/controllers/controller.content.js

@@ -20,7 +20,7 @@ function {Bundle}ContentController() {
         var data = {
             msg: appConf.greeting
         };
-        
+
         self.renderJSON(data);
 
         // use this to render errors

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/core/template/boilerplate/bundle/controllers/setup.js

@@ -1,7 +1,7 @@
 //Imports goes here.
-// var md = require('marked'); // visit: https://github.com/jmcmanus/pagedown-extra
-// var utils   = require('gina').utils;
-// var merge   = utils.merge;
+// var md       = require('marked'); // visit: https://github.com/jmcmanus/pagedown-extra
+// var lib      = require('gina').lib;
+// var merge    = lib.merge;
 
 /**
  * Setup Class
@@ -21,14 +21,14 @@ function SetupClass(req, res, next){
 
     // 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.:
@@ -38,25 +38,25 @@ function SetupClass(req, res, next){
      *      <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>      
-     * 
+     *      <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,
@@ -71,11 +71,11 @@ function SetupClass(req, res, next){
     // };
 
     // md.setOptions(markdownOpt);
-    
+
     // var setupSwigFilters = function(swig) {
-        
+
     //     if ( typeof(swig) == 'undefined' ) return;
-        
+
     //     /*
     //     * markdown filter
     //     * Usage:
@@ -101,7 +101,7 @@ function SetupClass(req, res, next){
     //         return text
     //     });
     // }
-    
+
     if (swig && typeof(setupSwigFilters) != 'undefined') { // not always available: redirect, xhr requests
         setupSwigFilters(swig)
     }

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/core/template/boilerplate/bundle/index.js

@@ -6,10 +6,22 @@
 //var session = require('express-session');
 var {bundle} = require('gina');
 
+// gina lib samples
+// var lib             = {bundle}.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
 //{bundle}.onInitialize( function(event, app, express){//
 //    var self = {bundle};
-//    var conf = self.getConfig(); // getting config/app.json would be: self.getConfig('app')
+//    // 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'}) );
 //

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/core/template/command/gina.tpl

@@ -17,10 +17,10 @@ var fs = require('fs');
 
 try {
     require('./node_modules/gina/node_modules/colors');
-    var utils = require("./node_modules/gina/core/utils");
-    var console = utils.logger;
+    var lib     = require("./node_modules/gina/core/lib");
+    var console = lib.logger;
     console.log('Gina I/O Command Line Tool \r\n'.rainbow);
-    utils.cmd.load(__dirname, "/node_modules/gina/package.json")
+    lib.cmd.load(__dirname, "/node_modules/gina/package.json")
 } catch (err) {
     process.stdout.write(err.stack + '\r\n')
 }

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/console.js

@@ -9,8 +9,8 @@
 /**
  * ConsoleHelper
  *
- * @package     Gina.Utils.Helpers
- * @namespace   Gina.Utils.Helpers.ConsoleHelper
+ * @package     Gina.Lib.Helpers
+ * @namespace   Gina.Lib.Helpers.ConsoleHelper
  * @author      Rhinostone <contact@gina.io>
  * */
 

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/context.js

@@ -14,7 +14,7 @@ const {execSync}    = require('child_process');
 /**
  * ContextHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
@@ -258,7 +258,7 @@ function ContextHelper(contexts) {
 
         setContext('envs', projects[projectName].envs);
         setContext('bundles', bundles);
-        // setContext('gina.utils', lib);
+        // setContext('gina.lib', lib);
         // setContext('gina.Config', Config);
         // setContext('gina.locales', locales);
         // setContext('gina.plugins', plugins);

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/dateFormat.js

@@ -30,7 +30,7 @@
 function DateFormatHelper() {
 
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
-    var merge           = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+    var merge           = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
 
 
     // if ( typeof(define) === 'function' && define.amd ) {
@@ -126,7 +126,7 @@ function DateFormatHelper() {
     var format = function(date, mask, utc) {
 
         // if ( typeof(merge) == 'undefined' || !merge ) {
-        //     merge = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+        //     merge = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
 
         // }
 
@@ -141,7 +141,7 @@ function DateFormatHelper() {
         } catch( mergeErr) {
             // called from logger - redefinition needed for none-dev env: cache issue
             isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
-            merge           = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+            merge           = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
             masksList = merge(i18n.masks, dF.masks);
         }
 
@@ -280,8 +280,8 @@ function DateFormatHelper() {
     /**
      *  Will give an array of dates between the current date to a targeted date
      *
-     *  TODO - add a closure to `ignoreWeekend()` based on Utils::Validator
-     *  TODO - add a closure to `ignoreFromList(array)` based on Utils::Validator
+     *  TODO - add a closure to `ignoreWeekend()` based on Lib::Validator
+     *  TODO - add a closure to `ignoreFromList(array)` based on Lib::Validator
      *
      *  @param {object} dateTo
      *  @param {string} [ mask ]

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/index.js

@@ -10,10 +10,10 @@ var fs = require('fs');
 /**
  * @module Helpers
  *
- * Gina Utils Helpers
+ * Gina Lib Helpers
  *
- * @package     Gina.Utils
- * @namespace   Gina.Utils.Helpers
+ * @package     Gina.Lib
+ * @namespace   Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  */
 var _require = function(path) {

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/json/src/main.js

@@ -11,14 +11,14 @@
 /**
  * JSONHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
 
 module.exports = function(){
 
-    // `JSON.clone()` is a prototype defined in `GINA_DIR//utils/prototypes.json_clone`
+    // `JSON.clone()` is a prototype defined in `GINA_DIR//lib/prototypes.json_clone`
 
     /**
      * Load a json file and removing comments if found

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/path.js

@@ -6,13 +6,14 @@
  * file that was distributed with this source code.
  */
 
-var fs = require('fs');
-var util = require('util');
-var Events = require('events');
-var Path = require('path');
+var fs          = require('fs');
+var util        = require('util');
+var Events      = require('events');
+var Path        = require('path');
+var execSync    = require('child_process').execSync;
 
-var merge = require('./../lib/merge');
-var console = require('./../lib/logger');
+var merge       = require('./../lib/merge');
+var console     = require('./../lib/logger');
 
 var ContextHelper = require('./context');
 var e =  new Events.EventEmitter();
@@ -23,7 +24,7 @@ e.setMaxListeners(100);
 /**
  * PathHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinzostone <contact@gina.io>
  * @api public
  *
@@ -53,6 +54,18 @@ function PathHelper() {
             throw new Error('This source cannot be used: `'+ path +'`')
         }
 
+        // $HOME detection
+        if ( /^\~/.test(path) ) {
+            var homedir = null;
+            try {
+                homedir = execSync('echo $HOME').toString().replace(/(\r|\n)$/g, '');
+            } catch (err) {
+                throw err
+            }
+
+            path = path.replace(/^\~/, homedir);
+        }
+
         if ( typeof(force) == undefined) {
             force = _this.force = false
         }
@@ -866,7 +879,7 @@ function PathHelper() {
 //                if (err) {
 //                    logger.error(
 //                        'gina',
-//                        'UTILS:PATH:ERROR:7',
+//                        'LIB:HELPERS:PATH:ERROR:7',
 //                        err,
 //                        __stack
 //                    );

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/plugins/src/main.js

@@ -10,7 +10,7 @@
 /**
  * PluginsHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */

package/framework/{v0.1.1-alpha.166 → v0.1.1-alpha.168}/helpers/text.js

@@ -9,7 +9,7 @@
 /**
  * TextHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */