Fix accessing model attributes directly.

nilbus · Feb 5, 2015 · 9ae29b7 · 9ae29b7
1 parent 776714b
commit 9ae29b7
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/backbone.dualstorage.amd.js b/backbone.dualstorage.amd.js
diff --git a/backbone.dualstorage.coffee b/backbone.dualstorage.coffee
@@ -212,7 +212,12 @@ localsync = (method, model, options) ->
           store.clean(model, 'dirty')
         else
           store.clean(model, 'destroyed')
-  response = response.attributes if response?.attributes
+
+  if response
+    if response.toJSON
+      response = response.toJSON(options)
+    if response.attributes
+      response = response.attributes
 
   unless options.ignoreCallbacks
     if response

diff --git a/backbone.dualstorage.js b/backbone.dualstorage.js
diff --git a/spec/backbone.dualstorage.js b/spec/backbone.dualstorage.js
diff --git a/spec/localsync_spec.coffee b/spec/localsync_spec.coffee
@@ -147,7 +147,7 @@ describe 'localsync', ->
         localsync 'create', model, {success: ((resp) -> response = resp)}
       waitsFor (-> response), "A callback should have been called with a response", 100
       runs ->
-        expect(response).toBe model.attributes
+        expect(response).toEqual model.attributes
 
     it 'ignores callbacks when the ignoreCallbacks option is set', ->
       {start, callback} = {start: new Date().getTime()}

diff --git a/spec/localsync_spec.js b/spec/localsync_spec.js