Clean code

Add possibility to disable automatic orm reload

Author: jaumard

README.md

@@ -1,5 +1,5 @@
-# sails-util-mcvsloader
-Load the models, controllers, services, policies and config from your Sails hooks into the main app 
+# sails-util-mvcsloader
+Load the models, controllers, services, policies and config from your Sails hooks into the main app and extend it on your main sails server if you need
 
 ### USAGE
  Look the example folder.
@@ -14,7 +14,7 @@ npm install --save sails-util-mvcsloader
 
 ```
 module.exports = function(sails) {
-    var hookLoader = require('sails-hook-hookloader')(sails);
+    var hookLoader = require('sails-util-mvcsloader')(sails);
     hookLoader.injectAll({
     		policies : __dirname + '/policies',// Path to your hook's policies
     		config   : __dirname + '/config'// Path to your hook's config
@@ -24,8 +24,7 @@ module.exports = function(sails) {
         hookLoader.injectAll({
           controllers: __dirname+'/controllers', // Path to your hook's controllers
           models: __dirname+'/models', // Path to your hook's models
-          services: __dirname+'/services', // Path to your hook's services
-          config: __dirname+'/config' // Path to your hook's config
+          services: __dirname+'/services' // Path to your hook's services
         }, function(err) {
           return cb();
         });
@@ -34,6 +33,24 @@ module.exports = function(sails) {
  }
 ```
 
+### USED BY 
+[sails-hook-passport](https://github.com/jaumard/sails-hook-passport)
+
+### TROUBLES 
+If you use multiple hooks how use this module you will have this error : 
+
+    error: Failed to reinitialize ORM.
+    error: AdapterError: Connection is already registered
+
+To fix this just create a config/mvcsloarder.js with : 
+
+    module.exports.mvcsloader = {
+        reloadORM : false
+    };
+
+And add this on your config/bootstrap.js
+
+    sails.hooks.orm.reload();
 
 ### TODO
 - Add support for loading :

index.js

@@ -81,7 +81,7 @@ module.exports = function (sails) {
                     toLoad.push(loadServices);
                 }
 
-                async.waterfall(toLoad, function (err) {
+                async.parallel(toLoad, function (err) {
                     if (err) {
                         sails.log.error(err);
                     }

libs/models.js

@@ -4,7 +4,6 @@
 var async = require('async');
 var _ = require('lodash');
 var buildDictionary = require('sails-build-dictionary');
-var utils = require(__dirname + '/utils.js');
 
 module.exports = function (sails, dir, cb) {
     async.waterfall([function loadModelsFromDirectory(next) {
@@ -22,13 +21,6 @@ module.exports = function (sails, dir, cb) {
             replaceExpr: /^.*\//,
             flattenDirectories: true
         }, function (err, supplements) {
-            if (err) {
-                return cb(err);
-            }
-            return next(null, models, supplements);
-        });
-    }, function bindSupplementsToSails(models, supplements, next) {
-        utils._bindToSails(sails, supplements, function (err, supplements) {
             if (err) {
                 return cb(err);
             }
@@ -39,7 +31,16 @@ module.exports = function (sails, dir, cb) {
 
         return next(null);
     }, function reloadSailsORM(next) {
-        sails.hooks.orm.reload();
+        if (!sails.config.mvcsloader || (sails.config.mvcsloader && sails.config.mvcsloader.reloadORM)) {
+            var d = require('domain').create();
+            d.on('error', function (err) {
+                // handle the error safely
+                sails.log.error("mvcs-loader error, you have multiple hooks that try to reload orm, look here (https://github.com/jaumard/sails-util-mvcsloader/#troubles) to disable orm reload and do it manually on your bootstrap.js");
+            });
+            d.run(function () {
+                sails.hooks.orm.reload();
+            });
+        }
 
         return next(null);
     }], function (err) {

libs/services.js

@@ -4,7 +4,6 @@
 var async = require('async');
 var _ = require('lodash');
 var buildDictionary = require('sails-build-dictionary');
-var utils = require(__dirname + '/utils.js');
 module.exports = function (sails, dir, cb) {
     async.waterfall([function loadServicesFromDirectory(next) {
         buildDictionary.optional({
@@ -13,8 +12,6 @@ module.exports = function (sails, dir, cb) {
             replaceExpr: /^.*\//,
             flattenDirectories: true
         }, next);
-    }, function bindServicesToSails(modules, next) {
-        utils._bindToSails(sails, modules, next);
     }, function injectServicesIntoSails(modules, next) {
         sails.services = _.merge(modules || {}, sails.services || {});
         if (sails.config.globals.services) {

package.json

@@ -1,7 +1,7 @@
 {
   "name"        : "sails-util-mvcsloader",
-  "version"     : "0.1.5",
-  "description" : "Load models, controllers, services, policies and config from your Sails hooks into the main app",
+  "version": "0.1.6",
+  "description": "Load the models, controllers, services, policies and config from your Sails hooks into the main app and extend it on your main sails server if you need",
   "main"        : "index.js",
   "scripts"     : {
 	"test": "echo \"Error: no test specified\" && exit 1"
@@ -14,7 +14,17 @@
 	"sails",
 	"sails-hook",
 	"loader",
-	"mvc"
+    "mvc",
+    "hook-models",
+    "hook-controllers",
+    "hook-services",
+    "hook-config",
+    "hook-policies",
+    "models",
+    "controllers",
+    "services",
+    "config",
+    "policies"
   ],
   "author"      : "Leeroy Brun, Aumard Jimmy",
   "license"     : "MIT",