ajgenesisnode-entity - npm Package Compare versions

Comparing version 0.0.8 to 0.0.9

add.js

@@ -9,4 +9,5 @@
     ajgenesis.createModelDirectory();
+    ajgenesis.createDirectory(ajgenesis.getModelDirectory(), 'entities');
     var template = path.join(__dirname, 'templates', 'entity.json.tpl');
-    var filename = path.join(ajgenesis.getModelDirectory(), entityname + '.json');
+    var filename = path.join(ajgenesis.getModelDirectory(), 'entities', entityname + '.json');
     
@@ -13,0 +14,0 @@ var entitymodel = {

addproperty.js

@@ -24,10 +24,5 @@ var path = require('path'),
     
-    var filename = path.join(ajgenesis.getModelDirectory(), entityname + '.json');
-    var model = require(path.resolve(filename));
-
-    // quick hack
-    model.entities = [ model.entities[0] ];
+    var filename = path.join(ajgenesis.getModelDirectory(), 'entities', entityname + '.json');
+    var entity = require(path.resolve(filename));
     
-    var entity = model.entities[0];
-    
     if (!entity.properties)
@@ -38,3 +33,3 @@ entity.properties = [];
     
-    var text = JSON.stringify(model, null, 4);
+    var text = JSON.stringify(entity, null, 4);
     
@@ -41,0 +36,0 @@ fs.writeFileSync(filename, text);

import.js

@@ -8,3 +8,3 @@
     
-    if (!model || !model.entities || !Array.isArray(model.entities)) {
+    if (!model || !model.entities || typeof model.entities != 'object') {
         cb(null, null);
@@ -15,7 +15,8 @@ return;
     ajgenesis.createModelDirectory();
-        
+    ajgenesis.createDirectory(ajgenesis.getModelDirectory(), 'entities');
+    
     for (var n in model.entities) {
         var entity = model.entities[n];
-        var entitymodel = { entities: [ entity ] };
-        ajgenesis.saveModel(entity.name, entitymodel);
+        var filename = path.join(ajgenesis.getModelDirectory(), 'entities', entity.name + '.json');
+        ajgenesis.saveModel(filename, entity);
     }
@@ -22,0 +23,0 @@

package.json

 { "name": "ajgenesisnode-entity"
 , "description": "AjGenesis for Node, Entity tasks and templates"
 , "keywords": [ "codegeneration", "nodejs", "ajgenesis" ]
-, "version": "0.0.8"
+, "version": "0.0.9"
 , "author": "Angel 'Java' Lopez <[e-mail]> (http://www.ajlopez.com)"
 , "repository": { "type": "git", "url": "git://github.com/ajlopez/AjGenesisNode-Entity.git" }
 , "main": "./index.js"
-, "engines": { "node": ">= 0.6.0 && < 0.13.0" }
+, "engines": { "node": ">= 0.10.0" }
 , "scripts": {
@@ -10,0 +10,0 @@ "test": "simpleunit ./test"

README.md

@@ -52,2 +52,3 @@ # AjGenesisNode Entity
 - 0.0.8: Published. Copy lib directory on install
+- 0.0.9: Published. Using entities folder in model
 
@@ -54,0 +55,0 @@ ## Contribution

test/add.js

@@ -19,10 +19,9 @@
             
-        var model = ajgenesis.loadModel('customer');
+        var model = ajgenesis.loadModel();
         
         test.ok(model);
         test.ok(model.entities);
-        test.ok(Array.isArray(model.entities));
-        test.equal(model.entities.length, 1);
+        test.ok(model.entities.customer);
         
-        var entity = model.entities[0];
+        var entity = model.entities.customer;
         
@@ -53,10 +52,9 @@ test.equal(entity.name, "customer");
             
-        var model = ajgenesis.loadModel('company');
+        var model = ajgenesis.loadModel();
         
         test.ok(model);
         test.ok(model.entities);
-        test.ok(Array.isArray(model.entities));
-        test.equal(model.entities.length, 1);
+        test.ok(model.entities.company);
         
-        var entity = model.entities[0];
+        var entity = model.entities.company;
         
@@ -63,0 +61,0 @@ test.equal(entity.name, "company");

test/addproperty.js

@@ -14,2 +14,3 @@ var addpropertytask = require('../addproperty'),
     process.chdir('test');
+    fsutils.removeDirSync('ajgenesis');
     
@@ -21,10 +22,9 @@ addtask(null, ['customer'], ajgenesis, function (err) {
         addpropertytask(null, ['customer', 'name'], ajgenesis, function (err) {            
-            var model = ajgenesis.loadModel(path.join(__dirname, 'ajgenesis', 'models', 'customer.json'));
+            var model = ajgenesis.loadModel(path.join(__dirname, 'ajgenesis', 'models'));
             
             test.ok(model);
             test.ok(model.entities);
-            test.ok(Array.isArray(model.entities));
-            test.equal(model.entities.length, 1);
+            test.ok(model.entities.customer);
             
-            var entity = model.entities[0];
+            var entity = model.entities.customer;
             
@@ -72,10 +72,9 @@ test.equal(entity.name, "customer");
                     
-                var model = ajgenesis.loadModel(path.join(__dirname, 'ajgenesis', 'models', 'supplier.json'));
+                var model = ajgenesis.loadModel(path.join(__dirname, 'ajgenesis', 'models'));
                 
                 test.ok(model);
                 test.ok(model.entities);
-                test.ok(Array.isArray(model.entities));
-                test.equal(model.entities.length, 1);
+                test.ok(model.entities.supplier);
                 
-                var entity = model.entities[0];
+                var entity = model.entities.supplier;
                 
@@ -82,0 +81,0 @@ test.equal(entity.name, "supplier");

test/import.js

@@ -24,9 +24,11 @@
         test.ok(model.entities);
-        test.ok(Array.isArray(model.entities));
-        test.equal(model.entities.length, 2);
+        test.ok(model.entities.customer);
+        test.ok(model.entities.supplier);
         
-        var entity = model.entities[0];        
+        var entity = model.entities.customer;        
         test.equal(entity.name, "customer");
-        var entity = model.entities[1];
+        var entity = model.entities.supplier;
         test.equal(entity.name, "supplier");
+
+        fsutils.removeDirSync(path.join(__dirname, 'ajgenesis'));
             
@@ -33,0 +35,0 @@ process.chdir(cwd);

No alert changes

Improved metrics

Number of lines in readme file

62

increased by1.64%

Worsened metrics

Total package byte prevSize

21992

decreased by-4.71%

Number of package files

19

decreased by-9.52%

Lines of code

468

decreased by-8.06%

No dependency changes