ember-data-factory-guy 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5bdae9f46c1972abb834e6dbc097e0c078d8e97
-  data.tar.gz: 6587a2575c0b315ebf1e03a1157e219f051e4e72
+  metadata.gz: 723e4f4e01224440a3e7cd0712f0db55a470ba1c
+  data.tar.gz: 280d62404418dfdafbf9b3c32ca5854e94522bce
 SHA512:
-  metadata.gz: 287ae58b03af66d6fde0256d692ce1b8ed7609487c5fa619f4fed997b980fe41eae3205aa1e97144bc643dc15f2e74b6a250721e1c097107d97af7b13fd67930
-  data.tar.gz: 29510c92fc6965cf66059895635de26153e14b818c9fd52f0974d06802091367ddb5cd625808632b70faac1578408a51901dd5ead3cedda9e846ec018eef9971
+  metadata.gz: 1e048aefde5b3bad5d160ea20781bfe83a9a8324df0b25990dec2d74a1a1b91e95dcd402a12bddc0c479fc20285df24d71e8783c9872889408abd2040f5e4383
+  data.tar.gz: 6a46a70429e37ff619f4427ff90c2cbdc7820bf4ea62926b797cb729cd2a2e07428738d511308e6246a632f63b463f1fc8bb78de36d7d75a07b296d3f3abfa54

data/.gitignore

@@ -5,4 +5,6 @@ factory_guy_presents/
 stats/
 *.gem
 *.ruby*
