Skip to content

Commit

Permalink
Merge pull request #2936 from wecc/relationship-has-data
Browse files Browse the repository at this point in the history 
Introduce relationship.hasData
  • Loading branch information
@igorT
igorT committed Mar 25, 2015
2 parents e8ceeeb + a8c5c26 commit e463719
Show file tree
Hide file tree
Showing 4 changed files with 214 additions and 11 deletions.
7 changes: 6 additions & 1 deletion packages/ember-data/lib/system/relationships/state/relationship.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var Relationship = function(store, record, inverseKey, relationshipMeta) {
//multiple possible typeKeys
this.inverseKeyForImplicit = this.store.modelFor(this.record.constructor).typeKey + this.key;
this.linkPromise = null;
this.hasData = false;
};

Relationship.prototype = {
Expand Down Expand Up @@ -230,7 +231,11 @@ Relationship.prototype = {
},

notifyRecordRelationshipAdded: Ember.K,
notifyRecordRelationshipRemoved: Ember.K
notifyRecordRelationshipRemoved: Ember.K,

setHasData: function() {
this.hasData = true;
}
};


Expand Down
16 changes: 10 additions & 6 deletions packages/ember-data/lib/system/store.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,10 @@ Store = Service.extend({
// Set the properties specified on the record.
record.setProperties(properties);

record.eachRelationship(function(key, descriptor) {
record._relationships[key].setHasData(true);
});

return record;
},

Expand Down Expand Up @@ -2059,13 +2063,13 @@ function setupRelationships(store, record, data) {
relationship.updateLink(data.links[key]);
}

if (kind === 'belongsTo') {
if (value === undefined) {
return;
if (value !== undefined) {
if (kind === 'belongsTo') {
relationship.setCanonicalRecord(value);
} else if (kind === 'hasMany') {
relationship.updateRecordsFromAdapter(value);
}
relationship.setCanonicalRecord(value);
} else if (kind === 'hasMany' && value) {
relationship.updateRecordsFromAdapter(value);
relationship.setHasData(true);
}
});
}
Expand Down
106 changes: 103 additions & 3 deletions packages/ember-data/tests/integration/relationships/belongs-to-test.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var env, store, User, Message, Post, Contact, Comment, Book, Author, NewMessage;
var env, store, User, Message, Post, Contact, Comment, Book, Chapter, Author, NewMessage;
var get = Ember.get;
var run = Ember.run;

Expand Down Expand Up @@ -47,11 +47,18 @@ module("integration/relationship/belongs_to Belongs-To Relationships", {

Book = DS.Model.extend({
name: attr('string'),
author: belongsTo('author')
author: belongsTo('author'),
chapters: hasMany('chapters')
});

Chapter = DS.Model.extend({
title: attr('string'),
belongsTo: belongsTo('book')
});

Author = DS.Model.extend({
name: attr('string')
name: attr('string'),
books: hasMany('books')
});

env = setupStore({
Expand All @@ -60,6 +67,7 @@ module("integration/relationship/belongs_to Belongs-To Relationships", {
comment: Comment,
message: Message,
book: Book,
chapter: Chapter,
author: Author
});

Expand Down Expand Up @@ -580,3 +588,95 @@ test("Passing a model as type to belongsTo should not work", function () {
});
}, /The first argument to DS.belongsTo must be a string/);
});

test("belongsTo hasData async loaded", function () {
expect(1);

Book.reopen({
author: belongsTo('author', { async: true })
});

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, name: 'The Greatest Book', author: 2 });
};

run(function() {
store.find('book', 1).then(function(book) {
var relationship = book._relationships['author'];
equal(relationship.hasData, true, 'relationship has data');
});
});
});

test("belongsTo hasData sync loaded", function () {
expect(1);

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, name: 'The Greatest Book', author: 2 });
};

run(function() {
store.find('book', 1).then(function(book) {
var relationship = book._relationships['author'];
equal(relationship.hasData, true, 'relationship has data');
});
});
});

