Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes serializedRecord on undefined belongsTo relationship #57

Merged
merged 4 commits into from
May 1, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
5 changes: 5 additions & 0 deletions dist/emberfire.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/emberfire.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
5 changes: 5 additions & 0 deletions src/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 8 additions & 0 deletions test/tests/adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down