Custom dataType updates

ampersand-state.js

@@ -101,7 +101,7 @@ _.extend(Base.prototype, BBEvents, {
         var extraProperties = this.extraProperties;
         var triggers = [];
         var changing, changes, newType, newVal, def, cast, err, attr,
-            attrs, dataType, silent, unset, currentVal, initial, hasChanged, isEqual;
+            attrs, dataType, silent, unset, currentVal, initial, hasChanged, isEqual, onSet;
 
         // Handle both `"key", value` and `{key: value}` -style arguments.
         if (_.isObject(key) || key === null) {
@@ -156,11 +156,12 @@ _.extend(Base.prototype, BBEvents, {
             }
 
             isEqual = this._getCompareForType(def.type);
+            onSet = this._getOnSetForType(def.type);
             dataType = this._dataTypes[def.type];
 
             // check type if we have one
             if (dataType && dataType.set) {
-                cast = dataType.set(newVal);
+                cast = dataType.set.call(this, newVal, options);
                 newVal = cast.val;
                 newType = cast.type;
             }
@@ -202,6 +203,7 @@ _.extend(Base.prototype, BBEvents, {
             if (hasChanged) {
                 changes.push({prev: currentVal, val: newVal, key: attr});
                 self._changed[attr] = newVal;
+                onSet(newVal,currentVal, attr);
             } else {
                 delete self._changed[attr];
             }
@@ -335,6 +337,12 @@ _.extend(Base.prototype, BBEvents, {
         return _.isEqual;
     },
 
+    _getOnSetForType : function(type){
+        var dataType = this._dataTypes[type];
+        if (dataType && dataType.onSet) return _.bind(dataType.onSet, this);
+        return _.noop;
+    },
+
     // Run validation against the next complete set of model attributes,
     // returning `true` if all is well. Otherwise, fire an `"invalid"` event.
     _validate: function (attrs, options) {
@@ -667,22 +675,21 @@ var dataTypes = {
                 };
             }
         },
-        compare: function (currentVal, newVal, attributeName) {
-            var isSame = currentVal === newVal;
+        compare: function (currentVal, newVal) {
+            return currentVal === newVal;
+        },
 
+        onSet : function(newVal, currentVal, attributeName){
             // if this has changed we want to also handle
             // event propagation
-            if (!isSame) {
-                if (currentVal) {
-                    this.stopListening(currentVal);
-                }
 
-                if (newVal != null) {
-                    this.listenTo(newVal, 'all', this._getEventBubblingHandler(attributeName));
-                }
+            if (currentVal) {
+                this.stopListening(currentVal);
             }
 
-            return isSame;
+            if (newVal != null) {
+                this.listenTo(newVal, 'all', this._getEventBubblingHandler(attributeName));
+            }
         }
     }
 };

test/full.js

@@ -1579,19 +1579,19 @@ test('#118 setOnce can be used with default string', function (t) {
 
     t.throws(function () {
         tr.timezone = 'new thing';
-    }, 'since it has a default, this should throw'); 
-    
+    }, 'since it has a default, this should throw');
+
 
     var tr2;
 
     t.doesNotThrow(function () {
         tr2 = new TimeRange({timezone: 'my thing'});
     }, 'if we set on init, should overwrite default');
-    
+
     t.throws(function () {
-        tr.timezone = 'new thing';  
-    }, 'should now fail since its been set'); 
-    
+        tr.timezone = 'new thing';
+    }, 'should now fail since its been set');
+
     var OtherTimeRange = State.extend({
         props: {
             timezone: {
@@ -1605,11 +1605,50 @@ test('#118 setOnce can be used with default string', function (t) {
 
     t.doesNotThrow(function () {
         tr.timezone = 'thing';
-    }, 'should not throw first time'); 
+    }, 'should not throw first time');
 
     t.throws(function () {
         tr.timezone = 'other thing';
     }, 'throws second time');
 
     t.end();
 });
+
+test("#112 - should not set up events on child state if setOnce check fails", function(t){
+    var Person = State.extend({
+        props : {
+            birthday : {
+                type : 'state',
+                setOnce : true
+            }
+        }
+    });
+
+    var Birthday = State.extend({
+        props : {
+            day : 'date'
+        }
+    });
+    var p = new Person();
+    var bday = new Birthday({day : new Date()});
+    p.once('change:birthday', function() {
+        t.pass('birthday can change once');
+    });
+    p.birthday = bday;
+    var newBday = new Birthday({day : new Date()});
+    t.throws(function() {
+        p.birthday = newBday;
+
+    }, TypeError, 'Throws error on change of setOnce');
+
+    p.on('change:birthday.day', function() {
+        t.fail('should not trigger change event on old one');
+    });
+
+    newBday.day = new Date(1);
+
+
+    t.end();
+
+
+});