ember-data-factory-guy 0.3.4 → 0.3.5

data/README.md

@@ -142,10 +142,10 @@ Let's say you have a few models like these:
   FactoryGuy.define('hat', {
     default: {},
     small_hat: {
-      type: 'small_hat'
+      type: 'SmallHat'
     },
     big_hat: {
-      type: 'big_hat'
+      type: 'BigHat'
     }
   })
 ```
@@ -207,7 +207,7 @@ var user = store.makeFixture('admin'); // user.toJSON() = {id: 5, name: 'Admin',
 var user = store.makeFixture('admin', {name: 'Fred'}); // user.toJSON() = {id: 6, name: 'Fred', type: 'superuser'}
 ```
 
-###### associations
+###### Associations
 
 ``` javascript
 // setting models on the hasMany association
@@ -224,7 +224,7 @@ var project = store.makeFixture('project', {user: user});
 // user.get('projects.firstObject.user') == user;
 ```
 
-###### polymorphic hasMany associations
+###### Polymorphic hasMany associations
 
 ```javascript
 // setting polymorphic models on the (polymorphic) hasMany association
@@ -240,12 +240,17 @@ var user = store.makeFixture('user', {hats: [sh, bh]})
 // setting belongTo association on polymorphic model
 var user = store.makeFixture('user');
 store.makeFixture('big_hat', {user: user});
-// user.get('hats.length') == 1;
+store.makeFixture('small_hat', {user: user});
+
+// will get you the same results, since FactoryGuy makes sure the associations
+// are created in both directions, even for polymorphic associations.
+// user.get('hats.length') == 2;
 // (user.get('hats.firstObject') instanceof BigHat) == true
+// (user.get('hats.lastObject') instanceof SmallHat) == true
 
 ```
 
