instanceMethods and classMethods inherit global options (fix #304)

lib/sequelize.js

@@ -90,10 +90,18 @@ module.exports = (function() {
 
   Sequelize.prototype.define = function(daoName, attributes, options) {
     options = options || {}
-    if(this.options.define) {
-      options = Utils._.extend({}, this.options.define, options)
+    var globalOptions = this.options
+
+    if(globalOptions.define) {
+      options = Utils._.extend({}, globalOptions.define, options)
+      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
+        if(globalOptions.define[key]) {
+          options[key] = options[key] || {}
+          Utils._.extend(options[key], globalOptions.define[key])
+        }
+      })
     }
-    options.omitNull = this.options.omitNull
+    options.omitNull = globalOptions.omitNull
 
     var factory = new DAOFactory(daoName, attributes, options)
     this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))

spec-jasmine/sequelize.spec.js

@@ -46,6 +46,23 @@ describe('Sequelize', function() {
       var DAO = sequelize.define('foo', {bar: Sequelize.STRING}, {collate: 'utf8_bin'})
       expect(DAO.options.collate).toEqual('utf8_bin')
     })
+
+    it("inherits global classMethods and instanceMethods", function() {
+      setup({
+        define: {
+          classMethods : { globalClassMethod : function() {} },
+          instanceMethods : { globalInstanceMethod : function() {} }
+        }
+      })
+
+      var DAO = sequelize.define('foo', {bar: Sequelize.STRING}, {
+        classMethods : { localClassMethod : function() {} }
+      })
+
+      expect(typeof DAO.options.classMethods.globalClassMethod).toEqual('function')
+      expect(typeof DAO.options.classMethods.localClassMethod).toEqual('function')
+      expect(typeof DAO.options.instanceMethods.globalInstanceMethod).toEqual('function')
+    })
   })
 
   describe('sync', function() {