Renamed areChanged to didChange and added support for underscore in setter

lib/dao.js

@@ -87,7 +87,7 @@ module.exports = (function() {
   DAO.prototype.get = DAO.prototype.getDataValue
   DAO.prototype.get = DAO.prototype.getDataValue
 
 
   DAO.prototype.setDataValue = function(name, value) {
   DAO.prototype.setDataValue = function(name, value) {
-    if (Utils.areChanged(this.dataValues[name], value)) {
+    if (Utils.didChange(this.dataValues[name], value)) {
       this.isDirty = true
       this.isDirty = true
     }
     }
     this.dataValues[name] = value
     this.dataValues[name] = value
@@ -240,7 +240,7 @@ module.exports = (function() {
         (self.attributes.indexOf(attr) > -1)
         (self.attributes.indexOf(attr) > -1)
       )
       )
       if (updateAllowed) {
       if (updateAllowed) {
-        if (Utils.areChanged(self[attr], value)) {
+        if (Utils.didChange(self[attr], value)) {
           isDirty = true
           isDirty = true
         }
         }
         self[attr] = value
         self[attr] = value
@@ -346,9 +346,13 @@ module.exports = (function() {
     if (has !== true) {
     if (has !== true) {
       this.__defineGetter__(attribute, has.get || function()  { return this.dataValues[attribute]; });
       this.__defineGetter__(attribute, has.get || function()  { return this.dataValues[attribute]; });
       this.__defineSetter__(attribute, has.set || function(v) {
       this.__defineSetter__(attribute, has.set || function(v) {
-        if (Utils.areChanged(this.dataValues[attribute], v)) {
+        if (Utils.didChange(this.dataValues[attribute], v)) {
           //Only dirty the object if the change is not due to id, touchedAt, createdAt or updatedAt being initiated
           //Only dirty the object if the change is not due to id, touchedAt, createdAt or updatedAt being initiated
-          if (this.dataValues[attribute] || (attribute != 'id' && attribute != 'touchedAt' && attribute != 'createdAt' && attribute != 'updatedAt')) {
+          var updatedAtAttr = this.__options.underscored ? 'updated_at' : 'updatedAt'
+            , createdAtAttr = this.__options.underscored ? 'created_at' : 'createdAt'
+            , touchedAtAttr = this.__options.underscored ? 'touched_at' : 'touchedAt'
+
+          if (this.dataValues[attribute] || (attribute != 'id' && attribute != touchedAtAttr && attribute != createdAtAttr && attribute != updatedAtAttr)) {
             this.isDirty = true
             this.isDirty = true
           }
           }
         }
         }

lib/utils.js

@@ -252,7 +252,7 @@ var Utils = module.exports = {
   isHash: function(obj) {
   isHash: function(obj) {
     return Utils._.isObject(obj) && !Array.isArray(obj);
     return Utils._.isObject(obj) && !Array.isArray(obj);
   },
   },
-  areChanged: function(attrValue, value) {
+  didChange: function(attrValue, value) {
     //If attribute value is Date, check value as a date
     //If attribute value is Date, check value as a date
     if (Utils._.isDate(attrValue) && !Utils._.isDate(value)) {
     if (Utils._.isDate(attrValue) && !Utils._.isDate(value)) {
       value = new Date(value)
       value = new Date(value)
@@ -260,7 +260,7 @@ var Utils = module.exports = {
     if (Utils._.isDate(attrValue)) {
     if (Utils._.isDate(attrValue)) {
         return attrValue.valueOf() !== value.valueOf()
         return attrValue.valueOf() !== value.valueOf()
     }
     }
-    //If both are them are empty, don't set as changed
+    //If both of them are empty, don't set as changed
     if ((attrValue === undefined || attrValue === null || attrValue === '') && (value === undefined || value === null || value === '')) {
     if ((attrValue === undefined || attrValue === null || attrValue === '') && (value === undefined || value === null || value === '')) {
         return false
         return false
     }
     }