Merge pull request #57 from brancusi/master

Removes serializedRecord on undefined belongsTo relationship
FirebaseExtended · May 1, 2014 · 91e880c · 91e880c
2 parents f477f6d + 644d2f2
commit 91e880c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # EmberFire Changelog
 
+### EmberFire 1.0.9 (April 30, 2014)
+
+* `updateRecord` now removes serializedRecord on undefined/null belongsTo relationships
+
 ### EmberFire 1.0.8 (April 18, 2014)
 
 * `_getSerializedRecord` now correctly serializes hasMany relationships

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "emberfire",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Firebase bindings for Ember Data",
   "main": ["./dist/emberfire.js"],
   "dependencies": {

diff --git a/dist/emberfire.js b/dist/emberfire.js
@@ -393,6 +393,11 @@
                   delete serializedRecord[key];
                 }
                 break;
+              case 'belongsTo':
+                if (typeof serializedRecord[key] === "undefined" || serializedRecord[key] === null || serializedRecord[key] === '') {
+                  delete serializedRecord[key];
+                }
+                break;
               default:
                 break;
             }

diff --git a/dist/emberfire.min.js b/dist/emberfire.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EmberFire",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "An officially supported Ember binding for Firebase.",
   "main": "dist/emberfire.js",
   "repository": {

diff --git a/src/data.js b/src/data.js
@@ -393,6 +393,11 @@
                   delete serializedRecord[key];
                 }
                 break;
+              case 'belongsTo':
+                if (typeof serializedRecord[key] === "undefined" || serializedRecord[key] === null || serializedRecord[key] === '') {
+                  delete serializedRecord[key];
+                }
+                break;
               default:
                 break;
             }

diff --git a/test/tests/adapter.js b/test/tests/adapter.js
@@ -294,6 +294,14 @@ describe("FirebaseAdapter", function() {
         assert(Ember.isNone(finalPayload.comments));
       });
 
+      it("contains a null belongsTo relationship", function() {
+        assert.equal(serializedRecord.user, null);
+      });
+
+      it("removed the null belongsTo reference from the final payload", function() {
+        assert(Ember.isNone(finalPayload.user));
+      });
+
       it("created the correct relationship Firebase reference", function() {
         var re = new RegExp(Ember.String.fmt("blogs/tests/adapter/updaterecord/normalized/posts/%@/comments/%@$", [newPost.id, newComment.id]), 'g');
         assert(relationshipRef.toString().match(re));