-.idea/*
+.idea/*
+*.iml
+.vagrant/*

data/bower.json

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

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

@@ -381,12 +381,6 @@ DS.Store.reopen({
     return adapter instanceof DS.FixtureAdapter;
   },
 
-  usingActiveModelSerializer: function () {
-    var adapter = this.adapterFor('application');
-    console.log('adapter.defaultSerializer', adapter.defaultSerializer)
-    return adapter.defaultSerializer == 'active-model';
-  },
-
   /**
    Make new fixture and save to store. If the store is using FixtureAdapter,
    will push to FIXTURE array, otherwise will use push method on adapter.
@@ -560,11 +554,17 @@ DS.Store.reopen({
             child.constructor,
             model
           );
-          if (relationship.options && relationship.options.inverse) {
-            belongsToName = relationship.options.inverse;
-          }
+          var hasManyName = self.findRelationshipName(
+            'hasMany',
+            child.constructor,
+            model
+          );
+          var inverseName = (relationship.options && relationship.options.inverse)
           if (belongsToName) {
-            child.set(belongsToName, model);
+            child.set(belongsToName || inverseName, model);
+          } else if (hasManyName) {
+            relation = child.get(hasManyName || inverseName) || [];
+            relation.pushObject(model)
           }
         })
       }
@@ -577,7 +577,7 @@ DS.Store.reopen({
               'hasMany',
               belongsToRecord.constructor,
               model
-            )
+            );
             if (hasManyName) {
               belongsToRecord.get(hasManyName).addObject(model);
               return;
@@ -586,7 +586,7 @@ DS.Store.reopen({
               'belongsTo',
               belongsToRecord.constructor,
               model
-            )
+            );
             // Guard against a situation where a model can belong to itself.
             // Do not want to set the belongsTo on this case.
             if (oneToOneName && !(belongsToRecord.constructor == model.constructor)) {
@@ -632,26 +632,6 @@ DS.Store.reopen({
     return relationshipName;
   },
 
-//  /**
-//   Adding the ability to check the serializer and convert the json before
-//   it's pushed. For the ActiveModelSerializer, the attributes should be snake case,
-//   for example.
-//
-//   @method push
-//   @param {String or subclass of DS.Model} type
-//   @param {Object} data
-//   @return {DS.Model} the record that was created or updated.
-//  */
-//  push: function(type, data, _partial) {
-//    var type = this.modelFor(type);
-//    var serializer = this.serializerFor(type.typeKey);
-//    console.log('serializer',serializer, serializer+'')
-////    if (this.usingActiveModelSerializer()) {
-////      var model = this.modelFor(modelName);
-////      FactoryGuy.pushFixture(model, payload);
-////    }
-//    this._super(type, data, _partial);
-//  },
 
   /**
    Adding a pushPayload for FixtureAdapter, but using the original with
@@ -714,27 +694,47 @@ 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.findRelationshipName(
-              'hasMany',
-              belongsToRecord.constructor,
-              record
-            );
-            belongsToRecord.get(hasManyName).addObject(record);
-          }
-        })
-      }
+      Em.RSVP.Promise.resolve(Ember.get(type, 'relationshipNames')).then(function (relationShips){
+        if (relationShips.belongsTo) {
+          relationShips.belongsTo.forEach(function (relationship) {
+            Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){
+              if (belongsToRecord) {
+                var hasManyName = store.findRelationshipName(
+                  'hasMany',
+                  belongsToRecord.constructor,
+                  record
+                );
+                Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then (function(relationship){
+                  relationship.addObject(record);
+                });
+              }
+            });
+          });
+        }
+        if (relationShips.hasMany) {
+          relationShips.hasMany.forEach(function (relationship) {
+            Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){
+              if (belongsToRecord && belongsToRecord.get('length') > 0) {
+                var hasManyName = store.findRelationshipName(
+                  'hasMany',
+                  belongsToRecord.constructor,
+                  record
+                );
+                belongsToRecord.forEach(function (child){
+                  child.get(hasManyName).addObject(record)
+                });
+              }
+            });
+          })
+        }
+      });
     });
 
     return promise;
   }
 })
+
 FactoryGuyTestMixin = Em.Mixin.create({
 
   // Pass in the app root, which typically is App.
@@ -770,6 +770,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
 
+  /**
+   Proxy to store's makeFixture method
+
+   @param {String} name name of fixture
+   @param {Object} options fixture options
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
   make: function (name, opts) {
     return this.getStore().makeFixture(name, opts);
   },
@@ -811,9 +818,9 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-   Build the json used for creating record
+   Build the json used for creating or finding a record.
 
-   @param {String} name of the fixture ( or model ) to create
+   @param {String} name of the fixture ( or model ) to create/find
    @param {Object} opts fixture options
    */
   buildAjaxHttpResponse: function (name, opts) {

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(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];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(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},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},usingActiveModelSerializer:function(){var adapter=this.adapterFor("application");console.log("adapter.defaultSerializer",adapter.defaultSerializer);return adapter.defaultSerializer=="active-model"},makeFixture:function(name,options){var store=this;var modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=store.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();modelType=store.modelFor(modelName)}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){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);if(relationship.options&&relationship.options.inverse){belongsToName=relationship.options.inverse}if(belongsToName){child.set(belongsToName,model)}})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var setAssociations=function(){var hasManyName=self.findRelationshipName("hasMany",belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model);return}var oneToOneName=self.findRelationshipName("belongsTo",belongsToRecord.constructor,model);if(oneToOneName&&!(belongsToRecord.constructor==model.constructor)){belongsToRecord.set(oneToOneName,model)}};if(belongsToRecord.then){belongsToRecord.then(function(record){belongsToRecord=record;setAssociations()})}else{setAssociations()}}}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind==kind&&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.findRelationshipName("hasMany",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},usingActiveModelSerializer:function(type){var store=this.getStore();var type=store.modelFor(type);var serializer=store.serializerFor(type.typeKey);return serializer instanceof DS.ActiveModelSerializer},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)},buildAjaxHttpResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var modelName=FactoryGuy.lookupModelForFixtureName(name);if(this.usingActiveModelSerializer(modelName)){this.toSnakeCase(fixture)}var hash={};hash[modelName]=fixture;return hash},toSnakeCase:function(fixture){for(key in fixture){if(key!=Em.String.decamelize(key)){var value=fixture[key];delete fixture[key];fixture[Em.String.decamelize(key)]=value}}},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url="/"+Em.String.pluralize(modelName)+"/"+id;this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200});return responseJson},handleCreate:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var url="/"+Em.String.pluralize(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT",status:status||200})},handleDelete:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE",status:status||200})},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(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];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(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},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 store=this;var modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=store.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();modelType=store.modelFor(modelName)}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){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);var hasManyName=self.findRelationshipName("hasMany",child.constructor,model);var inverseName=relationship.options&&relationship.options.inverse;if(belongsToName){child.set(belongsToName||inverseName,model)}else if(hasManyName){relation=child.get(hasManyName||inverseName)||[];relation.pushObject(model)}})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var setAssociations=function(){var hasManyName=self.findRelationshipName("hasMany",belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model);return}var oneToOneName=self.findRelationshipName("belongsTo",belongsToRecord.constructor,model);if(oneToOneName&&!(belongsToRecord.constructor==model.constructor)){belongsToRecord.set(oneToOneName,model)}};if(belongsToRecord.then){belongsToRecord.then(function(record){belongsToRecord=record;setAssociations()})}else{setAssociations()}}}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind==kind&&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(){Em.RSVP.Promise.resolve(Ember.get(type,"relationshipNames")).then(function(relationShips){if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then(function(relationship){relationship.addObject(record)})}})})}if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord&&belongsToRecord.get("length")>0){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);belongsToRecord.forEach(function(child){child.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},usingActiveModelSerializer:function(type){var store=this.getStore();var type=store.modelFor(type);var serializer=store.serializerFor(type.typeKey);return serializer instanceof DS.ActiveModelSerializer},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)},buildAjaxHttpResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var modelName=FactoryGuy.lookupModelForFixtureName(name);if(this.usingActiveModelSerializer(modelName)){this.toSnakeCase(fixture)}var hash={};hash[modelName]=fixture;return hash},toSnakeCase:function(fixture){for(key in fixture){if(key!=Em.String.decamelize(key)){var value=fixture[key];delete fixture[key];fixture[Em.String.decamelize(key)]=value}}},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url="/"+Em.String.pluralize(modelName)+"/"+id;this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200});return responseJson},handleCreate:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var url="/"+Em.String.pluralize(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT",status:status||200})},handleDelete:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE",status:status||200})},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.4.1"
+  s.version     = "0.4.2"
   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.4.1",
