Merge remote-tracking branch 'origin/v3' into patch-trails-lib

fix merge conflicts.

Author: scott-wyatt

.travis.yml

@@ -1,9 +1,8 @@
 language: node_js
 node_js:
-- 4
-- 5
-- 6
 - 7
+- 8
+- 9
 
 notifications:
   email: false
@@ -21,4 +20,4 @@ deploy:
   on:
     tags: true
     repo: trailsjs/trailpack-sequelize
-    node: 7
+    node: 8

api/services/FootprintService.js

@@ -39,7 +39,7 @@ module.exports = class FootprintService extends Service {
    */
   create(modelName, values, options) {
     const Model = this._getModel(modelName)
-    const modelOptions = _.defaultsDeep({}, options, _.get(this.app.config, 'footprints.models.options'))
+    const modelOptions = _.defaultsDeep({}, options, this.app.config.get('footprints.models.options'))
     if (!Model) {
       return Promise.reject(new ModelError('E_NOT_FOUND', `${modelName} can't be found`))
     }

index.js

@@ -91,17 +91,17 @@ module.exports = class SequelizeTrailpack extends Trailpack {
 
   async migrate() {
     const SchemaMigrationService = this.app.services.SchemaMigrationService
-    const database = this.app.config.database
+    const migrate = this.app.config.get('database.models.migrate')
 
-    if (database.models.migrate === 'none') return
+    if (migrate === 'none') return
 
     return Promise.all(
       _.map(this.connections, connection => {
 
-        if (database.models.migrate === 'drop') {
+        if (migrate === 'drop') {
           return SchemaMigrationService.dropDB(connection)
         }
-        else if (database.models.migrate === 'alter') {
+        else if (migrate === 'alter') {
           return SchemaMigrationService.alterDB(connection)
         }
       })

lib/transformer.js

@@ -30,8 +30,8 @@ module.exports = {
         identity: modelName.toLowerCase(),
         globalId: modelName,
         tableName: config.tableName || modelName.toLowerCase(),
-        connection: config.store || dbConfig.models.defaultStore,
-        migrate: config.migrate || dbConfig.models.migrate,
+        connection: config.store || app.config.get('database.models.defaultStore'),
+        migrate: config.migrate || app.config.get('database.models.migrate'),
         config: config.options,
         schema: schema
       }
@@ -72,7 +72,7 @@ module.exports = {
    * Transform the Trails.js "stores" config into a Sequelize object
    */
   transformStores (app) {
-    const stores = this.pickStores(app.config.database.stores)
+    const stores = this.pickStores(app.config.get('database.stores'))
     const sequelize = {}
     Object.keys(stores).forEach(key => {
       sequelize[key] = this.createFromConfig(stores[key])

package.json

@@ -1,6 +1,6 @@
 {
   "name": "trailpack-sequelize",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Sequelize.js Trailpack http://sequelizejs.com",
   "homepage": "https://github.com/jaumard/trailpack-sequelize",
   "author": {
@@ -29,26 +29,29 @@
 
   ],
   "dependencies": {
-    "joi": "^10.6.0",
+    "joi": "^12.0.0",
     "lodash": "^4.17.4",
-    "sequelize": "^4.3.1",
-    "snyk": "^1.36.2",
-    "trailpack": "^3"
+    "trailpack": "^3",
+    "sequelize": "^4.23.0",
+    "snyk": "^1.50.0",
   },
   "devDependencies": {
-    "eslint": "^4.2.0",
+    "eslint": "^4.11.0",
     "eslint-config-trails": "^3.0.0",
-    "mocha": "^3.4.2",
+    "mocha": "^4.0.1",
     "pre-commit": "^1.2.2",
     "smokesignals": "^3",
-    "sqlite3": "^3.1.8",
     "trails": "^3"
+    "sqlite3": "^3.1.13",
+  },
+  "peerDependencies": {
+    "trails": "3.x"
   },
   "scripts": {
     "test": "eslint --fix . && mocha"
   },
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 7.0.0"
   },
   "eslintConfig": {
     "extends": "trails"

test/lib/sequelize.callbacks.test.js

@@ -24,7 +24,11 @@ describe('lib.Transformer.SequelizeCallbacks', () => {
   describe('#afterCreate', () => {
     it('should create a record with afterCreate attribute set', () => {
       //FootprintService.destroy('ModelCallbacks',{})
-      return FootprintService.create('ModelCallbacks', {name: 'trails_afterCreate', beforeValidate: 0, afterCreate: 0})
+      return FootprintService.create('ModelCallbacks', {
+        name: 'trails_afterCreate',
+        beforeValidate: 0,
+        afterCreate: 0
+      })
         .then(record => {
           assert.equal(record.afterCreate, 1)
         })
@@ -40,13 +44,13 @@ describe('lib.Transformer.SequelizeCallbacks', () => {
         .then(record => {
           return FootprintService.update(
             'ModelCallbacks',
-            {name: 'trails_beforeUpdate'},
-            {name: 'trails_UpdatedBefore', beforeValidate: 0, beforeUpdate: 0}
+            { name: 'trails_beforeUpdate' },
+            { name: 'trails_UpdatedBefore', beforeValidate: 0, beforeUpdate: 0 }
           )
         })
         .then(records => {
           assert.equal(records[0], 1)
-          return FootprintService.find('ModelCallbacks', {name: 'trails_UpdatedBefore'})
+          return FootprintService.find('ModelCallbacks', { name: 'trails_UpdatedBefore' })
         })
         .then(records => {
           assert.equal(records[0].beforeUpdate, 1)
@@ -55,17 +59,17 @@ describe('lib.Transformer.SequelizeCallbacks', () => {
   })
   describe('#afterUpdate', () => {
     it.skip('afterUpdate should be called', () => {
-      return FootprintService.create('ModelCallbacks', {name: 'trails_afterUpdate', beforeValidate: 0})
+      return FootprintService.create('ModelCallbacks', { name: 'trails_afterUpdate', beforeValidate: 0 })
         .then(record => {
           return FootprintService.update(
             'ModelCallbacks',
-            {name: 'trails_afterUpdate'},
-            {name: 'trails_UpdatedAfter', beforeValidate: 0, afterUpdate: 0}
+            { name: 'trails_afterUpdate' },
+            { name: 'trails_UpdatedAfter', beforeValidate: 0, afterUpdate: 0 }
           )
         })
         .then(results => {
           assert.equal(results[0], 1)
-          return FootprintService.find('ModelCallbacks', {name: 'trails_UpdatedAfter'})
+          return FootprintService.find('ModelCallbacks', { name: 'trails_UpdatedAfter' })
         })
         .then(records => {
           assert.equal(records[0].afterUpdate, 1)
@@ -74,7 +78,7 @@ describe('lib.Transformer.SequelizeCallbacks', () => {
   })
   describe('#beforeValidate', () => {
     it('should create a record with a beforeValidate attribute', () => {
-      return FootprintService.create('ModelCallbacks', {name: 'trails_beforeCreate', beforeValidate: 0})
+      return FootprintService.create('ModelCallbacks', { name: 'trails_beforeCreate', beforeValidate: 0 })
         .then(record => {
           assert.equal(record.beforeValidate, 1)
         })
@@ -94,12 +98,12 @@ describe('lib.Transformer.SequelizeCallbacks', () => {
   })
   describe('#beforeDestroy', () => {
     it('should call the beforeDestroy callback and continue', () => {
-      return FootprintService.create('ModelCallbacks', {name: 'trails_beforeDestroy', beforeValidate: 0})
+      return FootprintService.create('ModelCallbacks', { name: 'trails_beforeDestroy', beforeValidate: 0 })
         .then(record => {
-          return FootprintService.destroy('ModelCallbacks', {name: 'trails_beforeDestroy'})
+          return FootprintService.destroy('ModelCallbacks', { name: 'trails_beforeDestroy' })
         })
         .then(records => {
-          return FootprintService.find('ModelCallbacks', {name: 'trails_beforeDestroy'})
+          return FootprintService.find('ModelCallbacks', { name: 'trails_beforeDestroy' })
         })
         .then(records => {
           assert.equal(records.length, 0)
@@ -108,12 +112,12 @@ describe('lib.Transformer.SequelizeCallbacks', () => {
   })
   describe('#afterDestroy', () => {
     it('should call the afterDestroy callback and continue', () => {
-      return FootprintService.create('ModelCallbacks', {name: 'trails_afterDestroy', beforeValidate: 0})
+      return FootprintService.create('ModelCallbacks', { name: 'trails_afterDestroy', beforeValidate: 0 })
         .then(record => {
-          return FootprintService.destroy('ModelCallbacks', {name: 'trails_afterDestroy'})
+          return FootprintService.destroy('ModelCallbacks', { name: 'trails_afterDestroy' })
         })
         .then(records => {
-          return FootprintService.find('ModelCallbacks', {name: 'trails_afterDestroy'})
+          return FootprintService.find('ModelCallbacks', { name: 'trails_afterDestroy' })
         })
         .then(records => {
           assert.equal(records.length, 0)

test/services/FootprintService.test.js

@@ -34,9 +34,9 @@ describe('api.services.FootprintService', () => {
       return FootprintService.create('User', {roles: [{name: 'roleTest'}]}, {populate: 'roles'})
         .catch(err => {
           assert.equal(err.code, 'E_VALIDATION')
-          assert.equal(err.message, 'notNull Violation: name cannot be null')
+          assert.equal(err.message, 'notNull Violation: User.name cannot be null')
           assert.equal(err.errors[0].path, 'name')
-          assert.equal(err.errors[0].message, 'name cannot be null')
+          assert.equal(err.errors[0].message, 'User.name cannot be null')
           assert.equal(err.errors[0].type, 'notNull Violation')
           assert.equal(err.name, 'Model error')
         })