updated to sequelize 3, removed redundant models on db object, updated readme and example

Author: danecando

README.md

@@ -51,17 +51,21 @@ options: {
     port: 8889,         // database port #
     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
+    sequelize: {       // Options object passed to the Sequelize constructor http://docs.sequelizejs.com/en/latest/api/sequelize/#new-sequelizedatabase-usernamenull-passwordnull-options
+        define: {
+            timestamps: false
+        }
+    }
 }
 ```
 
 ### Usage
-Your models will be available throughout your application via server.plugins (which is also available through the request object ie: request.server.plugins)
+Your models are attached to the sequelize instance and 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;
+var models = request.server.plugins['hapi-sequelized'].db.sequelize.models;
 
-db.User.create({
+models.User.create({
     email: '[email protected]',
     password: 'password123'
 });

example/server.js

@@ -8,11 +8,17 @@ 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) {
@@ -26,9 +32,9 @@ server.route({
     method: 'GET',
     path: '/',
     handler: function (request, reply) {
-        var db = request.server.plugins['hapi-sequelized'].db;
+        var models = request.server.plugins['hapi-sequelized'].db.sequelize.models;
 
-        db.Account.create({
+        models.Account.create({
             email: '[email protected]',
             firstName: 'John',
             lastName: 'Smith'

lib/index.js

@@ -33,9 +33,12 @@ exports.register = function(plugin, options, next) {
     sequelize.authenticate()
         .then(function() {
             // import models
-            var db = sqlizr(sequelize, options.models);
-            db.sequelize = sequelize;
-            db.Sequelize = Sequelize;
+            sqlizr(sequelize, options.models);
+
+            var db = {
+                sequelize: sequelize,
+                Sequelize: Sequelize
+            };
 
             // make available in hapi application
             plugin.expose('db', db);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hapi-sequelized",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "A hapi plugin for the sequelize ORM",
   "main": "index.js",
   "scripts": {
@@ -34,11 +34,11 @@
     "sqlite3": "^3.0.5"
   },
   "peerDependencies": {
-    "sequelize": "2.*"
+    "sequelize": "3.*"
   },
   "dependencies": {
     "hoek": "^2.12.0",
-    "sequelize": "^2.1.3",
+    "sequelize": "^3.0.0",
     "sqlizr": "^1.0.0"
   }
 }

test/index.js

@@ -67,8 +67,6 @@ describe('hapi-sequelized', function() {
                 var opt = server.plugins['hapi-sequelized'].db.sequelize.options;
                 var config = server.plugins['hapi-sequelized'].db.sequelize.config;
 
-                console.log(config.password);
-
                 // test all options in documentation
                 expect(opt.dialect).to.equal(options.dialect);
                 expect(opt.port).to.equal(options.port);