+  "version": "0.4.2",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/factory_guy_test_mixin.js

@@ -33,6 +33,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
 
+  /**
+   Proxy to store's makeFixture method
+
+   @param {String} name name of fixture
+   @param {Object} options fixture options
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
   make: function (name, opts) {
     return this.getStore().makeFixture(name, opts);
   },
@@ -74,9 +81,9 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-   Build the json used for creating record
+   Build the json used for creating or finding a record.
 
-   @param {String} name of the fixture ( or model ) to create
+   @param {String} name of the fixture ( or model ) to create/find
    @param {Object} opts fixture options
    */
   buildAjaxHttpResponse: function (name, opts) {

data/src/store.js

@@ -7,12 +7,6 @@ DS.Store.reopen({
     return adapter instanceof DS.FixtureAdapter;
   },
 
-  usingActiveModelSerializer: function () {
-    var adapter = this.adapterFor('application');
-    console.log('adapter.defaultSerializer', adapter.defaultSerializer)
-    return adapter.defaultSerializer == 'active-model';
-  },
-
   /**
    Make new fixture and save to store. If the store is using FixtureAdapter,
    will push to FIXTURE array, otherwise will use push method on adapter.
@@ -186,11 +180,17 @@ DS.Store.reopen({
             child.constructor,
             model
           );
-          if (relationship.options && relationship.options.inverse) {
-            belongsToName = relationship.options.inverse;
-          }
+          var hasManyName = self.findRelationshipName(
+            'hasMany',
+            child.constructor,
+            model
+          );
+          var inverseName = (relationship.options && relationship.options.inverse)
           if (belongsToName) {
-            child.set(belongsToName, model);
+            child.set(belongsToName || inverseName, model);
+          } else if (hasManyName) {
+            relation = child.get(hasManyName || inverseName) || [];
+            relation.pushObject(model)
           }
         })
       }
@@ -203,7 +203,7 @@ DS.Store.reopen({
               'hasMany',
               belongsToRecord.constructor,
               model
-            )
+            );
             if (hasManyName) {
               belongsToRecord.get(hasManyName).addObject(model);
               return;
@@ -212,7 +212,7 @@ DS.Store.reopen({
               'belongsTo',
               belongsToRecord.constructor,
               model
-            )
+            );
             // Guard against a situation where a model can belong to itself.
             // Do not want to set the belongsTo on this case.
             if (oneToOneName && !(belongsToRecord.constructor == model.constructor)) {
@@ -258,26 +258,6 @@ DS.Store.reopen({
     return relationshipName;
   },
 
-//  /**
-//   Adding the ability to check the serializer and convert the json before
-//   it's pushed. For the ActiveModelSerializer, the attributes should be snake case,
-//   for example.
-//
-//   @method push
-//   @param {String or subclass of DS.Model} type
-//   @param {Object} data
-//   @return {DS.Model} the record that was created or updated.
-//  */
-//  push: function(type, data, _partial) {
-//    var type = this.modelFor(type);
-//    var serializer = this.serializerFor(type.typeKey);
-//    console.log('serializer',serializer, serializer+'')
-////    if (this.usingActiveModelSerializer()) {
-////      var model = this.modelFor(modelName);
-////      FactoryGuy.pushFixture(model, payload);
-////    }
-//    this._super(type, data, _partial);
-//  },
 
   /**
    Adding a pushPayload for FixtureAdapter, but using the original with
@@ -340,24 +320,43 @@ 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.findRelationshipName(
-              'hasMany',
-              belongsToRecord.constructor,
-              record
-            );
-            belongsToRecord.get(hasManyName).addObject(record);
-          }
-        })
-      }
+      Em.RSVP.Promise.resolve(Ember.get(type, 'relationshipNames')).then(function (relationShips){
+        if (relationShips.belongsTo) {
+          relationShips.belongsTo.forEach(function (relationship) {
+            Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){
+              if (belongsToRecord) {
+                var hasManyName = store.findRelationshipName(
+                  'hasMany',
+                  belongsToRecord.constructor,
+                  record
+                );
+                Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then (function(relationship){
+                  relationship.addObject(record);
+                });
+              }
+            });
+          });
+        }
+        if (relationShips.hasMany) {
+          relationShips.hasMany.forEach(function (relationship) {
+            Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){
+              if (belongsToRecord && belongsToRecord.get('length') > 0) {
+                var hasManyName = store.findRelationshipName(
+                  'hasMany',
+                  belongsToRecord.constructor,
+                  record
+                );
+                belongsToRecord.forEach(function (child){
+                  child.get(hasManyName).addObject(record)
+                });
+              }
+            });
+          })
+        }
+      });
     });
 
     return promise;
   }
-})
+})

data/tests/active_model_adapter_factory_test.js

@@ -134,6 +134,18 @@ test("when belongTo parent is assigned, parent adds to polymorphic hasMany recor
 });
 
 
+asyncTest("when async hasMany relationship is assigned, model relationship is synced on both sides", function() {
+  var property = store.makeFixture('property');
+  var user1 = store.makeFixture('user', {properties: [property]});
+  var user2 = store.makeFixture('user', {properties: [property]});
+
+  equal(property.get('owners.length'), 2);
+  deepEqual(property.get('owners.firstObject').toJSON(), user1.toJSON());
+  deepEqual(property.get('owners.lastObject').toJSON(), user2.toJSON());
+  start();
+});
+
+
 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});
@@ -178,13 +190,13 @@ test("when belongTo parent is assigned, parent adds to belongsTo record", functi
 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', company: null})
+  deepEqual(project.get('user').toJSON(),{name: 'User1', company: null, properties: []})
 
   var project = store.makeFixture('project_with_dude');
-  deepEqual(project.get('user').toJSON(),{name: 'Dude', company: null})
+  deepEqual(project.get('user').toJSON(),{name: 'Dude', company: null, properties: []})
 
   var project = store.makeFixture('project_with_admin');
-  deepEqual(project.get('user').toJSON(),{name: 'Admin', company: null})
+  deepEqual(project.get('user').toJSON(),{name: 'Admin', company: null, properties: []})
 });
 
 
@@ -227,7 +239,7 @@ module('DS.Store with ActiveModelAdapter', {
 });
 
 
-asyncTest("#createRecord with mockjax handles model's camelCase attributes", function() {
+asyncTest("#createRecord (with mockjax) handles model's camelCase attributes", function() {
   testHelper.handleCreate('profile', {camelCaseDescription: 'description'})
 
   store.createRecord('profile').save().then(function(profile) {
@@ -237,7 +249,7 @@ asyncTest("#createRecord with mockjax handles model's camelCase attributes", fun
 });
 
 
-asyncTest("#find with mockjax handles camelCase attributes", function() {
+asyncTest("#find (with mockajax) handles model's camelCase attributes", function() {
   var responseJson = testHelper.handleFind('profile', {camelCaseDescription: 'description'})
   var id = responseJson.profile.id
 

data/tests/fixture_adapter_factory_test.js

@@ -138,9 +138,32 @@ asyncTest("#createRecord adds belongsTo association to records it hasMany of", f
     var projectJson = {title:'project', user: user};
 
     store.createRecord('project', projectJson).save()
-      .then( function() {
-        equal(user.get('projects.length'), 1);
+      .then( function(project) {
+        return Ember.RSVP.all([project.get('user'), user.get('projects')]);
+      }).then( function(promises) {
+        var projectUser = promises[0], projects = promises[1];
+        equal(projectUser.get('id'), user.get('id'));
+        equal(projects.get('length'), 1);
         start();
       });
   })
 })
+
+asyncTest("#createRecord adds hasMany association to records it hasMany of ", function() {
+  var usersJson = store.makeList('user', 3);
+
+  Em.RSVP.all([store.find('user', usersJson[0].id),store.find('user', usersJson[1].id),store.find('user', usersJson[2].id)]).then(function(users) {
+
+    var propertyJson = {name:'beach front property'};
+
+    property = store.createRecord('property', propertyJson);
+    property.get('owners').then(function(owners){
+      owners.addObjects(users);
+    }).then( function() {
+      return property.get('owners');
+    }).then( function(users) {
+      equal(users.get('length'), usersJson.length);
+      start();
+    });
+  })
+})

data/tests/rest_adapter_factory_test.js

@@ -129,10 +129,22 @@ test("when belongTo parent is assigned, parent adds to polymorphic hasMany recor
 });
 
 
+asyncTest("when async hasMany relationship is assigned, model relationship is synced on both sides", function() {
+  var property = store.makeFixture('property');
+  var user1 = store.makeFixture('user', {properties: [property]});
+  var user2 = store.makeFixture('user', {properties: [property]});
+
+  equal(property.get('owners.length'), 2);
+  deepEqual(property.get('owners.firstObject').toJSON(), user1.toJSON());
+  deepEqual(property.get('owners.lastObject').toJSON(), user2.toJSON());
+  start();
+});
+
+
 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});
+  var user1 = store.makeFixture('user');
+  var user2 = store.makeFixture('user');
+  var company = store.makeFixture('company', {users: [user1, user2]});
 
   equal(company.get('users.length'), 2);
   deepEqual(company.get('users.firstObject').toJSON(), user1.toJSON());
@@ -173,13 +185,13 @@ test("when belongTo parent is assigned, parent adds to belongsTo record", functi
 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', company: null})
+  deepEqual(project.get('user').toJSON(),{name: 'User1', company: null, properties: []})
 
   var project = store.makeFixture('project_with_dude');
-  deepEqual(project.get('user').toJSON(),{name: 'Dude', company: null})
+  deepEqual(project.get('user').toJSON(),{name: 'Dude', company: null, properties: []})
 
   var project = store.makeFixture('project_with_admin');
-  deepEqual(project.get('user').toJSON(),{name: 'Admin', company: null})
+  deepEqual(project.get('user').toJSON(),{name: 'Admin', company: null, properties: []})
 });
 
 

data/tests/support/factories/property_factory.js

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

data/tests/support/models/company.js

@@ -1,5 +1,5 @@
 Company = DS.Model.extend({
   name:    DS.attr('string'),
   profile: DS.belongsTo('profile'),
-  users:   DS.hasMany('user', {async: true})
+  users:   DS.hasMany('user', {async: true, inverse: 'company'})
 });

data/tests/support/models/property.js

@@ -0,0 +1,5 @@
+Property = DS.Model.extend({
+  name:     DS.attr('string'),
+  company:  DS.belongsTo('company', {async: true}),
+  owners:  DS.hasMany('user', {async: true, inverse: 'properties'})
+});

data/tests/support/models/user.js

@@ -1,7 +1,8 @@
 User = DS.Model.extend({
   name:     DS.attr('string'),
-  company:  DS.belongsTo('company', {async: true}),
-  projects: DS.hasMany('project'),
+  company:  DS.belongsTo('company', {async: true, inverse: 'users'}),
+  properties:  DS.hasMany('property', {async: true, inverse: 'owners'}),
+  projects:   DS.hasMany('project'),
   hats:     DS.hasMany('hat', {polymorphic: true})
 });
 

data/tests/support/test_helper.js

@@ -18,6 +18,7 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
     container.register("model:user", User);
     container.register("model:profile", Profile);
     container.register("model:company", Company);
+    container.register("model:property", Property);
     container.register("model:project", Project);
     container.register("store:main", DS.Store.extend({adapter: adapter}));
     if (adapter == DS.ActiveModelAdapter) {

data/tests/test_setup.js

@@ -45,6 +45,11 @@ FactoryGuy.define('project', {
     user: FactoryGuy.association('admin')
   }
 });
+FactoryGuy.define('property', {
+  default: {
+    name: 'Silly property'
+  }
+})
 FactoryGuy.define('user', {
   // default values for 'user' attributes
   default: {
@@ -58,7 +63,7 @@ FactoryGuy.define('user', {
 Company = DS.Model.extend({
   name:    DS.attr('string'),
   profile: DS.belongsTo('profile'),
-  users:   DS.hasMany('user', {async: true})
+  users:   DS.hasMany('user', {async: true, inverse: 'company'})
 });
 
 Hat = DS.Model.extend({
@@ -94,10 +99,16 @@ Project = DS.Model.extend({
   children: DS.hasMany('project', {inverse: 'parent'})
 });
 
-User = DS.Model.extend({
+Property = DS.Model.extend({
   name:     DS.attr('string'),
   company:  DS.belongsTo('company', {async: true}),
-  projects: DS.hasMany('project'),
+  owners:  DS.hasMany('user', {async: true, inverse: 'properties'})
+});
+User = DS.Model.extend({
+  name:     DS.attr('string'),
+  company:  DS.belongsTo('company', {async: true, inverse: 'users'}),
+  properties:  DS.hasMany('property', {async: true, inverse: 'owners'}),
+  projects:   DS.hasMany('project'),
   hats:     DS.hasMany('hat', {polymorphic: true})
 });
 

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -381,12 +381,6 @@ DS.Store.reopen({
     return adapter instanceof DS.FixtureAdapter;
   },
 
-  usingActiveModelSerializer: function () {
-    var adapter = this.adapterFor('application');
-    console.log('adapter.defaultSerializer', adapter.defaultSerializer)
-    return adapter.defaultSerializer == 'active-model';
-  },
-
   /**
    Make new fixture and save to store. If the store is using FixtureAdapter,
    will push to FIXTURE array, otherwise will use push method on adapter.
@@ -560,11 +554,17 @@ DS.Store.reopen({
             child.constructor,
             model
           );
-          if (relationship.options && relationship.options.inverse) {
-            belongsToName = relationship.options.inverse;
-          }
+          var hasManyName = self.findRelationshipName(
+            'hasMany',
+            child.constructor,
+            model
+          );
+          var inverseName = (relationship.options && relationship.options.inverse)
           if (belongsToName) {
-            child.set(belongsToName, model);
+            child.set(belongsToName || inverseName, model);
+          } else if (hasManyName) {
+            relation = child.get(hasManyName || inverseName) || [];
+            relation.pushObject(model)
           }
         })
       }
@@ -577,7 +577,7 @@ DS.Store.reopen({
               'hasMany',
               belongsToRecord.constructor,
               model
-            )
+            );
             if (hasManyName) {
               belongsToRecord.get(hasManyName).addObject(model);
               return;
@@ -586,7 +586,7 @@ DS.Store.reopen({
               'belongsTo',
               belongsToRecord.constructor,
               model
-            )
+            );
             // Guard against a situation where a model can belong to itself.
             // Do not want to set the belongsTo on this case.
             if (oneToOneName && !(belongsToRecord.constructor == model.constructor)) {
@@ -632,26 +632,6 @@ DS.Store.reopen({
     return relationshipName;
   },
 
-//  /**
-//   Adding the ability to check the serializer and convert the json before
-//   it's pushed. For the ActiveModelSerializer, the attributes should be snake case,
-//   for example.
-//
-//   @method push
-//   @param {String or subclass of DS.Model} type
-//   @param {Object} data
-//   @return {DS.Model} the record that was created or updated.
-//  */
-//  push: function(type, data, _partial) {
-//    var type = this.modelFor(type);
-//    var serializer = this.serializerFor(type.typeKey);
-//    console.log('serializer',serializer, serializer+'')
-////    if (this.usingActiveModelSerializer()) {
-////      var model = this.modelFor(modelName);
-////      FactoryGuy.pushFixture(model, payload);
-////    }
-//    this._super(type, data, _partial);
-//  },
 
   /**
    Adding a pushPayload for FixtureAdapter, but using the original with
@@ -714,27 +694,47 @@ 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.findRelationshipName(
-              'hasMany',
-              belongsToRecord.constructor,
-              record
-            );
-            belongsToRecord.get(hasManyName).addObject(record);
-          }
-        })
-      }
+      Em.RSVP.Promise.resolve(Ember.get(type, 'relationshipNames')).then(function (relationShips){
+        if (relationShips.belongsTo) {
+          relationShips.belongsTo.forEach(function (relationship) {
+            Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){
+              if (belongsToRecord) {
+                var hasManyName = store.findRelationshipName(
+                  'hasMany',
+                  belongsToRecord.constructor,
+                  record
+                );
+                Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then (function(relationship){
+                  relationship.addObject(record);
+                });
+              }
+            });
+          });
+        }
+        if (relationShips.hasMany) {
+          relationShips.hasMany.forEach(function (relationship) {
+            Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){
+              if (belongsToRecord && belongsToRecord.get('length') > 0) {
+                var hasManyName = store.findRelationshipName(
+                  'hasMany',
+                  belongsToRecord.constructor,
+                  record
+                );
+                belongsToRecord.forEach(function (child){
+                  child.get(hasManyName).addObject(record)
+                });
+              }
+            });
+          })
+        }
+      });
     });
 
     return promise;
   }
 })
+
 FactoryGuyTestMixin = Em.Mixin.create({
 
   // Pass in the app root, which typically is App.
@@ -770,6 +770,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
 
+  /**
+   Proxy to store's makeFixture method
+
+   @param {String} name name of fixture
+   @param {Object} options fixture options
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
   make: function (name, opts) {
     return this.getStore().makeFixture(name, opts);
   },
@@ -811,9 +818,9 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-   Build the json used for creating record
+   Build the json used for creating or finding a record.
 
-   @param {String} name of the fixture ( or model ) to create
+   @param {String} name of the fixture ( or model ) to create/find
    @param {Object} opts fixture options
    */
   buildAjaxHttpResponse: function (name, opts) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email:
@@ -47,6 +47,7 @@ files:
 - tests/support/factories/material_factory.js
 - tests/support/factories/profile_factory.js
 - tests/support/factories/project_factory.js
+- tests/support/factories/property_factory.js
 - tests/support/factories/user_factory.js
 - tests/support/libs/mockjax.js
 - tests/support/libs/sinon.js
@@ -55,6 +56,7 @@ files:
 - tests/support/models/material.js
 - tests/support/models/profile.js
 - tests/support/models/project.js
+- tests/support/models/property.js
 - tests/support/models/user.js
 - tests/support/test_helper.js
 - tests/test_setup.js