Stable Version 2.1.0.

Now requiring >= js-data 1.1.0 in order to use removeCircular.
js-data · Feb 5, 2015 · 945c80f · 945c80f
1 parent a834640
commit 945c80f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+##### 2.1.0 - 04 February 2015
+
+Now requiring >= js-data 1.1.0 in order to use removeCircular to safely safe cyclic objects
+
 ##### 2.0.0 - 03 February 2015
 
 _Note:_ Please see the [js-data CHANGELOG](https://github.com/js-data/js-data/blob/master/CHANGELOG.md).

diff --git a/bower.json b/bower.json
@@ -28,7 +28,7 @@
     "angular-mocks-1.3.2": "angular-mocks#1.3.2"
   },
   "dependencies": {
-    "js-data": ">=1.0.0",
+    "js-data": ">=1.1.0",
     "angular": ">=1.0.3"
   }
 }
diff --git a/dist/js-data-angular.js b/dist/js-data-angular.js
@@ -1,7 +1,7 @@
 /**
 * @author Jason Dobry <jason.dobry@gmail.com>
 * @file js-data-angular.js
-* @version 2.0.0 - Homepage <http://www.js-data.io/js-data-angular/>
+* @version 2.1.0 - Homepage <http://www.js-data.io/js-data-angular/>
 * @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>
 * @license MIT <https://github.com/js-data/js-data-angular/blob/master/LICENSE>
 *
@@ -464,6 +464,9 @@
             config.url += '/';
           }
           config.method = config.method.toUpperCase();
+          if (typeof config.data === 'object') {
+            config.data = DSUtils.removeCircular(config.data);
+          }
 
           function logResponse(data) {
             var str = start.toUTCString() + ' - ' + data.config.method.toUpperCase() + ' ' + data.config.url + ' - ' + data.status + ' ' + (new Date().getTime() - start.getTime()) + 'ms';

diff --git a/dist/js-data-angular.min.js b/dist/js-data-angular.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-angular",
   "description": "Angular wrapper for js-data.",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "homepage": "http://www.js-data.io/docs/js-data-angular",
   "repository": {
     "type": "git",
@@ -46,6 +46,6 @@
   },
   "dependencies": {
     "mout": "0.11.0",
-    "js-data": ">=1.0.0"
+    "js-data": ">=1.1.0"
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -454,6 +454,9 @@
             config.url += '/';
           }
           config.method = config.method.toUpperCase();
+          if (typeof config.data === 'object') {
+            config.data = DSUtils.removeCircular(config.data);
+          }
 
           function logResponse(data) {
             var str = start.toUTCString() + ' - ' + data.config.method.toUpperCase() + ' ' + data.config.url + ' - ' + data.status + ' ' + (new Date().getTime() - start.getTime()) + 'ms';

diff --git a/test/datastore/async_methods/save.test.js b/test/datastore/async_methods/save.test.js
@@ -118,9 +118,9 @@ describe('DS.save', function () {
     $rootScope.$apply();
 
     DS.save('post', 5, { cacheResponse: false }).then(function (post) {
-      assert.deepEqual(post, {
+      assert.deepEqual(DS.utils.toJson(post), DS.utils.toJson({
         random: 'stuff'
-      }, 'should have the right response');
+      }), 'should have the right response');
       assert.equal(lifecycle.beforeUpdate.callCount, 1, 'beforeUpdate should have been called');
       assert.equal(lifecycle.afterUpdate.callCount, 1, 'afterUpdate should have been called');
       assert.equal(lifecycle.beforeInject.callCount, 1, 'beforeInject should have been called only once');