Skip to content

Support Ember 1.0.0-beta.15 #64

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 18, 2015
Merged

Support Ember 1.0.0-beta.15 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Brocfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ if (env === 'production') {
'jquery.js',
'qunit.js',
'handlebars.js',
'ember.js',
'ember.debug.js',
'ember-data.js'
],
wrapInEval: true,
Expand Down
5 changes: 3 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
"tests"
],
"dependencies": {
"ember-data": "v1.0.0-beta.10",
"ember": "v1.7.0",
"ember-data": "v1.0.0-beta.15",
"ember": "v1.10.0",
"handlebars": "v2.0.0",
"loader.js": "stefanpenner/loader.js#1.0.1"
},
"devDependencies": {
Expand Down
11 changes: 8 additions & 3 deletions src/json-api-adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ DS.JsonApiAdapter = DS.RESTAdapter.extend({
createRecord: function(store, type, record) {
var data = {};

data[this.pathForType(type.typeKey)] = store.serializerFor(type.typeKey).serialize(record, {
var snapshot = record._createSnapshot();
data[this.pathForType(type.typeKey)] = store.serializerFor(type.typeKey).serialize(snapshot, {
includeId: true
});

Expand All @@ -72,7 +73,10 @@ DS.JsonApiAdapter = DS.RESTAdapter.extend({
*/
updateRecord: function(store, type, record) {
var data = {};
data[this.pathForType(type.typeKey)] = store.serializerFor(type.typeKey).serialize(record, {includeId: true});
var snapshot = record._createSnapshot();
data[this.pathForType(type.typeKey)] = store.serializerFor(type.typeKey).serialize(snapshot, {
includeId: true
});

var id = get(record, 'id');

Expand Down Expand Up @@ -126,7 +130,8 @@ DS.JsonApiAdapter = DS.RESTAdapter.extend({
*/
serializeIntoHash: function(data, type, record, options) {
var root = underscore(decamelize(type.typeKey));
data[root] = this.serialize(record, options);
var snapshot = record._createSnapshot();
data[root] = this.serialize(snapshot, options);
},

pathForType: function(type) {
Expand Down
20 changes: 13 additions & 7 deletions tests/integration/serializer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ test('serialize camelcase', function() {
});

var json = Ember.run(function(){
return env.serializer.serialize(tom);
var snapshot = tom._createSnapshot();
return env.serializer.serialize(snapshot);
});

deepEqual(json, {
Expand Down Expand Up @@ -114,8 +115,9 @@ test('serialize into snake_case', function() {
return Ember.String.decamelize(key);
};

var json = Ember.run(function(){
return env.serializer.serialize(tom);
var json = Ember.run(function() {
var snapshot = tom._createSnapshot();
return env.serializer.serialize(snapshot);
});

deepEqual(json, {
Expand All @@ -137,7 +139,8 @@ test('serializeIntoHash', function() {
id: '123'
});

env.serializer.serializeIntoHash(json, HomePlanet, league);
var snapshot = league._createSnapshot();
env.serializer.serializeIntoHash(json, HomePlanet, snapshot);
});

deepEqual(json, {
Expand All @@ -160,7 +163,8 @@ test('serializeIntoHash with decamelized types', function() {
id: '123'
});

env.serializer.serializeIntoHash(json, HomePlanet, league);
var snapshot = league._createSnapshot();
env.serializer.serializeIntoHash(json, HomePlanet, snapshot);
});

deepEqual(json, {
Expand Down Expand Up @@ -196,7 +200,8 @@ test('serialize has many relationships', function() {
});

var json = Ember.run(function(){
return env.serializer.serialize(drevil);
var snapshot = drevil._createSnapshot();
return env.serializer.serialize(snapshot);
});

deepEqual(json, {
Expand Down Expand Up @@ -224,7 +229,8 @@ test('serialize belongs to relationships', function() {
});

var json = Ember.run(function(){
return env.serializer.serialize(female);
var snapshot = female._createSnapshot();
return env.serializer.serialize(snapshot);
});

deepEqual(json, {
Expand Down