Skip to content

Ember data beta 9 wraps the payload in a 'data' object. don't do this #32

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

Open
bmac wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ember data beta 9 wraps the payload in a 'data' object. don't do this #32

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
43 changes: 29 additions & 14 deletions ember-data-sails-adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,26 @@ DS.SailsRESTAdapter = DS.RESTAdapter.extend({
pathForType: function(type) {
var camelized = Ember.String.camelize(type);
return Ember.String.singularize(camelized);
},

createRecord: function(store, type, record) {
var data = {};
var serializer = store.serializerFor(type.typeKey);

serializer.serializeIntoHash(data, type, record, { includeId: true });

return this.ajax(this.buildURL(type.typeKey, null, record), "POST", data);
},

updateRecord: function(store, type, record) {
var data = {};
var serializer = store.serializerFor(type.typeKey);

serializer.serializeIntoHash(data, type, record);

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

return this.ajax(this.buildURL(type.typeKey, id, record), "PUT", data);
}
});

Expand Down Expand Up @@ -78,10 +98,13 @@ DS.SailsSocketAdapter = DS.SailsAdapter = DS.SailsRESTAdapter.extend({
method = method.toLowerCase();
var adapter = this;
adapter._log(method, url, data);
if(method !== 'get')
if(method !== 'get') {
this.checkCSRF(data);
}

return new RSVP.Promise(function(resolve, reject) {
io.socket[method](url, data, function (data) {
console.log('data', data);
if (isErrorObject(data)) {
adapter._log('error:', data);
if (data.errors) {
Expand Down Expand Up @@ -117,19 +140,11 @@ DS.SailsSocketAdapter = DS.SailsAdapter = DS.SailsRESTAdapter.extend({
function pushMessage(message) {
var type = store.modelFor(socketModel);
var serializer = store.serializerFor(type.typeKey);
// Messages from 'created' don't seem to be wrapped correctly,
// however messages from 'updated' are, so need to double check here.
if(!(model in message.data)) {
var obj = {};
obj[model] = message.data;
message.data = obj;
}
var record = serializer.extractSingle(store, type, message.data);
// If the id is not present in the record, get it from the message
if (!record[socketModel].id) {
record[socketModel].id = message.id;
}
store.push(socketModel, record[socketModel]);

var payload = $.extend({}, message.data.data);
payload.id = message.id;
var record = serializer.extractSingle(store, type, payload);
store.push(socketModel, record);
}

function destroy(message) {
Expand Down