npm - gina - Versions diffs - 0.1.1-alpha.98 → 0.1.2-alpha.1 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (370) hide show

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/model/template/index.js RENAMED Viewed

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,9 +21,8 @@ var Model;
 //Imports.
 var fs      = require('fs');
 var Module  = require('module');
-var utils   = require('gina').utils;
-var merge   = utils.merge;
-//var Dev     = Utils.Dev;
+var lib     = require('gina').lib;
+var merge   = lib.merge;
 var EventEmitter  = require('events').EventEmitter;
 var Config  = require('./../config');
@@ -42,25 +41,27 @@ Model = function(namespace){
         //TODO - if intance...
-        if ( typeof(namespace) == "undefined" || namespace == "") {
+        if ( typeof(namespace) == "undefined" || namespace == "") {
             //logger.error('gina', 'MODEL:ERR:1', 'EEMPTY: Model namespace', __stack);
             console.error(new Error('EEMPTY: Model namespace'));
         }
         var suffix = 'Entity';
-        var namespace = namespace.split(/\//g);
+        namespace = namespace.split(/\//g);
         var bundle = namespace[0];
         namespace.shift();
+        var model = null;
         //Capitalize - Normalize
         if (namespace.length > 1) {
             for (var i; i<namespace.length; ++i)
                 namespace[i] = namespace[i].substring(0, 1).toUpperCase() + namespace[i].substring(1);
-            var model = namespace.join(".");
+            model = namespace.join(".");
         } else {
             //Dir name.
             var modelDirName = namespace[0];
             namespace[0] = namespace[0].substring(0, 1).toUpperCase() + namespace[0].substring(1);
-            var model = namespace[0];
+            model = namespace[0];
         }
         //console.log("\nBundle", bundle);
@@ -84,11 +85,11 @@ Model = function(namespace){
                     var entityName, exluded = ['index.js'];
-                    //Will be in Utils.Dev.Factory soon.
+                    //Will be in Dev.Lib.Factory soon.
                     var produce = function(entityName, i){
                         console.debug("producing ", files[i]);
-                        utils.config.get('gina', 'project.json', function(err, config){
+                        lib.config.get('gina', 'project.json', function(err, config){
                             //if (err) logger.error('gina', 'MODEL:ERR:2', 'EEMPTY: EntitySuper' + err, __stack);
                             if (err) console.error(err.stack||err.message);
@@ -104,7 +105,7 @@ Model = function(namespace){
                                 try {
                                     if (entityName != "undefiend") {
                                         console.log("preparing entity ", entityName);
-                                        //TODO - Would be great to implement in Utils.Dev.
+                                        //TODO - Would be great to implement in Dev.Lib
                                         var EntityFactorySource = source
                                             .replace(/\{Entity\}/g, entityName)
                                             .replace(/\{Model\}/g, model);
@@ -113,7 +114,8 @@ Model = function(namespace){
                                         var EntityFactory = new EntityFactoryClass( _this.getConfig() );
                                         console.log("Factory is ",  EntityFactory);
-                                        merge(Entity, EntityFactory, true);
+                                        // merge(Entity, EntityFactory, true);
+                                        Entity = merge(Entity, EntityFactory, true);
                                         //console.debug("\nEntity CONTENT ", Entity, " \nVS\n", EntityFactory);
                                     } else {
@@ -125,7 +127,7 @@ Model = function(namespace){
                                 }
                                 //Entity = new entitiesManager[model]();
-                                //utils.merge(_this, Entity, true);
+                                //lib.merge(_this, Entity, true);
                                 //console.debug("EntityManager  \n",  entitiesManager,"\n VS \n",  EntityFactory);
                                 if (i == files.length-1) {
                                     //console.debug("All done !");
@@ -135,7 +137,7 @@ Model = function(namespace){
                             })//EO loadFile
-                        })//EO Utils.Config.get
+                        })//EO lib.config.get()
                     };//EO produce
@@ -158,7 +160,7 @@ Model = function(namespace){
                 });//EO fs.readdir.
-            } else {
+            } else {
                 _this.emit('ready', 'no configuration found for your model: ' + model);
                 console.log("no configuration found...");
             }

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/plugins/index.js RENAMED Viewed

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/plugins/lib/file/package.json RENAMED Viewed

@@ -12,7 +12,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/plugins/lib/intl/package.json RENAMED Viewed

@@ -12,7 +12,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/plugins/lib/intl/src/main.js RENAMED Viewed

@@ -1,8 +1,8 @@
 function IntlPlugin() {
-    var merge       = merge || require('utils/merge');
-    var Collection  = Collection || require('utils/collection');
+    var merge       = merge || require('lib/merge');
+    var Collection  = Collection || require('lib/collection');
     var self = {
         options : {
@@ -10,7 +10,7 @@ function IntlPlugin() {
             locale: 'en' // by default
         }
     };
     // load phrases
     var phrases = {
         'amendment' : {
@@ -24,8 +24,8 @@ function IntlPlugin() {
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     // Publish as node.js module
-    var merge       = require('utils/merge');
-    var Collection  = require('utils/collection');
+    var merge       = require('lib/merge');
+    var Collection  = require('lib/collection');
     module.exports  = IntlPlugin

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/plugins/lib/storage/package.json RENAMED Viewed

@@ -8,7 +8,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/plugins/lib/storage/src/main.js RENAMED Viewed

@@ -7,8 +7,8 @@
  * */
 function StoragePlugin(options) {
-    var merge       = merge || require('utils/merge');;
-    var Collection  = Collection || require('utils/collection');
+    var merge       = merge || require('lib/merge');;
+    var Collection  = Collection || require('lib/collection');
     var uuid        = uuid || require('vendor/uuid');
     var dateFormat  = dateFormat || require('helpers/dateFormat');
@@ -111,7 +111,8 @@ function StoragePlugin(options) {
             var filter          = this['_filter'];
             this['_updatedAt']  = new Date().format("isoDateTime");
-            merge(tmpCollections[ collection ][ index ], this, true);
+            // merge(tmpCollections[ collection ][ index ], this, true);
+            tmpCollections[ collection ][ index ] = merge(tmpCollections[ collection ][ index ], this, true);
             // cleaning
             delete tmpCollections[ collection ][ index ]['_index'];
@@ -415,8 +416,8 @@ function StoragePlugin(options) {
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     // Publish as node.js module
-    var merge       = require('utils/merge'); //require('../../../../../lib/merge');
-    var Collection  = require('utils/collection'); //require('../../../../../lib/collection');
+    var merge       = require('lib/merge'); //require('../../../../../lib/merge');
+    var Collection  = require('lib/collection'); //require('../../../../../lib/collection');
     var uuid        = require('uuid');
     module.exports = StoragePlugin

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/plugins/lib/validator/package.json RENAMED Viewed

@@ -12,7 +12,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },