Merge pull request #2167 from LJ1102/chainable-hooks-1.7.x

Allow to chain hook definitions migrates lj1102/sequelize@dd0089105

lib/hooks.js

@@ -67,7 +67,7 @@ Hooks.runHooks = function() {
 
 
 // Alias for `.addHook`
 // Alias for `.addHook`
 Hooks.hook = function() {
 Hooks.hook = function() {
-  Hooks.addHook.apply(this, arguments)
+  return Hooks.addHook.apply(this, arguments)
 }
 }
 
 
 Hooks.addHook = function(hookType, name, fn) {
 Hooks.addHook = function(hookType, name, fn) {
@@ -86,68 +86,69 @@ Hooks.addHook = function(hookType, name, fn) {
   // Just in case if we override the default DAOFactory.options
   // Just in case if we override the default DAOFactory.options
   this.options.hooks[hookType] = this.options.hooks[hookType] || []
   this.options.hooks[hookType] = this.options.hooks[hookType] || []
   this.options.hooks[hookType][this.options.hooks[hookType].length] = !!name ? {name: name, fn: method} : method
   this.options.hooks[hookType][this.options.hooks[hookType].length] = !!name ? {name: name, fn: method} : method
+  return this;
 }
 }
 
 
 Hooks.beforeValidate = function(name, fn) {
 Hooks.beforeValidate = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeValidate', name, fn)
+  return Hooks.addHook.call(this, 'beforeValidate', name, fn)
 }
 }
 
 
 Hooks.afterValidate = function(name, fn) {
 Hooks.afterValidate = function(name, fn) {
-  Hooks.addHook.call(this, 'afterValidate', name, fn)
+  return Hooks.addHook.call(this, 'afterValidate', name, fn)
 }
 }
 
 
 Hooks.beforeCreate = function(name, fn) {
 Hooks.beforeCreate = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeCreate', name, fn)
+  return Hooks.addHook.call(this, 'beforeCreate', name, fn)
 }
 }
 
 
 Hooks.afterCreate = function(name, fn) {
 Hooks.afterCreate = function(name, fn) {
-  Hooks.addHook.call(this, 'afterCreate', name, fn)
+  return Hooks.addHook.call(this, 'afterCreate', name, fn)
 }
 }
 
 
 Hooks.beforeDestroy = function(name, fn) {
 Hooks.beforeDestroy = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeDestroy', name, fn)
+  return Hooks.addHook.call(this, 'beforeDestroy', name, fn)
 }
 }
 
 
 Hooks.afterDestroy = function(name, fn) {
 Hooks.afterDestroy = function(name, fn) {
-  Hooks.addHook.call(this, 'afterDestroy', name, fn)
+  return Hooks.addHook.call(this, 'afterDestroy', name, fn)
 }
 }
 
 
 Hooks.beforeDelete = function(name, fn) {
 Hooks.beforeDelete = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeDelete', name, fn)
+  return Hooks.addHook.call(this, 'beforeDelete', name, fn)
 }
 }
 
 
 Hooks.afterDelete = function(name, fn) {
 Hooks.afterDelete = function(name, fn) {
-  Hooks.addHook.call(this, 'afterDelete', name, fn)
+  return Hooks.addHook.call(this, 'afterDelete', name, fn)
 }
 }
 
 
 Hooks.beforeUpdate = function(name, fn) {
 Hooks.beforeUpdate = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeUpdate', name, fn)
+  return Hooks.addHook.call(this, 'beforeUpdate', name, fn)
 }
 }
 
 
 Hooks.afterUpdate = function(name, fn) {
 Hooks.afterUpdate = function(name, fn) {
-  Hooks.addHook.call(this, 'afterUpdate', name, fn)
+  return Hooks.addHook.call(this, 'afterUpdate', name, fn)
 }
 }
 
 
 Hooks.beforeBulkCreate = function(name, fn) {
 Hooks.beforeBulkCreate = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeBulkCreate', name, fn)
+  return Hooks.addHook.call(this, 'beforeBulkCreate', name, fn)
 }
 }
 
 
 Hooks.afterBulkCreate = function(name, fn) {
 Hooks.afterBulkCreate = function(name, fn) {
-  Hooks.addHook.call(this, 'afterBulkCreate', name, fn)
+  return Hooks.addHook.call(this, 'afterBulkCreate', name, fn)
 }
 }
 
 
 Hooks.beforeBulkDestroy = function(name, fn) {
 Hooks.beforeBulkDestroy = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeBulkDestroy', name, fn)
+  return Hooks.addHook.call(this, 'beforeBulkDestroy', name, fn)
 }
 }
 
 
 Hooks.afterBulkDestroy = function(name, fn) {
 Hooks.afterBulkDestroy = function(name, fn) {
-  Hooks.addHook.call(this, 'afterBulkDestroy', name, fn)
+  return Hooks.addHook.call(this, 'afterBulkDestroy', name, fn)
 }
 }
 
 
 Hooks.beforeBulkUpdate = function(name, fn) {
 Hooks.beforeBulkUpdate = function(name, fn) {
-  Hooks.addHook.call(this, 'beforeBulkUpdate', name, fn)
+  return Hooks.addHook.call(this, 'beforeBulkUpdate', name, fn)
 }
 }
 
 
 Hooks.afterBulkUpdate = function(name, fn) {
 Hooks.afterBulkUpdate = function(name, fn) {
-  Hooks.addHook.call(this, 'afterBulkUpdate', name, fn)
+  return Hooks.addHook.call(this, 'afterBulkUpdate', name, fn)
 }
 }