better "scoping" for options attribute

lib/sequelize/model.js

@@ -7,21 +7,21 @@ var Model = module.exports = function(values, options) {
 
 
   this.definition = null // will be set in Model.build
   this.definition = null // will be set in Model.build
   this.attributes = []
   this.attributes = []
-  this.options = options || {}
+  this.__options = options || {}
 
 
   // add all passed values to the model and store the attribute names in this.attributes
   // add all passed values to the model and store the attribute names in this.attributes
   Utils._.map(values, function(value, key) { self.addAttribute(key, value) })
   Utils._.map(values, function(value, key) { self.addAttribute(key, value) })
 
 
   // set id to null if not passed as value
   // set id to null if not passed as value
   // a newly created model has no id
   // a newly created model has no id
-  var defaults = this.options.hasPrimaryKeys ? {} : { id: null }
+  var defaults = this.__options.hasPrimaryKeys ? {} : { id: null }
 
 
-  if(this.options.timestamps) {
-    defaults[this.options.underscored ? 'created_at' : 'createdAt'] = new Date()
-    defaults[this.options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
+  if(this.__options.timestamps) {
+    defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
+    defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
 
 
-    if(this.options.paranoid)
-      defaults[this.options.underscored ? 'deleted_at' : 'deletedAt'] = null
+    if(this.__options.paranoid)
+      defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
   }
   }
 
 
   Utils._.map(defaults, function(value, attr) {
   Utils._.map(defaults, function(value, attr) {
@@ -52,7 +52,7 @@ Model.prototype.query = function() {
 }
 }
 
 
 Model.prototype.save = function() {
 Model.prototype.save = function() {
-  var attr = this.options.underscored ? 'updated_at' : 'updatedAt'
+  var attr = this.__options.underscored ? 'updated_at' : 'updatedAt'
 
 
   if(this.hasOwnProperty(attr))
   if(this.hasOwnProperty(attr))
     this[attr] = new Date()
     this[attr] = new Date()
@@ -69,7 +69,7 @@ Model.prototype.save = function() {
     })
     })
     return eventEmitter.run()
     return eventEmitter.run()
   } else {
   } else {
-    var identifier = this.options.hasPrimaryKeys ? this.primaryKeyValues : this.id
+    var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
     return this.query(QueryGenerator.updateQuery(this.definition.tableName, this.values, identifier))
     return this.query(QueryGenerator.updateQuery(this.definition.tableName, this.values, identifier))
   }
   }
 }
 }
@@ -95,11 +95,11 @@ Model.prototype.updateAttributes = function(updates) {
 }
 }
 
 
 Model.prototype.destroy = function() {
 Model.prototype.destroy = function() {
-  if(this.options.timestamps && this.options.paranoid) {
-    this[this.options.underscored ? 'deleted_at' : 'deletedAt'] = new Date()
+  if(this.__options.timestamps && this.__options.paranoid) {
+    this[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = new Date()
     return this.save()
     return this.save()
   } else {
   } else {
-    var identifier = this.options.hasPrimaryKeys ? this.primaryKeyValues : this.id
+    var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
     return this.query(QueryGenerator.deleteQuery(this.definition.tableName, identifier))
     return this.query(QueryGenerator.deleteQuery(this.definition.tableName, identifier))
   }
   }
 }
 }
@@ -120,8 +120,8 @@ Model.prototype.__defineGetter__("identifiers", function() {
 })
 })
 
 
 Model.prototype.__defineGetter__('isDeleted', function() {
 Model.prototype.__defineGetter__('isDeleted', function() {
-  var result = this.options.timestamps && this.options.paranoid
-  result = result && this[this.options.underscored ? 'deleted_at' : 'deletedAt'] != null
+  var result = this.__options.timestamps && this.__options.paranoid
+  result = result && this[this.__options.underscored ? 'deleted_at' : 'deletedAt'] != null
 
 
   return result
   return result
 })
 })