oils - npm Package Compare versions

Comparing version 0.2.0 to 0.2.1

bin/oils.js

@@ -0,0 +0,0 @@ #!/usr/bin/env node

oils-js-core/app.js

@@ -10,7 +10,58 @@ require('./include.js')();
 
+
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var pluginUtils = require('./utils/pluginUtils');
+
 var App = function(opts) {
 	var self = this;
+  global.oils = self;
 
   self.constants = require('./constants');
 
+  self.modelCache = new Object();
+
+  self.models = function(modelName) {
+    if (!self.modelCache[modelName]) {
+      var app = self;
+      var absPath = global.BASE_DIR + app.constants.MODELS_DIR + '/' + modelName;
+      var modelJs = require(absPath);
+        var conn;
+
+        if (modelJs.connection) {
+          conn = app.connections.mainDb;
+        } else {
+          if (connections.mainDb) {
+            conn = app.connections.mainDb; 
+          } else {
+            for (var i in app.connections) {
+            //get the first connection
+            conn = app.connections[i];
+            break;
+            }
+          }
+
+        }
+
+        var schema = new Schema(modelJs.schema);
+        if (modelJs.initSchema) {
+          modelJs.initSchema(schema);
+        }
+        
+        var model = conn.model(modelName, schema);
+        pluginUtils.execDoAfterLoadModel(app, model);
+        if (app.isDebug) {
+          console.log("Loaded model for the first time: " + modelName)
+        }
+
+        self.modelCache[modelName] = model;
+
+    }
+    //console.log("!!!!" + self.modelCache[modelName]);
+    return self.modelCache[modelName];
+    
+  }
+
+  global.models = self.models;
+
   /**
@@ -85,3 +136,3 @@ *  terminator === the termination handler
     require('./loaders/connections.js')(self);
-    require('./loaders/models.js')(self);
+    //require('./loaders/models.js')(self);
   }
@@ -91,4 +142,2 @@
     //convenience methods
-    global.oils = self;
-    global.models = self.models;
     global.connections = self.connections;
@@ -95,0 +144,0 @@ }

oils-js-core/constants.js

@@ -0,0 +0,0 @@ var constants = new Object();

oils-js-core/include.js

@@ -0,0 +0,0 @@ module.exports = function(override) {

oils-js-core/includeController.js

@@ -0,0 +0,0 @@ var constants = require('./constants');

oils-js-core/index.js

 var app = require('./app.js');
 module.exports = app;

oils-js-core/loaders/conf.js

@@ -0,0 +0,0 @@ module.exports = function(app) {

oils-js-core/loaders/connections.js

@@ -0,0 +0,0 @@ module.exports = function(app) {

oils-js-core/loaders/models.js

@@ -0,1 +1,3 @@
+/*
+DEPRECATED, replaced by oils.models('model name')
 var mongoose = require('mongoose');
@@ -80,2 +82,3 @@ var fileUtils = require('../utils/fileUtils');
 
-}
+}
+*/

oils-js-core/loaders/plugins.js

@@ -0,0 +0,0 @@ var fileUtils = require('../utils/fileUtils.js');

oils-js-core/loaders/routes.js

@@ -0,0 +0,0 @@ var fileUtils = require('../utils/fileUtils');

oils-js-core/utils/fileUtils.js

@@ -0,0 +0,0 @@ var fs = require('fs');

oils-js-core/utils/pluginUtils.js

@@ -0,0 +0,0 @@ var routeUtils = require('./routeUtils.js');

oils-js-core/utils/routeUtils.js

@@ -0,0 +0,0 @@ exports.applyRoute = function(app, route, obj) {

oils-js-core/utils/stringUtils.js

 exports.endsWith = function(str, suffix) {
     return str.indexOf(suffix, str.length - suffix.length) !== -1;
 }

package.json

 {
   "name": "oils",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Oils js framework built on top of Express.",
@@ -5,0 +5,0 @@ "keywords": [

README.md

@@ -0,0 +0,0 @@ oils

template/lib/README.md

@@ -0,0 +0,0 @@ LIBRARY FOLDER

template/oils/conf/conf.js

@@ -0,0 +0,0 @@ /*

template/oils/conf/routes.js

@@ -0,0 +0,0 @@ /**

template/oils/plugins/README.md

@@ -0,0 +0,0 @@ PLUGINS FOLDER

template/package.json

@@ -0,0 +0,0 @@ {

template/README.md

@@ -0,0 +0,0 @@ oils-js-quickstart

template/server.js

@@ -0,0 +0,0 @@ #!/bin/env node

template/web/controllers/examples/dealing-with-models.js

@@ -1,2 +0,2 @@
-var Book = models.Book;
+var Book = models('Book');
 module.exports =  {
@@ -3,0 +3,0 @@ get : function(req, res) {

template/web/controllers/examples/index.js

@@ -0,0 +0,0 @@ module.exports =  {

template/web/controllers/index.js

@@ -0,0 +0,0 @@ module.exports =  {

template/web/controllers/README.md

@@ -0,0 +0,0 @@ CONTROLLERS FOLDER

template/web/models/Book.js

@@ -1,2 +0,2 @@
-module.exports = {
+var Book = {
 	//mongoose schema, see mongoosejs.com for more info
@@ -21,2 +21,4 @@ schema: {
 	***/
-}
+}
+
+module.exports = Book;

template/web/models/README.md

 MODELS FOLDER
 ===================
 
-All models created here are accessible via Models.[Name]. It is a Mongoose Model.
+All models created here are accessible via ```Models('ModelName')```. It will return a Mongoose Model.
 
+Models directory do not officially support sub folders as of now.
+
 e.g.
 
-/web/models/Book.js ==> models.Book
+/web/models/Book.js ==> ```models('Book')```
 
@@ -10,0 +12,0 @@ ###schema [required]

test/test.js

@@ -83,11 +83,12 @@ //MOCHA test
   it('should have loaded models', function (done) {
-    setTimeout(function() {
-      var modelCount = 0;
-      for (var i in app.models) {
-        modelCount++;
-      }
-      assert.equal(modelCount, 1, 'Model count');
-      done();
-    }, 1500)
 
+    assert.doesNotThrow(function() {
+        var Book = models('Book');
+        if (!Book) {
+          throw new Error('Book is null')
+        }
+      }, 'Retrieving Book');
+
+    done();
+
   });
@@ -94,0 +95,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

49487

increased by6.39%

Lines of code

754

increased by5.6%

Number of medium supply chain risk alerts

1

decreased by-50%

No dependency changes