-###### create lists
+###### Create lists
 
 ```javascript
 var users = store.makeList('user', 3);

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-factory-guy",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/dist/ember-data-factory-guy.js

@@ -535,7 +535,7 @@ DS.Store.reopen({
 
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = model.get(name);
-        if (belongsToRecord) {
+        var setAssociation = function() {
           var hasManyName = self.findHasManyRelationshipName(
             belongsToRecord.constructor,
             model
@@ -544,6 +544,16 @@ DS.Store.reopen({
             belongsToRecord.get(hasManyName).addObject(model);
           }
         }
+        if (belongsToRecord) {
+          if (belongsToRecord.then) {
+            belongsToRecord.then(function(record) {
+              belongsToRecord = record;
+              setAssociation();
+            })
+          } else {
+            setAssociation();
+          }
+        }
       }
     })
   },

data/dist/ember-data-factory-guy.min.js

@@ -1 +1 @@
-Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};function MissingSequenceError(message){this.toString=function(){return message}}ModelDefinition=function(model,config){var sequences={};var defaultAttributes={};var namedModels={};var modelId=1;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.merge=function(config){};this.generate=function(sequenceName){var sequence=sequences[sequenceName];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts){var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,opts);for(attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}if(!fixture.id){fixture.id=modelId++}return fixture};this.buildList=function(name,number,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts))}return arr};this.reset=function(){modelId=1;for(name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(typeof sequenceFn!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},generate:function(sequenceName){return function(){return this.generate(sequenceName)}},association:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(name,opts){var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts)},buildList:function(name,number,opts){var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,opts)},resetModels:function(store){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];definition.reset();try{var modelType=store.modelFor(definition.model);if(store.usingFixtureAdapter()){modelType.FIXTURES=[]}store.unloadAll(modelType)}catch(e){}}},pushFixture:function(modelClass,fixture){if(!modelClass["FIXTURES"]){modelClass["FIXTURES"]=[]}modelClass["FIXTURES"].push(fixture);return fixture},clear:function(opts){if(!opts){this.modelDefinitions={}}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var store=this;var model;Em.run(function(){store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore()}model=store.push(modelName,fixture);store.setAssociationsForRESTAdapter(modelType,modelName,model)});return model}},makeList:function(name,number,options){var arr=[];for(var i=0;i<number;i++){arr.push(this.makeFixture(name,options))}return arr},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){if(fixture[relationship.key]){fixture[relationship.key].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(relationship.type);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=fixture.id})}}if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(belongsToRecord){if(typeof belongsToRecord=="object"){FactoryGuy.pushFixture(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord.id}var hasManyName=self.findHasManyRelationshipNameForFixtureAdapter(relationship.type,relationship.parentType);var belongsToFixtures=adapter.fixturesForType(relationship.type);var belongsTofixture=adapter.findFixtureById(belongsToFixtures,fixture[relationship.key]);if(!belongsTofixture[hasManyName]){belongsTofixture[hasManyName]=[]}belongsTofixture[hasManyName].push(fixture.id)}}})},findEmbeddedBelongsToAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){child.set(modelName,model)})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var hasManyName=self.findHasManyRelationshipName(belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model)}}}})},findHasManyRelationshipName:function(belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&childModel instanceof relationship.type){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipNameForFixtureAdapter:function(belongToModelType,childModelType){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}});DS.FixtureAdapter.reopen({createRecord:function(store,type,record){var promise=this._super(store,type,record);promise.then(function(){var relationShips=Ember.get(type,"relationshipNames");if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){var belongsToRecord=record.get(relationship);if(belongsToRecord){var hasManyName=store.findHasManyRelationshipName(belongsToRecord.constructor,record);belongsToRecord.get(hasManyName).addObject(record)}})}});return promise}});FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},handleCreate:function(name,opts){var model=FactoryGuy.lookupModelForFixtureName(name);this.stubEndpointForHttpRequest("/"+Em.String.pluralize(model),this.buildAjaxCreateResponse(name,opts),{type:"POST"})},buildAjaxCreateResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var model=FactoryGuy.lookupModelForFixtureName(name);var hash={};hash[model]=fixture;return hash},handleUpdate:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT"})},handleDelete:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE"})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});
+Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};function MissingSequenceError(message){this.toString=function(){return message}}ModelDefinition=function(model,config){var sequences={};var defaultAttributes={};var namedModels={};var modelId=1;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.merge=function(config){};this.generate=function(sequenceName){var sequence=sequences[sequenceName];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts){var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,opts);for(attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}if(!fixture.id){fixture.id=modelId++}return fixture};this.buildList=function(name,number,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts))}return arr};this.reset=function(){modelId=1;for(name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(typeof sequenceFn!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},generate:function(sequenceName){return function(){return this.generate(sequenceName)}},association:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(name,opts){var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts)},buildList:function(name,number,opts){var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,opts)},resetModels:function(store){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];definition.reset();try{var modelType=store.modelFor(definition.model);if(store.usingFixtureAdapter()){modelType.FIXTURES=[]}store.unloadAll(modelType)}catch(e){}}},pushFixture:function(modelClass,fixture){if(!modelClass["FIXTURES"]){modelClass["FIXTURES"]=[]}modelClass["FIXTURES"].push(fixture);return fixture},clear:function(opts){if(!opts){this.modelDefinitions={}}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var store=this;var model;Em.run(function(){store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore()}model=store.push(modelName,fixture);store.setAssociationsForRESTAdapter(modelType,modelName,model)});return model}},makeList:function(name,number,options){var arr=[];for(var i=0;i<number;i++){arr.push(this.makeFixture(name,options))}return arr},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){if(fixture[relationship.key]){fixture[relationship.key].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(relationship.type);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=fixture.id})}}if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(belongsToRecord){if(typeof belongsToRecord=="object"){FactoryGuy.pushFixture(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord.id}var hasManyName=self.findHasManyRelationshipNameForFixtureAdapter(relationship.type,relationship.parentType);var belongsToFixtures=adapter.fixturesForType(relationship.type);var belongsTofixture=adapter.findFixtureById(belongsToFixtures,fixture[relationship.key]);if(!belongsTofixture[hasManyName]){belongsTofixture[hasManyName]=[]}belongsTofixture[hasManyName].push(fixture.id)}}})},findEmbeddedBelongsToAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){child.set(modelName,model)})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);var setAssociation=function(){var hasManyName=self.findHasManyRelationshipName(belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model)}};if(belongsToRecord){if(belongsToRecord.then){belongsToRecord.then(function(record){belongsToRecord=record;setAssociation()})}else{setAssociation()}}}})},findHasManyRelationshipName:function(belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&childModel instanceof relationship.type){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipNameForFixtureAdapter:function(belongToModelType,childModelType){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}});DS.FixtureAdapter.reopen({createRecord:function(store,type,record){var promise=this._super(store,type,record);promise.then(function(){var relationShips=Ember.get(type,"relationshipNames");if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){var belongsToRecord=record.get(relationship);if(belongsToRecord){var hasManyName=store.findHasManyRelationshipName(belongsToRecord.constructor,record);belongsToRecord.get(hasManyName).addObject(record)}})}});return promise}});FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},handleCreate:function(name,opts){var model=FactoryGuy.lookupModelForFixtureName(name);this.stubEndpointForHttpRequest("/"+Em.String.pluralize(model),this.buildAjaxCreateResponse(name,opts),{type:"POST"})},buildAjaxCreateResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var model=FactoryGuy.lookupModelForFixtureName(name);var hash={};hash[model]=fixture;return hash},handleUpdate:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT"})},handleDelete:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE"})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});

data/ember-data-factory-guy.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "ember-data-factory-guy"
-  s.version     = "0.3.4"
+  s.version     = "0.3.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Sudol", "Alex Opak"]
   s.email       = ["dansudol@yahoo.com", "opak.alexandr@gmail.com"]

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-factory-guy",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/store.js

@@ -177,7 +177,7 @@ DS.Store.reopen({
 
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = model.get(name);
-        if (belongsToRecord) {
+        var setAssociation = function() {
           var hasManyName = self.findHasManyRelationshipName(
             belongsToRecord.constructor,
             model
@@ -186,6 +186,16 @@ DS.Store.reopen({
             belongsToRecord.get(hasManyName).addObject(model);
           }
         }
+        if (belongsToRecord) {
+          if (belongsToRecord.then) {
+            belongsToRecord.then(function(record) {
+              belongsToRecord = record;
+              setAssociation();
+            })
+          } else {
+            setAssociation();
+          }
+        }
       }
     })
   },

data/tests/active_model_adapter_factory_test.js

@@ -95,32 +95,57 @@ test("when belongTo parent is assigned, parent adds to polymorphic hasMany recor
 
 
 test("when hasMany associations assigned, belongTo parent is assigned", function() {
-  var p1 = store.makeFixture('project');
-  var user = store.makeFixture('user', {projects: [p1]})
+  var project = store.makeFixture('project');
+  var user = store.makeFixture('user', {projects: [project]})
+
+  deepEqual(project.get('user'), user);
+});
+
+
+asyncTest("when asnyc hasMany associations assigned, belongTo parent is assigned", function() {
+  var user = store.makeFixture('user');
+  var company = store.makeFixture('company', {users: [user]});
 
-  deepEqual(p1.get('user').toJSON(), user.toJSON());
+  user.get('company').then(function(c){
+    equal(c, company);
+    start();
+  })
 });
 
 
 test("when belongTo parent is assigned, parent adds to hasMany records", function() {
   var user = store.makeFixture('user');
-  store.makeFixture('project', {user: user});
-  store.makeFixture('project', {user: user});
+  var project1 = store.makeFixture('project', {user: user});
+  var project2 = store.makeFixture('project', {user: user});
 
   equal(user.get('projects.length'), 2);
+  equal(user.get('projects.firstObject'), project1);
+  equal(user.get('projects.lastObject'), project2);
+});
+
+
+asyncTest("when async belongsTo parent is assigned, parent adds to hasMany records", function() {
+  var company = store.makeFixture('company');
+  var user1 = store.makeFixture('user', {company: company});
+  var user2 = store.makeFixture('user', {company: company});
+
+  equal(company.get('users.length'), 2);
+  equal(company.get('users.firstObject'), user1);
+  equal(company.get('users.lastObject'), user2);
+  start();
 });
 
 
 test("belongsTo associations defined as attributes in fixture", function() {
   var project = store.makeFixture('project_with_user');
   equal(project.get('user') instanceof User, true)
-  deepEqual(project.get('user').toJSON(),{name: 'User1'})
+  deepEqual(project.get('user').toJSON(),{name: 'User1', company: null})
 
   var project = store.makeFixture('project_with_dude');
-  deepEqual(project.get('user').toJSON(),{name: 'Dude'})
+  deepEqual(project.get('user').toJSON(),{name: 'Dude', company: null})
 
   var project = store.makeFixture('project_with_admin');
-  deepEqual(project.get('user').toJSON(),{name: 'Admin'})
+  deepEqual(project.get('user').toJSON(),{name: 'Admin', company: null})
 })
 
 

data/tests/rest_adapter_factory_test.js

@@ -104,32 +104,57 @@ test("when belongTo parent is assigned, parent adds to polymorphic hasMany recor
 
 
 test("when hasMany associations assigned, belongTo parent is assigned", function() {
-  var p1 = store.makeFixture('project');
-  var user = store.makeFixture('user', {projects: [p1]})
+  var project = store.makeFixture('project');
+  var user = store.makeFixture('user', {projects: [project]})
+
+  deepEqual(project.get('user'), user);
+});
+
+
+asyncTest("when asnyc hasMany associations assigned, belongTo parent is assigned", function() {
+  var user = store.makeFixture('user');
+  var company = store.makeFixture('company', {users: [user]});
 
-  deepEqual(p1.get('user').toJSON(), user.toJSON());
+  user.get('company').then(function(c){
+    equal(c, company)
+    start()
+  })
 });
 
 
 test("when belongTo parent is assigned, parent adds to hasMany records", function() {
   var user = store.makeFixture('user');
-  store.makeFixture('project', {user: user});
-  store.makeFixture('project', {user: user});
+  var project1 = store.makeFixture('project', {user: user});
+  var project2 = store.makeFixture('project', {user: user});
 
   equal(user.get('projects.length'), 2);
+  equal(user.get('projects.firstObject'), project1)
+  equal(user.get('projects.lastObject'), project2)
+});
+
+
+asyncTest("when async belongsTo parent is assigned, parent adds to hasMany records", function() {
+  var company = store.makeFixture('company');
+  var user1 = store.makeFixture('user', {company: company});
+  var user2 = store.makeFixture('user', {company: company});
+
+  equal(company.get('users.length'), 2);
+  equal(company.get('users.firstObject'), user1)
+  equal(company.get('users.lastObject'), user2)
+  start()
 });
 
 
 test("belongsTo associations defined as attributes in fixture", function() {
   var project = store.makeFixture('project_with_user');
   equal(project.get('user') instanceof User, true)
-  deepEqual(project.get('user').toJSON(),{name: 'User1'})
+  deepEqual(project.get('user').toJSON(),{name: 'User1', company: null})
 
   var project = store.makeFixture('project_with_dude');
-  deepEqual(project.get('user').toJSON(),{name: 'Dude'})
+  deepEqual(project.get('user').toJSON(),{name: 'Dude', company: null})
 
   var project = store.makeFixture('project_with_admin');
-  deepEqual(project.get('user').toJSON(),{name: 'Admin'})
+  deepEqual(project.get('user').toJSON(),{name: 'Admin', company: null})
 })
 
 module('DS.Store#makeList with DS.RESTAdapter', {

data/tests/support/factories/company_factory.js

@@ -0,0 +1,5 @@
+FactoryGuy.define('company', {
+  default: {
+    name: 'Silly corp'
+  }
+})

data/tests/support/models/company.js

@@ -0,0 +1,4 @@
+Company = DS.Model.extend({
+  name: DS.attr('string'),
+  users: DS.hasMany('user', {async: true})
+})

data/tests/support/models/user.js

@@ -1,5 +1,6 @@
 User = DS.Model.extend({
   name:     DS.attr('string'),
+  company: DS.belongsTo('company', {async: true}),
   projects: DS.hasMany('project'),
   hats: DS.hasMany('hat', {polymorphic: true})
 })

data/tests/support/test_helper.js

@@ -13,6 +13,7 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
     container.register("model:small_hat", SmallHat);
     container.register("model:big_hat", BigHat);
     container.register("model:user", User);
+    container.register("model:company", Company);
     container.register("model:project", Project);
     container.register("store:main", DS.Store.extend({adapter: adapter}));
     container.register("serializer:-default", DS.RESTSerializer);

data/tests/test_setup.js

@@ -1,3 +1,8 @@
+FactoryGuy.define('company', {
+  default: {
+    name: 'Silly corp'
+  }
+})
 FactoryGuy.define('hat', {
   default: {},
   small_hat: {
@@ -34,6 +39,11 @@ FactoryGuy.define('user', {
     name: 'Admin'
   }
 });
+Company = DS.Model.extend({
+  name: DS.attr('string'),
+  users: DS.hasMany('user', {async: true})
+})
+
 Hat = DS.Model.extend({
   type: DS.attr('string'),
   user: DS.belongsTo('user'),
@@ -52,6 +62,7 @@ Project = DS.Model.extend({
 
 User = DS.Model.extend({
   name:     DS.attr('string'),
+  company: DS.belongsTo('company', {async: true}),
   projects: DS.hasMany('project'),
   hats: DS.hasMany('hat', {polymorphic: true})
 })

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -535,7 +535,7 @@ DS.Store.reopen({
 
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = model.get(name);
-        if (belongsToRecord) {
+        var setAssociation = function() {
           var hasManyName = self.findHasManyRelationshipName(
             belongsToRecord.constructor,
             model
@@ -544,6 +544,16 @@ DS.Store.reopen({
             belongsToRecord.get(hasManyName).addObject(model);
           }
         }
+        if (belongsToRecord) {
+          if (belongsToRecord.then) {
+            belongsToRecord.then(function(record) {
+              belongsToRecord = record;
+              setAssociation();
+            })
+          } else {
+            setAssociation();
+          }
+        }
       }
     })
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 +03:00
+date: 2014-05-29 00:00:00.000000000 -04:00
 default_executable: 
 dependencies: []
 description: Easily create Fixtures for Ember Data
@@ -44,10 +44,12 @@ files:
 - tests/index.html
 - tests/rest_adapter_factory_test.js
 - tests/store_test.js
+- tests/support/factories/company_factory.js
 - tests/support/factories/hat_factory.js
 - tests/support/factories/project_factory.js
 - tests/support/factories/user_factory.js
 - tests/support/libs/sinon.js
+- tests/support/models/company.js
 - tests/support/models/hat.js
 - tests/support/models/project.js
 - tests/support/models/user.js