Merge branch 'v2'

Author: danecando

.eslintrc

@@ -0,0 +1,8 @@
+{
+  "rules": {
+    "quotes": [2, "single"]
+  },
+  "env": {
+    "node": true
+  }
+}

.gitignore

@@ -30,4 +30,8 @@ node_modules
 .lock-wscript
 
 # Webstorm
-.idea
+.idea
+
+npm-debug.log
+
+.DS_Store

README.md

@@ -1,4 +1,4 @@
-## hapi-sequelized - a plugin for using sequelize with hapi
+## hapi-sequelized - a hapi plugin for the sequelize orm
 
 [![Build Status](https://travis-ci.org/danecando/hapi-sequelized.svg)](https://travis-ci.org/danecando/hapi-sequelized)
 [![npm](https://img.shields.io/npm/dm/localeval.svg)](https://www.npmjs.com/package/hapi-sequelized)
@@ -9,56 +9,98 @@
 ### Installation
 npm install --save hapi-sequelized
 
-### Setup
-See http://hapijs.com/tutorials/plugins if you're not sure how hapi plugins work but here is an example:
+### Loading the plugin
+See http://hapijs.com/tutorials/plugins     
 
 ```javascript
 server.register(
     [
         {
             register: require('hapi-sequelized'),
             options: {
-                models: 'models',
-                database: 'dbname',
+                database: 'dbName',
                 user: 'root',
                 pass: 'root',
-                port: 8889
+                dialect: 'mysql',
+                port: 8889,
+                models: 'models/**/*.js',
+                sequelize: {
+                    define: {
+                        underscoredAll: true
+                    }
+                }
             }
-        }
+        },
     ], function(err) {
         if (err) {
-            console.log('failed to load plugin');
+            console.error('failed to load plugin');
         }
     }
 );
 ```
 
 ### Available Options
+
 ```javascript
 options: {
-    host: 'localhost',  // db host
-    database: 'dbName', // name of your db
-    user: 'dbUser',     // db username
-    pass: 'dbPass',     // db password
+    database: 'dbName', // database name
+    user: 'root',       // db username
+    pass: 'root',       // db password
     dialect: 'mysql',   // database type
+    host: 'localhost',  // db host
     port: 8889,         // database port #
-    models: 'models',   // path to models directory from project root
-                        // or optionally use an array of multiple model folders,
-                        //e.g. ['features/products', 'features/customers']
-    defaults: { }       // see: http://sequelize.readthedocs.org/en/latest/docs/getting-started/#application-wide-model-options
+    models: ['models/**/*.js', 'other/models/*.js'],   // glob or an array of globs to directories containing your sequelize models
+    logging: false      // sql query logging
+    sequelize: {}       // Options object passed to the Sequelize constructor http://docs.sequelizejs.com/en/latest/api/sequelize/#new-sequelizedatabase-usernamenull-passwordnull-options
 }
 ```
 
 ### Usage
-Create your sequelize models in the models directory in the root of your hapi project. The plugin will automatically import all of your models and make them available throughout your application.
-
-Your models will be availble throughout your application via server.plugins (which is also available through the request object ie: request.server.plugins)
+Your models will be available throughout your application via server.plugins (which is also available through the request object ie: request.server.plugins)
 
 ```javascript
 var db = request.server.plugins['hapi-sequelized'].db;
 
-db.Test.create({
+db.User.create({
     email: '[email protected]',
-    password: 'alskfjdfoa'
+    password: 'password123'
 });
 ```
+
+### Model Definitions
+Exports a function that returns a model definition 
+http://docs.sequelizejs.com/en/latest/docs/models-definition/
+
+```javascript
+module.exports = function(sequelize, DataTypes) {
+    var StoreOptions = sequelize.define(
+        'StoreOptions',
+        {
+            optionName: {
+                type: DataTypes.STRING,
+                unique: true,
+                allowNull: false
+            },
+            optionValue: {
+                type: DataTypes.TEXT
+            }
+        },
+        {
+            tableName: 'store_config',
+            timestamps: false
+        }
+    );
+
+    return StoreOptions;
+};
+```
+
+### Syncing Models
+Creates all your tables and sets up your database
+
+```javascript
+var db = server.plugins['hapi-sequelized'].db;
+db.sequelize.sync().then(function() {
+  console.log('models synced');
+});
+```

index.js

@@ -1 +1 @@
-module.exports = require('./lib');
+module.exports = require('./lib');

lib/index.js

@@ -1,74 +1,51 @@
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
+var Hoek = require('hoek');
+var sqlizr = require('sqlizr');
 var Sequelize = require('sequelize');
 
 /**
- * Register sequelize as a Hapi plugin
+ * Creates database connection, imports models, and exposes them via the db object
  * @param plugin
  * @param options
  * @param next
  */
 exports.register = function(plugin, options, next) {
 
-    var db = {};
-    var dir = [];
-    Array.isArray(options.models) ? dir = options.models : dir.push(options.models);
+    // sequelize query output disabled in production
+    var logging = process.env.NODE_ENV === 'production' ? false : console.log;
 
-    dir.forEach(function(folder, index, arr) {
-        arr[index] = path.join(process.cwd(), folder);
-    });
-
-
-    var sequelize = new Sequelize(options.database, options.user, options.pass, {
+    var defaultOptions = {
         host: options.host || 'localhost',
         dialect: options.dialect || 'mysql',
         port: options.port || 3306,
-        storage: options.storage || '',
-        define: options.defaults || {}
-    });
-
-
-    //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) {
-            stats = fs.lstatSync(folder + '/' + fileName);
-
-            if (stats.isDirectory()) {
-                getJSModels(folder + '/' + fileName)
-            } else {
-                if(fileName.indexOf('.') !== 0) {
-                    var filePath = path.join(folder, fileName);
-                    var model = sequelize.import(filePath);
-                    db[model.name] = model;
-                }
-            }
-        });
-
+        logging: logging
     };
 
-    dir.forEach(function(folder) {
-        getJSModels(folder);
-    });
+    // apply top level plugin options to a full sequelize options object
+    var sequelizeOptions = Hoek.applyToDefaults(defaultOptions, options.sequelize || {});
+
+    var sequelize = new Sequelize(options.database, options.user, options.pass, sequelizeOptions);
 
-    Object.keys(db).forEach(function(modelName) {
-        if ("associate" in db[modelName]) {
-            db[modelName].associate(db);
-        }
-    });
+    // test the database connection
+    sequelize.authenticate()
+        .then(function() {
 
-    db.sequelize = sequelize;
-    db.Sequelize = Sequelize;
+            // import models
+            var db = sqlizr(sequelize, options.models);
+            db.sequelize = sequelize;
+            db.Sequelize = Sequelize;
 
-    plugin.expose('db', db);
+            // make available in hapi application
+            plugin.expose('db', db);
 
-    next();
+            return next();
+        })
+        .catch(function(err) {
+            return next(err);
+        });
 };
 
 exports.register.attributes = {
     pkg: require('../package.json')
-};
+};

package.json

@@ -1,10 +1,11 @@
 {
   "name": "hapi-sequelized",
-  "version": "1.3.1",
-  "description": "A plugin for using sequlize with the hapi.js web framework",
+  "version": "2.0.0",
+  "description": "A hapi plugin for the sequelize ORM",
   "main": "index.js",
   "scripts": {
-    "test": "lab"
+    "test": "lab",
+    "lint": "eslint lib/*.js"
   },
   "repository": {
     "type": "git",
@@ -33,5 +34,9 @@
   },
   "peerDependencies": {
     "sequelize": "2.*"
+  },
+  "dependencies": {
+    "hoek": "^2.12.0",
+    "sqlizr": "^1.0.0"
   }
 }