refactored instance methods of sequelize

lib/sequelize.js

@@ -25,71 +25,68 @@ var Sequelize = module.exports = function(database, username, password, options)
   this.modelManager = new ModelManager(this)
   this.connectorManager = new ConnectorManager(this, this.config)
 }
+
 Sequelize.Utils = Utils
+Sequelize.Utils._.map(DataTypes, function(sql, accessor) { Sequelize[accessor] = sql})
 
-var instanceMethods = {
-  define: function(modelName, attributes, options) {
-    options = options || {}
+Sequelize.prototype.define = function(modelName, attributes, options) {
+  options = options || {}
 
-    if(this.options.define)
-      options = Sequelize.Utils.merge(options, this.options.define)
+  if(this.options.define)
+    options = Sequelize.Utils.merge(options, this.options.define)
 
-    var model = this.modelManager.addModel(new ModelFactory(modelName, attributes, options))
+  var model = this.modelManager.addModel(new ModelFactory(modelName, attributes, options))
 
-    return model
-  },
+  return model
+}
 
-  import: function(path) {
-    var defineCall = require(path)
-    return defineCall(this, DataTypes)
-  },
+Sequelize.prototype.import = function(path) {
+  var defineCall = require(path)
+  return defineCall(this, DataTypes)
+}
 
-  query: function(sql, callee, options) {
-    options = options || {}
+Sequelize.prototype.query = function(sql, callee, options) {
+  options = options || {}
 
-    if(this.options.query)
-      options = Sequelize.Utils.merge(options, this.options.query)
+  if(this.options.query)
+    options = Sequelize.Utils.merge(options, this.options.query)
 
-    options.logging = this.options.hasOwnProperty('logging') ? this.options.logging : true
+  options.logging = this.options.hasOwnProperty('logging') ? this.options.logging : true
 
-    return this.connectorManager.query(sql, callee, options)
-  },
+  return this.connectorManager.query(sql, callee, options)
+}
 
-  sync: function(options) {
-    options = options || {}
+Sequelize.prototype.sync = function(options) {
+  options = options || {}
 
-    if(this.options.sync)
-      options = Sequelize.Utils.merge(options, this.options.sync)
+  if(this.options.sync)
+    options = Sequelize.Utils.merge(options, this.options.sync)
 
-    var self = this
-    var eventEmitter = new Utils.CustomEventEmitter(function() {
-      var chainer = new Utils.QueryChainer
+  var self = this
+  var eventEmitter = new Utils.CustomEventEmitter(function() {
+    var chainer = new Utils.QueryChainer
 
-      self.modelManager.models.forEach(function(model) { chainer.add(model.sync(options)) })
+    self.modelManager.models.forEach(function(model) { chainer.add(model.sync(options)) })
 
-      chainer
-        .run()
-        .on('success', function() { eventEmitter.emit('success', null) })
-        .on('failure', function(err) { eventEmitter.emit('failure', err) })
-    })
-    return eventEmitter.run()
-  },
+    chainer
+      .run()
+      .on('success', function() { eventEmitter.emit('success', null) })
+      .on('failure', function(err) { eventEmitter.emit('failure', err) })
+  })
+  return eventEmitter.run()
+}
 
-  drop: function() {
-    var self = this
+Sequelize.prototype.drop = function() {
+  var self = this
 
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer
+  return new Utils.CustomEventEmitter(function(emitter) {
+    var chainer = new Utils.QueryChainer
 
-      self.modelManager.models.forEach(function(model) { chainer.add(model.drop()) })
+    self.modelManager.models.forEach(function(model) { chainer.add(model.drop()) })
 
-      chainer
-        .run()
-        .on('success', function() { emitter.emit('success', null) })
-        .on('failure', function(err) { emitter.emit('failure', err) })
-    }).run()
-  }
+    chainer
+      .run()
+      .on('success', function() { emitter.emit('success', null) })
+      .on('failure', function(err) { emitter.emit('failure', err) })
+  }).run()
 }
-
-Sequelize.Utils._.map(DataTypes, function(sql, accessor) { Sequelize[accessor] = sql})
-Sequelize.Utils._.map(instanceMethods, function(fct, name) { Sequelize.prototype[name] = fct})