Make sure model property values are cached on initialize

varvet · Oct 21, 2013 · 6851840 · 6851840
1 parent aaf11ae
commit 6851840
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/model.coffee b/src/model.coffee
@@ -138,7 +138,7 @@ class Model
     for own name, value of attributes
       property = @[name + "_property"]
       if property
-        property.update(value)
+        property.initialize(value)
       else
         @[name] = value
 

diff --git a/src/property.coffee b/src/property.coffee
@@ -41,6 +41,10 @@ class PropertyAccessor
     @event = new Event(@object, @name + "_change", @definition.eventOptions)
     @_gcQueue = []
 
+  initialize: (value) ->
+    @update(value)
+    @_oldValue = value
+
   update: (value) ->
     if @definition.set
       @definition.set.call(@object, value)

diff --git a/test/model.spec.coffee b/test/model.spec.coffee
@@ -26,6 +26,12 @@ describe 'Serenade.Model', ->
       expect(nameTriggered).to.be.false
       expect(ageTriggered).to.be.false
 
+    it 'keeps track of constructor values for change events', ->
+      class Person extends Serenade.Model
+        @property "name"
+      john = new Person(name: 'John')
+      expect(-> john.name = 'Peter').to.triggerEvent(john.name_property, with: ["John", "Peter"])
+
   describe '.extend', ->
     it 'sets up prototypes correctly', ->
       Test = Serenade.Model.extend()