mucking up the works

Author: danecando

lib/index.js

@@ -4,7 +4,6 @@ var fs = require('fs');
 var path = require('path');
 var Sequelize = require('sequelize');
 
-
 /**
  * Register sequelize as a Hapi plugin
  * @param plugin
@@ -13,44 +12,47 @@ var Sequelize = require('sequelize');
  */
 exports.register = function(plugin, options, next) {
 
+    var db = {};
     var dir = [];
-    var logging = process.env.NODE_ENV === 'production' ? false : console.log;
-
-    dir = Array.isArray(options.models) ? options.models : dir.push(options.models);
+    Array.isArray(options.models) ? dir = options.models : dir.push(options.models);
 
     dir.forEach(function(folder, index, arr) {
         arr[index] = path.join(process.cwd(), folder);
     });
 
+
     var sequelize = new Sequelize(options.database, options.user, options.pass, {
         host: options.host || 'localhost',
         dialect: options.dialect || 'mysql',
         port: options.port || 3306,
-        define: options.defaults || {},
-        logging: logging
+        storage: options.storage || '',
+        define: options.defaults || {}
     });
 
-    var db = {};
 
-    // recursively get all models in 'models' directory, and all nested sub-directories
-    var getModels = function(folder) {
-        var fileContents = fs.readdirSync(folder)
+    //recursively get all models in 'models' directory, and all nested sub-directories
+    var getJSModels = function (folder) {
+        var fileContents = fs.readdirSync(folder),
+            stats;
 
-        fileContents.forEach(function(fileName) {
-            var stats = fs.lstatSync(folder + '/' + fileName);
+        fileContents.forEach(function (fileName) {
+            stats = fs.lstatSync(folder + '/' + fileName);
 
             if (stats.isDirectory()) {
-                getModels(folder + '/' + fileName)
-            } else if (fileName.indexOf('.') !== 0) {
-                var filePath = path.join(folder, fileName);
-                var model = sequelize.import(filePath);
-                db[model.name] = model;
+                getJSModels(folder + '/' + fileName)
+            } else {
+                if(fileName.indexOf('.') !== 0) {
+                    var filePath = path.join(folder, fileName);
+                    var model = sequelize.import(filePath);
+                    db[model.name] = model;
+                }
             }
         });
-    }
+
+    };
 
     dir.forEach(function(folder) {
-        getModels(folder);
+        getJSModels(folder);
     });
 
     Object.keys(db).forEach(function(modelName) {
@@ -64,10 +66,9 @@ exports.register = function(plugin, options, next) {
 
     plugin.expose('db', db);
 
-    return next();
-
+    next();
 };
 
 exports.register.attributes = {
     pkg: require('../package.json')
-};
+};