test("belongsTo hasData async not loaded", function () {
expect(1);

Book.reopen({
author: belongsTo('author', { async: true })
});

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, name: 'The Greatest Book', links: { author: 'author' } });
};

run(function() {
store.find('book', 1).then(function(book) {
var relationship = book._relationships['author'];
equal(relationship.hasData, false, 'relationship does not have data');
});
});
});

test("belongsTo hasData sync not loaded", function () {
expect(1);

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, name: 'The Greatest Book' });
};

run(function() {
store.find('book', 1).then(function(book) {
var relationship = book._relationships['author'];
equal(relationship.hasData, false, 'relationship does not have data');
});
});
});

test("belongsTo hasData async created", function () {
expect(1);

Book.reopen({
author: belongsTo('author', { async: true })
});

run(function() {
var book = store.createRecord('book', { name: 'The Greatest Book' });
var relationship = book._relationships['author'];
equal(relationship.hasData, true, 'relationship has data');
});
});

test("belongsTo hasData sync created", function () {
expect(1);

run(function() {
var book = store.createRecord('book', { name: 'The Greatest Book' });
var relationship = book._relationships['author'];
equal(relationship.hasData, true, 'relationship has data');
});
});
96 changes: 95 additions & 1 deletion packages/ember-data/tests/integration/relationships/has-many-test.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var env, User, Contact, Email, Phone, Message, Post, Comment;
var env, store, User, Contact, Email, Phone, Message, Post, Comment;
var Book, Chapter, Page;
var get = Ember.get;
var resolve = Ember.RSVP.resolve;
Expand Down Expand Up @@ -80,6 +80,8 @@ module("integration/relationships/has_many - Has-Many Relationships", {
chapter: Chapter,
page: Page
});

store = env.store;
},

teardown: function() {
Expand Down Expand Up @@ -1312,3 +1314,95 @@ test("adding and removing records from hasMany relationship #2666", function() {
});
});
});

test("hasMany hasData async loaded", function () {
expect(1);

Chapter.reopen({
pages: hasMany('pages', { async: true })
});

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, title: 'The Story Begins', pages: [2, 3] });
};

run(function() {
store.find('chapter', 1).then(function(chapter) {
var relationship = chapter._relationships['pages'];
equal(relationship.hasData, true, 'relationship has data');
});
});
});

test("hasMany hasData sync loaded", function () {
expect(1);

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, title: 'The Story Begins', pages: [2, 3] });
};

run(function() {
store.find('chapter', 1).then(function(chapter) {
var relationship = chapter._relationships['pages'];
equal(relationship.hasData, true, 'relationship has data');
});
});
});

test("hasMany hasData async not loaded", function () {
expect(1);

Chapter.reopen({
pages: hasMany('pages', { async: true })
});

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, title: 'The Story Begins', links: { pages: 'pages' } });
};

run(function() {
store.find('chapter', 1).then(function(chapter) {
var relationship = chapter._relationships['pages'];
equal(relationship.hasData, false, 'relationship does not have data');
});
});
});

test("hasMany hasData sync not loaded", function () {
expect(1);

env.adapter.find = function(store, type, id, snapshot) {
return Ember.RSVP.resolve({ id: 1, title: 'The Story Begins' });
};

run(function() {
store.find('chapter', 1).then(function(chapter) {
var relationship = chapter._relationships['pages'];
equal(relationship.hasData, false, 'relationship does not have data');
});
});
});

test("hasMany hasData async created", function () {
expect(1);

Chapter.reopen({
pages: hasMany('pages', { async: true })
});

run(function() {
var chapter = store.createRecord('chapter', { title: 'The Story Begins' });
var relationship = chapter._relationships['pages'];
equal(relationship.hasData, true, 'relationship has data');
});
});

test("hasMany hasData sync created", function () {
expect(1);

run(function() {
var chapter = store.createRecord('chapter', { title: 'The Story Begins' });
var relationship = chapter._relationships['pages'];
equal(relationship.hasData, true, 'relationship has data');
});
});

0 comments on commit e463719

Please sign in to comment.