Base model now has a constructor that takes attributes and a toJSON that jsons them

adunkman · adunkman · commit 8935e57c1f47 · 2012-02-22T21:33:09.000-06:00
diff --git a/models/model.coffee b/models/model.coffee
@@ -1,10 +1,13 @@
 StoredObject = require '../data/storedObject'
 
 class Model extends StoredObject
+  constructor: (attributes) ->
+    @attributes = attributes || {}
+
   save: (collection, callback) ->
-    super collection, @toJSON(), callback
+    super(collection, @toJSON(), callback)
 
   toJSON: () ->
-    {}
+    JSON.parse(JSON.stringify(@attributes))
 
 module.exports = Model
diff --git a/test/models/model_test.coffee b/test/models/model_test.coffee
@@ -19,25 +19,41 @@ vows.describe('Base model (models/model)').addBatch(
   '': {
     topic: () -> getTopic()
 
-    'when toJSON() is called': {
-      topic: (instance) -> instance.toJSON()
+    'when toJSON() is called with no attributes': {
+      topic: (instance) -> 
+        instance.toJSON()
 
       'it should return an empty object': (jsonObject) ->
         jsonObject.should.eql({})
     }
 
+    'when toJSON() is called with attributes': {
+      topic: (instance) -> 
+        instance.attributes = { 'two': false }
+        instance.toJSON()
+
+      'it should return the attributes object': (jsonObject) ->
+        jsonObject.should.eql({ 'two': false })
+    }
+
     'when save() is called': {
       topic: (instance) -> 
+        instance.attributes = {
+          'one': true
+        }
         instance.save('testCollection', @callback)
       
       'it should call save() on the base stored object': (err, attributes) ->
         callCount.should.equal(1)
         args.should.have.length(1)
-      
-      'it should pass all arguments to the base object': (err, attributes) ->
+        
+      'it should pass model.attributes to the save()': (err, attributes) ->
+        args[0].should.have.length(3)
+        args[0][1].should.eql({ 'one': true })
+
+      'it should pass collection and callback to base object': (err, attributes) ->
         args[0].should.have.length(3)
         args[0][0].should.equal('testCollection')
-        args[0][1].should.eql({})
         args[0][2].should.equal(@callback)
     }
   }
