gina 0.0.9-p91c → 0.1.1-alpha.3

package/{core → framework/v0.1.1-alpha.3/core}/model/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2016 Rhinostone <gina@rhinostone.com>
+ * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,7 +9,6 @@
 //Imports.
 var fs              = require('fs');
 var EventEmitter    = require('events').EventEmitter;
-//var corePath        = getPath('gina.core');
 var corePath        = getPath('gina').core;
 var Config          = require( corePath + '/config' );
 var config          = new Config();
@@ -32,13 +31,14 @@ var Module          = require('module');
  *
  * @package     Gina
  * @namespace
- * @author      Rhinostone <gina@rhinostone.com>
+ * @author      Rhinostone <contact@gina.io>
  * @api         Public
  */
-function Model(namespace) {
+function Model(namespace, _config) {
     var self = this;
     this.i = 0;
     var local = {
+        connectorPath: null,
         modelPath: null,
         entitiesPath: null,
         connection: null,
@@ -50,13 +50,13 @@ function Model(namespace) {
     var _configuration = null;
     var _connector = null;
 
-    var cacheless = (process.env.IS_CACHELESS == 'false') ? false : true;
-    var standalone = config.Host.isStandalone();
+    var cacheless = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
+    //var isStandalone = config.Host.isStandalone();
 
 
     var setup = function(namespace) {
         if ( typeof(namespace) == 'undefined' || namespace == '') {
-            console.error('gina', 'MODEL:ERR:1', 'EEMPTY: Model namespace', __stack);
+            console.error('[ MODEL ][ '+ namespace +' ] MODEL:ERR:1 EEMPTY: Model namespace',  __stack);
         }
 
         var model, namespace = namespace.split(/\//g);
@@ -76,16 +76,18 @@ function Model(namespace) {
         }
 
 
-        console.debug("\nBundle: ", bundle);
-        console.debug("Model: ", model);
+        console.debug('[ MODEL ][ ' + model +' ] Bundle: '+ bundle);
+        //console.debug('[ MODEL ][ ' + model +' ] Model: '+ model);
         self.name       = _connector;
         self.bundle     = bundle;
         self.model      = model;
+
         self.modelDirName = model;
         var modelConnectors = getContext('modelConnectors');
         if (modelConnectors) {
             self.connectors = getContext('modelConnectors')[self.name];
-            self.database = self.connectors.database;
+            self.database   = self.connectors.database;
+            self.connector  = self.connectors.connector;
         } else {
             self.connectors = {};
         }
@@ -107,28 +109,32 @@ function Model(namespace) {
 
         // this is supposed to happen on load or for dev env; on reload, with a checksum
         var conf        = getConfigSync(bundle);
-        local.locals    = conf.locals;
+        //local.locals    = conf.locals;
 
         if (conf) {
             _configuration = conf.connectors;
+            self.connector = _configuration[self.name].connector;
 
-            console.debug("CONF READY ", model, conf.path);
+            console.debug('[ MODEL ][ ' + model +' ] About to scan: '+ conf.path);
             //TODO - More controls...
 
             //For now, I just need the F..ing entity name.
+            var connectorPath   = local.connectorPath = _(GINA_FRAMEWORK_DIR +'/core/connectors/'+ self.connector);
             var modelPath       = local.modelPath = _(conf.path + '/' + modelDirName);
             var entitiesPath    = local.entitiesPath = _(modelPath + '/entities');
-            console.debug('models scaning... ', entitiesPath, fs.existsSync(entitiesPath));
+            console.debug('[ MODEL ][ ' + model +' ] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
             if (!fs.existsSync(entitiesPath)) {
-                fs.mkdirSync(entitiesPath) // creating empty path
+                //fs.mkdirSync(entitiesPath) // creating empty path
+                new _(entitiesPath).mkdirSync();
             }
 
-            var connectorPath   = _(modelPath + '/lib/connector.js');
+            var connectorPath   = _(connectorPath + '/lib/connector.js');
+            console.debug('[ MODEL ][ ' + model +' ] Loading connector: ' + connectorPath);
             //Getting Entities Manager.
             var exists = fs.existsSync(connectorPath);
             if (exists) {
                 if (cacheless)
-                    delete require.cache[_(connectorPath, true)];
+                    delete require.cache[require.resolve(_(connectorPath, true))];
 
                 var Connector = require(_(connectorPath, true));
 
@@ -136,7 +142,7 @@ function Model(namespace) {
                     Connector,
                     function onConnect(err, conn) {
                         if (err) {
-                            console.error(err.stack);
+                            console.error('[MODEL][' + model +']', err.stack);
                             self.emit('model#ready', err, self.bundle, self.name, null)
 
                         } else {
@@ -148,12 +154,12 @@ function Model(namespace) {
             } else {//Means that no connector was found in models.
 
                 //finished.
-                self.emit('model#ready', new Error('[ '+self.name+' ] No connector found'), self.bundle, self.name, conn)
+                self.emit('model#ready', new Error('[ MODEL ][ '+ model +' ] No connector found'), self.bundle, self.name, conn)
             }
 
         } else {
-            console.debug("no configuration found...");
-            self.emit('model#ready', new Error('no configuration found for your model: ' + model), self.bundle, self.name, null)
+            console.warn('[ MODEL ][ ' + model +' ] no configuration found...');
+            self.emit('model#ready', new Error('[ MODEL ][ ' + model +' ] no configuration found for your model: ' + model), self.bundle, self.name, null)
         }
 
         return self
@@ -162,13 +168,14 @@ function Model(namespace) {
 
     this.connect = function(Connector, callback) {
         if ( typeof(self.connectors[_connector]) == 'undefined' ) {
+            //console.debug('[ MODEL ] Need to create connector instance ...');
             self.connectors[_connector] = {};
             var connector = new Connector( self.getConfig(_connector) );
 
             connector.onReady( function(err, conn){
                 self.connectors[_connector].err = err;
                 self.connectors[_connector].conn = conn;
-
+                
                 callback(err, conn);
             });
 
@@ -195,44 +202,56 @@ function Model(namespace) {
      * */
     var getConfigSync = function(bundle, i) {
         var i = i || 0;
-        var configuration = config.getInstance(bundle);
 
-        try {
+        var configuration = null;
+        var env = null, conf = null, connectors = null;
+        if ( typeof (_config) != 'undefined' ) {
+            configuration = _config;
+            env = _config.env;
+            conf = _config;
+            connectors = _config.content.connectors;
+        } else {
+            configuration = config.getInstance(bundle);
+            env = configuration.Env.current;
+            conf = configuration.Env.getConf(bundle, env);
+        }
+        console.debug('[ MODEL ][ ' + _connector + ' ] env ', conf.env);         
+        console.debug('[ MODEL ][ ' + _connector + ' ] configuration modelsPath ', conf.modelsPath);
+        console.debug('[ MODEL ][ ' + _connector + ' ] connectors ', connectors); 
 
-            var locals = _locals = utilsConfig.getSync('gina', 'locals.json')
-        } catch (err) {
-            console.emerg('Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
-            if ( i < 10) {
-                console.debug('about to retry to load locals.json');
-                setTimeout(function(){
+        // try {
 
-                    i = i+1;
-                    console.debug('retry ('+i+') ...');
-                    return getConfigSync(bundle, i)
-                }, 300)
+        //     var locals = _locals = utilsConfig.getSync('gina', 'locals.json')
+        // } catch (err) {
+        //     console.emerg('[ MODEL ][ ' + _connector +' ] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
+        //     if ( i < 10) {
+        //         console.debug('[ MODEL ][ ' + _connector +' ] about to retry to load locals.json');
+        //         setTimeout(function(){
 
-            } else {
-                throw new Error('Config could not be loaded');
-                process.exit(1)
-            }
-            return false
-        }
+        //             i = i+1;
+        //             console.debug('[ MODEL ][ ' + _connector +' ] retry ('+i+') ...');
+        //             return getConfigSync(bundle, i)
+        //         }, 300)
 
-        if ( typeof(configuration) != 'undefined' && locals) {
+        //     } else {
+        //         throw new Error('Config could not be loaded');
+        //         process.exit(1)
+        //     }
+        //     return false
+        // }
 
-            var env = configuration.Env.current;
-            var conf = configuration.Env.getConf(bundle, env);
+        if ( typeof(configuration) != 'undefined' /**&& locals*/) {
 
             // configuration object.
             var confObj = {
-                connectors  : conf.content.connectors,
-                path        : conf.modelsPath,
-                locals      : locals
+                connectors  : connectors,
+                path        : conf.modelsPath/**,
+                locals      : locals*/
             };
 
             return confObj
         } else {
-            throw new Error('Config not instantiated');
+            throw new Error('[ MODEL ][ ' + _connector +' ] Config not instantiated');
             return undefined
         }
     }
@@ -240,10 +259,10 @@ function Model(namespace) {
     /**
      * Get Model Configuration
      *
-     * @return {object|undefined} configuration
+     * @returns {object|undefined} configuration
      * */
     this.getConfig = function(connector){
-        var connector = ( typeof(connector) == 'undefined' ) ?  _connector : connector;
+        connector = ( typeof(connector) == 'undefined' ) ?  _connector : connector;
 
         if (_configuration) {
             return ( typeof(connector) != 'undefined' ) ? _configuration[connector] : undefined

package/{core → framework/v0.1.1-alpha.3/core}/model/template/entityFactory.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2016 Rhinostone <gina@rhinostone.com>
+ * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@ var {Entity}Entity;
  *
  * @package     Gina
  * @namespace   Gina.Model.{Model}
- * @author      Rhinostone <gina@rhinostone.com>
+ * @author      Rhinostone <contact@gina.io>
  * @api         Public
  */
 

package/{core → framework/v0.1.1-alpha.3/core}/model/template/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2016 Rhinostone <gina@rhinostone.com>
+ * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@
  *
  * @package     Gina
  * @namespace
- * @author      Rhinostone <gina@rhinostone.com>
+ * @author      Rhinostone <contact@gina.io>
  * @api         Public
  */
 
@@ -86,7 +86,7 @@ Model = function(namespace){
 
                     //Will be in Utils.Dev.Factory soon.
                     var produce = function(entityName, i){
-                        console.log("producing ", files[i]);
+                        console.debug("producing ", files[i]);
 
                         utils.config.get('gina', 'project.json', function(err, config){
                             //if (err) logger.error('gina', 'MODEL:ERR:2', 'EEMPTY: EntitySuper' + err, __stack);
@@ -96,7 +96,7 @@ Model = function(namespace){
 
                             //TODO - Factory class
                             //var Factory = new Factory({source: , target: ).onComplete();
-                            console.log("LOADING ", filename);
+                            console.debug("LOADING ", filename);
                             //Getting source.
                             loadFile(filename, entityName, function(err, source){
                                 console.log("got source ", err, source);
@@ -109,14 +109,12 @@ Model = function(namespace){
                                             .replace(/\{Entity\}/g, entityName)
                                             .replace(/\{Model\}/g, model);
 
-                                        //var EntityFactory = new requireFromString(EntityFactorySource)( _this.getConfig() );
                                         var EntityFactoryClass = requireFromString(EntityFactorySource);
                                         var EntityFactory = new EntityFactoryClass( _this.getConfig() );
                                         console.log("Factory is ",  EntityFactory);
 
-                                        //var Entity = new Entity();
                                         merge(Entity, EntityFactory, true);
-                                        //console.log("\nEntity CONTENT ", Entity, " \nVS\n", EntityFactory);
+                                        //console.debug("\nEntity CONTENT ", Entity, " \nVS\n", EntityFactory);
 
                                     } else {
                                         throw new Error('Gina.Model.getContext(...): [entityName] is undefined.');
@@ -128,9 +126,9 @@ Model = function(namespace){
 
                                 //Entity = new entitiesManager[model]();
                                 //utils.merge(_this, Entity, true);
-                                console.log("EntityManager  \n",  entitiesManager,"\n VS \n",  EntityFactory);
+                                //console.debug("EntityManager  \n",  entitiesManager,"\n VS \n",  EntityFactory);
                                 if (i == files.length-1) {
-                                    console.log("All done !");
+                                    //console.debug("All done !");
                                     _this.emit('ready', false, entitiesManager);
                                     ++i;
                                 }
@@ -171,7 +169,7 @@ Model = function(namespace){
     /**
      * Get Model Configuration
      *
-     * @return {object|undefined} configuration
+     * @returns {object|undefined} configuration
      * */
     this.getConfig = function(){
         if (configuration) {

package/{core → framework/v0.1.1-alpha.3/core}/plugins/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2016 Rhinostone <gina@rhinostone.com>
+ * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +10,13 @@
  * Gina.Core.Plugins Class
  *
  * @package    Gina.Core
- * @author     Rhinostone <gina@rhinostone.com>
+ * @author     Rhinostone <contact@gina.io>
  */
 
 function Plugins() {
 
     var _require = function(path) {
-        var cacheless = (process.env.IS_CACHELESS == 'false') ? false : true;
+        var cacheless = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
         if (cacheless) {
             try {
                 delete require.cache[require.resolve(path)];

package/framework/v0.1.1-alpha.3/core/plugins/lib/file/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "file",
+  "version": "1.0.0",
+  "description": "File manager plugin",
+  "authors": [
+    {
+      "name": "Maritn-Luther ETOUMAN",
+      "email": "contact@gina.io"
+    },
+    {
+      "name": "Fabrice Delaneau",
+      "email": "contact@gina.io"
+    }
+  ],
+  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "engines": {
+    "node": ">=0.10.22"
+  },
+  "main": "src/main",
+  "scripts": {
+    "test": "nodeunit test"
+  },
+  "license": "MIT",
+  "readmeFilename": "README.md"
+}

package/{core → framework/v0.1.1-alpha.3/core}/plugins/lib/intl/package.json

@@ -5,14 +5,14 @@
   "authors": [
     {
       "name": "Maritn-Luther ETOUMAN",
-      "email": "gina@rhinosotne.com"
+      "email": "contact@gina.io"
     },
     {
       "name": "Fabrice Delaneau",
-      "email": "gina@rhinosotne.com"
+      "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2016 Rhinostone <gina@rhinostone.com>",
+  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/{core → framework/v0.1.1-alpha.3/core}/plugins/lib/intl/src/main.js

@@ -5,14 +5,30 @@ function IntlPlugin() {
     var Collection  = Collection || require('utils/collection');
 
     var self = {
-        'options' : { }
+        options : {
+            isCaseSensitive: true,
+            locale: 'en' // by default
+        }
+    };
+    
+    // load phrases
+    var phrases = {
+        'amendment' : {
+            _data : null,
+            en : 'amendment',
+            fr : 'avenant'
+        }
     };
 
 };
 
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     // Publish as node.js module
+    var merge       = require('utils/merge');
+    var Collection  = require('utils/collection');
+
     module.exports  = IntlPlugin
+
 } else if ( typeof(define) === 'function' && define.amd) {
     // Publish as AMD module
     define('gina/intl', function(){ return IntlPlugin })

package/{core → framework/v0.1.1-alpha.3/core}/plugins/lib/storage/package.json

@@ -5,10 +5,10 @@
   "authors": [
     {
       "name": "Maritn-Luther ETOUMAN",
-      "email": "gina@rhinosotne.com"
+      "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2016 Rhinostone <gina@rhinostone.com>",
+  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },