gina 0.1.1-alpha.165 → 0.1.1-alpha.167

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/asset/plugin/dist/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"./dist/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.167/core/asset/plugin/dist/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["./src/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.167/core/asset/plugin/src/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","unescape","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","match","split","err","link","links","document","head","getElementsByTagName","i","len","length","found","cssPath","href","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/config.js

@@ -201,17 +201,17 @@ function Config(opt, contextResetNeeded) {
                     //console.error("found bundles ", self.bundlesConfiguration.bundles);
 
                     //TODO - Don't override if syntax is ok - no mixed paths.
-                    //Set paths for utils. Override for now.
+                    //Set paths for lib. Override for now.
                     //To reset it, just delete the hidden folder.
                     var ginaPath = opt.ginaPath;
-                    var utilsConfig = new lib.Config();
+                    var libConfig = new lib.Config();
 
-                    utilsConfig.set('gina', 'locals.json', {
-                        project : utilsConfig.getProjectName(),
+                    libConfig.set('gina', 'locals.json', {
+                        project : libConfig.getProjectName(),
                         paths : {
                             project : self.projectName,
                             gina    : ginaPath,
-                            utils   : utilsConfig.__dirname,
+                            lib     : libConfig.__dirname,
                             root    : opt.executionPath,
                             env     : opt.executionPath + '/env.json',
                             tmp     : opt.executionPath + '/tmp'
@@ -834,7 +834,7 @@ function Config(opt, contextResetNeeded) {
                 // Variables replace. Compare with gina/core/template/conf/env.json.
                 // Defining root domain (TLD or SLD)
                 // by default
-                var rootDomain = domainLib.getRootDomain(os.hostname());
+                var rootDomain = domainLib.getRootDomain(os.hostname()).value;
                 // if overrided by the project `manifest.json`: meaning all bundles belong to the same TLD or SLD
                 if ( typeof(manifest.rootDomain) != 'undefined' ) {
                     rootDomain = manifest.rootDomain;
@@ -845,7 +845,7 @@ function Config(opt, contextResetNeeded) {
                 }
                 // custom override: user entry in the project/env/bundle `env.json` or `bundle/config/settings.server.json`
                 if (!/\{rootDomain\}/.test(newContent[app][env].host) ) {
-                    rootDomain = domainLib.getRootDomain(newContent[app][env].host);
+                    rootDomain = domainLib.getRootDomain(newContent[app][env].host).value;
                 }
                 newContent[app][env].rootDomain = rootDomain;
 

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/connectors/couchbase/lib/connector.js

@@ -1,8 +1,8 @@
 "use strict";
 var fs = require('fs');
 var gina            = require('../../../../core/gna');
-var utils           = gina.utils;
-var console         = utils.logger;
+var lib             = gina.lib;
+var console         = lib.logger;
 
 var version = 2; // by default
 // old - GINA_FRAMEWORK_DIR + '/package.json'

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/connectors/couchbase/lib/connector.v2.js

@@ -7,10 +7,10 @@ var couchbasePath   = _(getPath('project') +'/node_modules/couchbase');
 var couchbase       = require(couchbasePath);
 
 var gina            = require('../../../../core/gna');
-var utils           = gina.utils;
-var console         = utils.logger;
-var merge           = utils.merge;
-var modelUtil       = new utils.Model();
+var lib             = gina.lib;
+var console         = lib.logger;
+var merge           = lib.merge;
+var modelUtil       = new lib.Model();
 
 //globalized
 uuid                = require('uuid');

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/connectors/couchbase/lib/connector.v3.js

@@ -4,10 +4,10 @@ var util            = require('util');
 var EventEmitter    = require('events').EventEmitter;
 var couchbase       = require('couchbase');
 var gina            = require('../../../../core/gna');
-var utils           = gina.utils;
-var console         = utils.logger;
-var merge           = utils.merge;
-var modelUtil       = new utils.Model();
+var lib             = gina.lib;
+var console         = lib.logger;
+var merge           = lib.merge;
+var modelUtil       = new lib.Model();
 
 //globalized
 N1qlQuery           = couchbase.N1qlQuery || null;
@@ -45,44 +45,44 @@ function Connector(dbString) {
             version: 3
         }
     ;
-    
+
     /**
      * connect
      *
      * @param {object} dbString
      * @callback cb
-     * */    
+     * */
     this.connect = function(dbString, cb) {
         // Attention: the connection is lost 5 minutes once the bucket is opened.
         var conn        = null;
-        
+
         var onError = function (err, next) {
             delete self.instance.reconnecting;
             self.instance.reconnected = self.instance.connected = false;
             console.error('[ CONNECTOR ][ ' + local.bundle +' ] couchbase could not be reached !!\n'+ ( err.stack || err.message || err ) );
-            
+
             // reconnecting
             console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] trying to reconnect in a few secs...');
             self.instance.reconnecting = true;
-            
+
             setTimeout( function onRetry(){
                 if ( typeof(next) != 'undefined' ) {
                     self.connect(dbString, next)
                 } else {
                     self.connect(dbString)
                 }
-            }, 5000)   
-            
+            }, 5000)
+
         };
-        
+
         // once
         var onConnect = function onConnect(cb){
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ] couchbase is alive !!'); 
+            console.debug('[ CONNECTOR ][ ' + local.bundle +' ] couchbase is alive !!');
             console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ] now connected...');
-            
+
             self.instance.reconnected  = self.instance.connected   = true;
             var options = local.options;
-            
+
             // updating context
             var ctx = getContext()
                 , bundle = ctx.bundle
@@ -101,7 +101,7 @@ function Connector(dbString) {
                 if ( typeof(cb) != 'undefined' ) { // this portition is not working yet on Mac OS X
                     console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connected to couchbase !!');
 
-                    
+
                     modelUtil.setConnection(bundle, name, self.instance);
 
                     if ( fs.existsSync(modelsPath) ) {
@@ -116,7 +116,7 @@ function Connector(dbString) {
                         cb(new Error('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] '+ modelsPath+ ' not found') )
                     }
 
-                } else {                                      
+                } else {
                     console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connection to bucket `'+ name +'` is being kept alive ...');
                 }
             });
@@ -132,7 +132,7 @@ function Connector(dbString) {
                     self.instance.reconnected = false;
                     self.instance.reconnecting = false;
                 }
-                
+
                 if (
                     err instanceof couchbase.Error && err.code == 16 && !self.reconnected
                     //|| err instanceof couchbase.Error && err.code == 23 && !self.reconnecting
@@ -141,14 +141,14 @@ function Connector(dbString) {
                     // reconnecting
                     console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] trying to reconnect in 5 secs...');
                     self.reconnecting = true;
-                    
+
                     setTimeout( function onRetry(){
                         if ( typeof(next) != 'undefined' ) {
                             self.connect(dbString, next)
                         } else {
                             self.connect(dbString)
                         }
-                    }, 5000)                            
+                    }, 5000)
 
                 } else if (err instanceof couchbase.Error && err.code == 23 && !self.reconnecting) {
                     self.instance.disconnect();
@@ -164,7 +164,7 @@ function Connector(dbString) {
                     if (err && err instanceof Error) {
 
                         console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
-                        
+
                         if ( typeof(err) == 'object' ) {
                             res.end(JSON.stringify({
                                 status: 500,
@@ -174,7 +174,7 @@ function Connector(dbString) {
                         } else {
                             res.end(err)
                         }
-                        
+
                         res.headersSent = true;
                     } else {
                         // express js patch
@@ -184,33 +184,33 @@ function Connector(dbString) {
                             console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                             return;
                         }
-                    }                            
+                    }
                 }
             });
-            
-                               
-            self.emit('ready', false, self.instance);  
+
+
+            self.emit('ready', false, self.instance);
         }
-        
+
         try {
-                        
+
             // if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {
             //     conn = self.cluster.bucket(dbString.database, dbString.password);
             // } else {
             //     conn = self.cluster.bucket(dbString.database);
             // }
-            
+
             // conn.sdk        = sdk;
-            // self.instance   = conn;   
+            // self.instance   = conn;
             // onConnect(cb)
-            if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {                
+            if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {
                 conn = await self.cluster.openBucket(dbString.database, dbString.password, function onBucketOpened(bErr) {
                     if (bErr) {
                         cb(bErr)
                     } else {
                         conn.sdk        = sdk;
                         self.instance   = conn;
-                        onConnect(cb); 
+                        onConnect(cb);
                     }
                 });
             } else {
@@ -224,13 +224,13 @@ function Connector(dbString) {
                     }
                 });
             }
-            
+
         } catch (err) {
             console.error('[ CONNECTOR ][ ' + local.bundle +' ] '+ local.env +' ] couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );
             onError(err, cb)
         }
 
-        
+
         return conn
     }
 
@@ -250,7 +250,7 @@ function Connector(dbString) {
             local.bundle    = getConfig().bundle
 
             console.info('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ][ ' + dbString.database +' ] authenticating to couchbase cluster @'+ dbString.protocol + dbString.host);
-            
+
             try {
                 self.cluster = new couchbase.Cluster(dbString.protocol + dbString.host);
                 // version 5.x
@@ -259,15 +259,15 @@ function Connector(dbString) {
             } catch(_err) {
                 console.error('[ CONNECTOR ][ ' + local.bundle +' ] could not authenticate to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (_err.stack || _err.message || _err) );
             }
-                
+
             console.info('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ][ ' + dbString.database +' ] connecting to couchbase cluster @'+ dbString.protocol + dbString.host);
-            
+
             self
                 .connect(dbString)
                 // .on('error', function(err){
                 //     if (!self.reconnecting)
-                //         console.emerg('[ CONNECTOR ][ ' + local.bundle +' ][ '+ dbString.database +' ] Handshake aborted ! PLease check that Couchbase is running.\n',  err.message);                    
-                   
+                //         console.emerg('[ CONNECTOR ][ ' + local.bundle +' ][ '+ dbString.database +' ] Handshake aborted ! PLease check that Couchbase is running.\n',  err.message);
+
                 //     if (err)
                 //         console.error(err.stack);
                 // })
@@ -285,7 +285,7 @@ function Connector(dbString) {
                 //             self.instance.reconnected = false;
                 //             self.instance.reconnecting = false;
                 //         }
-                        
+
                 //         if (
                 //             err instanceof couchbase.Error && err.code == 16 && !self.reconnected
                 //             //|| err instanceof couchbase.Error && err.code == 23 && !self.reconnecting
@@ -294,14 +294,14 @@ function Connector(dbString) {
                 //             // reconnecting
                 //             console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] trying to reconnect in 5 secs...');
                 //             self.reconnecting = true;
-                            
+
                 //             setTimeout( function onRetry(){
                 //                 if ( typeof(next) != 'undefined' ) {
                 //                     self.connect(dbString, next)
                 //                 } else {
                 //                     self.connect(dbString)
                 //                 }
-                //             }, 5000)                            
+                //             }, 5000)
 
                 //         } else if (err instanceof couchbase.Error && err.code == 23 && !self.reconnecting) {
                 //             self.instance.disconnect();
@@ -317,7 +317,7 @@ function Connector(dbString) {
                 //             if (err && err instanceof Error) {
 
                 //                 console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
-                                
+
                 //                 if ( typeof(err) == 'object' ) {
                 //                     res.end(JSON.stringify({
                 //                         status: 500,
@@ -327,7 +327,7 @@ function Connector(dbString) {
                 //                 } else {
                 //                     res.end(err)
                 //                 }
-                                
+
                 //                 res.headersSent = true;
                 //             } else {
                 //                 // express js patch
@@ -337,7 +337,7 @@ function Connector(dbString) {
                 //                     console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                 //                     return;
                 //                 }
-                //             }                            
+                //             }
                 //         }
                 //     })
                 // })
@@ -348,7 +348,7 @@ function Connector(dbString) {
         }
     }
 
-    
+
 
     /**
      * ping
@@ -395,10 +395,10 @@ function Connector(dbString) {
             }
 
             self.pingId = setInterval(function onTimeout(){
-                
+
                 if (!self.instance.connected) {
                     console.debug('[ CONNECTOR ][ ' + local.bundle +' ] connecting to couchbase');
-                    
+
                     self.instance.reconnected = false;
                     self.instance.reconnecting = true;
                     if ( typeof(next) != 'undefined' ) {
@@ -406,11 +406,11 @@ function Connector(dbString) {
                     } else {
                         self.connect(dbString)
                     }
-                    
-                } else {                    
+
+                } else {
                     self.ping(options.pingInterval, cb, ncb);
                 }
-                                
+
             }, interval);
             ncb(cb)
         } else {

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/connectors/couchbase/lib/connector.v4.js

@@ -5,10 +5,10 @@ var EventEmitter    = require('events').EventEmitter;
 uuid                = require('uuid');
 var couchbase       = require(getPath('project') +'/node_modules/couchbase');// jshint ignore:line
 var gina            = require('../../../../core/gna');
-var utils           = gina.utils;
-var console         = utils.logger;
-var merge           = utils.merge;
-var modelUtil       = new utils.Model();
+var lib             = gina.lib;
+var console         = lib.logger;
+var merge           = lib.merge;
+var modelUtil       = new lib.Model();
 
 //globalized
 // N1qlQuery           = couchbase.N1qlQuery || null;// jshint ignore:line

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/connectors/couchbase/lib/session-store.js

@@ -1,8 +1,8 @@
 "use strict";
 var fs = require('fs');
 var gina            = require('../../../../core/gna');
-var utils           = gina.utils;
-var console         = utils.logger;
+var lib             = gina.lib;
+var console         = lib.logger;
 
 var version = 2; // by default
 var dependenciesPath = getPath('project') + '/package.json';// jshint ignore:line

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/connectors/couchbase/lib/session-store.v3.js

@@ -3,8 +3,8 @@ var fs              = require('fs');
 var util            = require('util');
 
 var gina            = require('../../../../core/gna');
-var utils           = gina.utils;
-var console         = utils.logger;
+var lib             = gina.lib;
+var console         = lib.logger;
 
 /*!
  * Connect - Couchbase
@@ -120,7 +120,7 @@ module.exports = function(session, bundle){
             //var coll = connectOptions.db.collection(bundle);
             var coll = connectOptions.db.defaultCollection();
             //var coll  = ( typeof(bundle) != 'undefined' ) ? bucket.collection(bundle) : bucket.defaultCollection();
-            
+
             this.client = coll;
         } else {
             var Couchbase = require('couchbase');
@@ -160,8 +160,8 @@ module.exports = function(session, bundle){
         if ('function' !== typeof fn) { fn = noop; }
         sid = this.prefix + sid;
         console.debug('GET "%s"', sid);
-        
-        
+
+
         var err = false, result = null, data = null;
         // this.client.get(sid, function(err, data){
         //     //Handle Key Not Found error
@@ -183,18 +183,18 @@ module.exports = function(session, bundle){
         this.client
             .get(sid)
             .then(function onData(_data) {
-                data = _data;                
+                data = _data;
             })
             .catch(function onErr(_err){
                 err = _err;
             });
-            
-        //Handle Key Not Found error    
+
+        //Handle Key Not Found error
         if (err && err.code == 13) {
             return fn();
         }
         if (err) return fn(err);
-        
+
         if (!data || !data.value) return fn();
         data = data.value.toString();
         console.debug('GOT %s', data);
@@ -257,14 +257,14 @@ module.exports = function(session, bundle){
                         err = _err
                         // if(err)
                         //     debug('Session Set complete', err.stack || err.message || err);
-                            
+
                        //fn && fn.apply(this, arguments);
                     })
             if (err) {
                  fn && fn(err);
             }
              fn && fn(err, result);
-            
+
         } catch (err) {
             fn && fn(err);
         }
@@ -334,7 +334,7 @@ module.exports = function(session, bundle){
                 err || debug('Session Touch complete');
                 fn && fn.apply(this, arguments);
             })
-        
+
     };
 
     return CouchbaseStore;

package/framework/{v0.1.1-alpha.165 → v0.1.1-alpha.167}/core/connectors/couchbase/lib/session-store.v4.js

@@ -3,12 +3,11 @@ var fs              = require('fs');
 var util            = require('util');
 
 var gina            = require('../../../../core/gna');
-var utils           = gina.utils;
-var helpers         = utils.helpers;
+var lib             = gina.lib;
+var console         = lib.logger;
+var helpers         = lib.helpers;
 var dateFormat      = helpers.dateFormat;
 
-var console         = utils.logger;
-
 /*!
  * Connect - Couchbase
  * Copyright(c) 2014 Christopher Mina <christopher.mina@gmail.com>