ember-data-factory-guy 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d0f7da6694aabe215b16806d8924e7309faa32
-  data.tar.gz: ebbbd5dd37fd458feb67ab3d15428d729aa201ed
+  metadata.gz: ee062dcdf9d9bc4fb670a1fc9bdf0828fd5b3e02
+  data.tar.gz: 708c6fc94c00e38a1713e96430eaab7b5d78eaa7
 SHA512:
-  metadata.gz: f63cbaedb8e9e6b09f3d4b58ed393be3d3e865a05470cfe4bbf6f5c47780479526178f4d7b32e670886fa482af2e137c880c171d1a066ec1e29e5bd8d23bd758
-  data.tar.gz: 09185a49e347fcd4c4e96d19d5f5e0958a2dc55483977157fb7ddc0714f3b4db420a063009e50ba66f9824e901fb43fbc3b7b3cf07087bd83300d3f7ef75cde6
+  metadata.gz: 7e5132bf51410a64650cca36188fa02c92658a12e14b0e6192e29b957274f4cb01a2363058f1b589984fd2bbc8ce6834ea6efb67112d1374d12ff7de05983a0f
+  data.tar.gz: a4a26146f2374e475915b6c1a4bbdae9e9caaf35dff62f6ea3591704ff3af5dbd1f752efd8ba37b3f71b41e442962d296a442af9df5e04e07f8e6eba684fbcdc

data/bower.json

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

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

@@ -527,42 +527,55 @@ DS.Store.reopen({
     var self = this;
     Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
       if (relationship.kind == 'hasMany') {
+        var belongsToName = modelName;
+        if (relationship.options && relationship.options.inverse) {
+          belongsToName = relationship.options.inverse;
+        }
         var children = model.get(name) || [];
         children.forEach(function (child) {
-          child.set(modelName, model)
+          child.set(belongsToName, 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) {
+          var setAssociations = function() {
+            var hasManyName = self.findRelationshipName(
+              'hasMany',
+              belongsToRecord.constructor,
+              model
+            )
+            if (hasManyName) {
+              belongsToRecord.get(hasManyName).addObject(model);
+            }
+            var oneToOneName = self.findRelationshipName(
+              'belongsTo',
+              belongsToRecord.constructor,
+              model
+            )
+            if (oneToOneName) {
+              belongsToRecord.set(oneToOneName, model);
+            }
+          }
           if (belongsToRecord.then) {
             belongsToRecord.then(function(record) {
               belongsToRecord = record;
-              setAssociation();
+              setAssociations();
             })
           } else {
-            setAssociation();
+            setAssociations();
           }
         }
       }
     })
   },
 
-  findHasManyRelationshipName: function (belongToModelType, childModel) {
+  findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
       function (name, relationship) {
-        if (relationship.kind == 'hasMany' &&
+        if (relationship.kind == kind &&
           childModel instanceof relationship.type) {
           relationshipName = relationship.key;
         }
@@ -652,7 +665,8 @@ DS.FixtureAdapter.reopen({
         relationShips.belongsTo.forEach(function (relationship) {
           var belongsToRecord = record.get(relationship);
           if (belongsToRecord) {
-            var hasManyName = store.findHasManyRelationshipName(
+            var hasManyName = store.findRelationshipName(
+              'hasMany',
               belongsToRecord.constructor,
               record
             );

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);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())}});
+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 belongsToName=modelName;if(relationship.options&&relationship.options.inverse){belongsToName=relationship.options.inverse}var children=model.get(name)||[];children.forEach(function(child){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)}var oneToOneName=self.findRelationshipName("belongsTo",belongsToRecord.constructor,model);if(oneToOneName){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},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.6"
+  s.version     = "0.3.7"
   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.6",
+  "version": "0.3.7",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/store.js

@@ -169,42 +169,55 @@ DS.Store.reopen({
     var self = this;
     Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
       if (relationship.kind == 'hasMany') {
+        var belongsToName = modelName;
+        if (relationship.options && relationship.options.inverse) {
+          belongsToName = relationship.options.inverse;
+        }
         var children = model.get(name) || [];
         children.forEach(function (child) {
-          child.set(modelName, model)
+          child.set(belongsToName, 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) {
+          var setAssociations = function() {
+            var hasManyName = self.findRelationshipName(
+              'hasMany',
+              belongsToRecord.constructor,
+              model
+            )
+            if (hasManyName) {
+              belongsToRecord.get(hasManyName).addObject(model);
+            }
+            var oneToOneName = self.findRelationshipName(
+              'belongsTo',
+              belongsToRecord.constructor,
+              model
+            )
+            if (oneToOneName) {
+              belongsToRecord.set(oneToOneName, model);
+            }
+          }
           if (belongsToRecord.then) {
             belongsToRecord.then(function(record) {
               belongsToRecord = record;
-              setAssociation();
+              setAssociations();
             })
           } else {
-            setAssociation();
+            setAssociations();
           }
         }
       }
     })
   },
 
-  findHasManyRelationshipName: function (belongToModelType, childModel) {
+  findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
       function (name, relationship) {
-        if (relationship.kind == 'hasMany' &&
+        if (relationship.kind == kind &&
           childModel instanceof relationship.type) {
           relationshipName = relationship.key;
         }
@@ -294,7 +307,8 @@ DS.FixtureAdapter.reopen({
         relationShips.belongsTo.forEach(function (relationship) {
           var belongsToRecord = record.get(relationship);
           if (belongsToRecord) {
-            var hasManyName = store.findHasManyRelationshipName(
+            var hasManyName = store.findRelationshipName(
+              'hasMany',
               belongsToRecord.constructor,
               record
             );

data/tests/active_model_adapter_factory_test.js

@@ -59,6 +59,7 @@ asyncTest("creates records in the store", function() {
   });
 });
 
+
 test("when hasMany associations assigned, belongTo parent is assigned", function() {
   var project = store.makeFixture('project');
   var user = store.makeFixture('user', {projects: [project]})
@@ -92,6 +93,13 @@ test("when polymorphic hasMany associations are assigned, belongTo parent is ass
 });
 
 
+test("when hasMany associations are assigned, belongsTo parent is assigned using inverse", function() {
+  var project = store.makeFixture('project');
+  var project2 = store.makeFixture('project', {children: [project]});
+  deepEqual(project.get('parent').toJSON(), project2.toJSON());
+});
+
+
 test("when belongTo parent is assigned, parent adds to hasMany records", function() {
   var user = store.makeFixture('user');
   var project1 = store.makeFixture('project', {user: user});
@@ -126,6 +134,21 @@ asyncTest("when async belongsTo parent is assigned, parent adds to hasMany recor
 });
 
 
+test("when belongTo parent is assigned, parent adds to hasMany record using inverse", function() {
+  var project = store.makeFixture('project');
+  var project2 = store.makeFixture('project', {parent: project});
+  equal(project.get('children.length'), 1);
+  deepEqual(project.get('children.firstObject').toJSON(), project2.toJSON());
+});
+
+
+test("when belongTo parent is assigned, parent adds to belongsTo record", function() {
+  var company = store.makeFixture('company');
+  var profile = store.makeFixture('profile', {company: company});
+  deepEqual(company.get('profile').toJSON(), profile.toJSON());
+});
+
+
 test("belongsTo associations defined as attributes in fixture", function() {
   var project = store.makeFixture('project_with_user');
   equal(project.get('user') instanceof User, true)

data/tests/factory_guy_test.js

@@ -82,13 +82,13 @@ test("Referring to other attributes in attribute definition", function() {
 
 test("Using associations in attribute definition", function() {
   var json = FactoryGuy.build('project_with_user');
-  deepEqual(json, {id: 1, title: 'Project', user: {id: 1, name: 'User1'}}, 'creates default user for "user" belongsTo attribute');
+  deepEqual(json, {id: 1, title: 'Project1', user: {id: 1, name: 'User1'}}, 'creates default user for "user" belongsTo attribute');
 
   var json = FactoryGuy.build('project_with_dude');
-  deepEqual(json, {id: 2, title: 'Project', user: {id: 2, name: 'Dude'}}, 'creates user with optional attributes for "user" belongsTo attribute');
+  deepEqual(json, {id: 2, title: 'Project2', user: {id: 2, name: 'Dude'}}, 'creates user with optional attributes for "user" belongsTo attribute');
 
   var json = FactoryGuy.build('project_with_admin');
-  deepEqual(json, {id: 3, title: 'Project', user: {id: 3, name: 'Admin'}}, 'creates named user for "user" belongsTo attribute');
+  deepEqual(json, {id: 3, title: 'Project3', user: {id: 3, name: 'Admin'}}, 'creates named user for "user" belongsTo attribute');
 });
 
 

data/tests/rest_adapter_factory_test.js

@@ -59,6 +59,7 @@ asyncTest("creates records in the store", function() {
   });
 });
 
+
 test("when hasMany associations assigned, belongTo parent is assigned", function() {
   var project = store.makeFixture('project');
   var user = store.makeFixture('user', {projects: [project]})
@@ -92,6 +93,13 @@ test("when polymorphic hasMany associations are assigned, belongTo parent is ass
 });
 
 
+test("when hasMany associations are assigned, belongsTo parent is assigned using inverse", function() {
+  var project = store.makeFixture('project');
+  var project2 = store.makeFixture('project', {children: [project]});
+  deepEqual(project.get('parent').toJSON(), project2.toJSON());
+});
+
+
 test("when belongTo parent is assigned, parent adds to hasMany records", function() {
   var user = store.makeFixture('user');
   var project1 = store.makeFixture('project', {user: user});
@@ -126,6 +134,21 @@ asyncTest("when async belongsTo parent is assigned, parent adds to hasMany recor
 });
 
 
+test("when belongTo parent is assigned, parent adds to hasMany record using inverse", function() {
+  var project = store.makeFixture('project');
+  var project2 = store.makeFixture('project', {parent: project});
+  equal(project.get('children.length'), 1);
+  deepEqual(project.get('children.firstObject').toJSON(), project2.toJSON());
+});
+
+
+test("when belongTo parent is assigned, parent adds to belongsTo record", function() {
+  var company = store.makeFixture('company');
+  var profile = store.makeFixture('profile', {company: company});
+  deepEqual(company.get('profile').toJSON(), profile.toJSON());
+});
+
+
 test("belongsTo associations defined as attributes in fixture", function() {
   var project = store.makeFixture('project_with_user');
   equal(project.get('user') instanceof User, true)

data/tests/support/factories/profile_factory.js

@@ -0,0 +1,5 @@
+FactoryGuy.define('profile', {
+  default: {
+    description: 'Text goes here'
+  }
+})

data/tests/support/factories/project_factory.js

@@ -1,6 +1,9 @@
 FactoryGuy.define('project', {
+  sequences: {
+    title: function(num) {return 'Project' + num}
+  },
   default: {
-    title: 'Project'
+    title: FactoryGuy.generate('title')
   },
   project_with_user: {
     // user model with default attributes

data/tests/support/models/company.js

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

data/tests/support/models/hat.js

@@ -1,10 +1,10 @@
 Hat = DS.Model.extend({
   type: DS.attr('string'),
   user: DS.belongsTo('user'),
-  hat: DS.belongsTo('hat', {inverse: 'hats',polymorphic: true}),
+  hat:  DS.belongsTo('hat', {inverse: 'hats', polymorphic: true}),
   hats: DS.hasMany('hat', {inverse: 'hat', polymorphic: true})
-})
+});
 
-BigHat = Hat.extend()
-SmallHat = Hat.extend()
+BigHat = Hat.extend();
+SmallHat = Hat.extend();
 

data/tests/support/models/profile.js

@@ -0,0 +1,4 @@
+Profile = DS.Model.extend({
+  description:  DS.attr('string'),
+  company:      DS.belongsTo('company')
+});

data/tests/support/models/project.js

@@ -1,4 +1,6 @@
 Project = DS.Model.extend({
-  title: DS.attr('string'),
-  user: DS.belongsTo('user')
-})
+  title:    DS.attr('string'),
+  user:     DS.belongsTo('user'),
+  parent:   DS.belongsTo('project', {inverse: 'children'}),
+  children: DS.hasMany('project', {inverse: 'parent'})
+});

data/tests/support/models/user.js

@@ -1,6 +1,6 @@
 User = DS.Model.extend({
   name:     DS.attr('string'),
-  company: DS.belongsTo('company', {async: true}),
+  company:  DS.belongsTo('company', {async: true}),
   projects: DS.hasMany('project'),
-  hats: DS.hasMany('hat', {polymorphic: true})
-})
+  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:profile", Profile);
     container.register("model:company", Company);
     container.register("model:project", Project);
     container.register("store:main", DS.Store.extend({adapter: adapter}));

data/tests/test_setup.js

@@ -12,9 +12,17 @@ FactoryGuy.define('hat', {
     type: 'BigHat'
   }
 })
+FactoryGuy.define('profile', {
+  default: {
+    description: 'Text goes here'
+  }
+})
 FactoryGuy.define('project', {
+  sequences: {
+    title: function(num) {return 'Project' + num}
+  },
   default: {
-    title: 'Project'
+    title: FactoryGuy.generate('title')
   },
   project_with_user: {
     // user model with default attributes
@@ -40,32 +48,40 @@ FactoryGuy.define('user', {
   }
 });
 Company = DS.Model.extend({
-  name: DS.attr('string'),
-  users: DS.hasMany('user', {async: true})
-})
+  name:    DS.attr('string'),
+  profile: DS.belongsTo('profile'),
+  users:   DS.hasMany('user', {async: true})
+});
 
 Hat = DS.Model.extend({
   type: DS.attr('string'),
   user: DS.belongsTo('user'),
-  hat: DS.belongsTo('hat', {inverse: 'hats',polymorphic: true}),
+  hat:  DS.belongsTo('hat', {inverse: 'hats', polymorphic: true}),
   hats: DS.hasMany('hat', {inverse: 'hat', polymorphic: true})
-})
+});
+
+BigHat = Hat.extend();
+SmallHat = Hat.extend();
 
-BigHat = Hat.extend()
-SmallHat = Hat.extend()
 
+Profile = DS.Model.extend({
+  description:  DS.attr('string'),
+  company:      DS.belongsTo('company')
+});
 
 Project = DS.Model.extend({
-  title: DS.attr('string'),
-  user: DS.belongsTo('user')
-})
+  title:    DS.attr('string'),
+  user:     DS.belongsTo('user'),
+  parent:   DS.belongsTo('project', {inverse: 'children'}),
+  children: DS.hasMany('project', {inverse: 'parent'})
+});
 
 User = DS.Model.extend({
   name:     DS.attr('string'),
-  company: DS.belongsTo('company', {async: true}),
+  company:  DS.belongsTo('company', {async: true}),
   projects: DS.hasMany('project'),
-  hats: DS.hasMany('hat', {polymorphic: true})
-})
+  hats:     DS.hasMany('hat', {polymorphic: true})
+});
 /**
  * Sinon.JS 1.6.0, 2013/02/18
  *

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -527,42 +527,55 @@ DS.Store.reopen({
     var self = this;
     Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
       if (relationship.kind == 'hasMany') {
+        var belongsToName = modelName;
+        if (relationship.options && relationship.options.inverse) {
+          belongsToName = relationship.options.inverse;
+        }
         var children = model.get(name) || [];
         children.forEach(function (child) {
-          child.set(modelName, model)
+          child.set(belongsToName, 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) {
+          var setAssociations = function() {
+            var hasManyName = self.findRelationshipName(
+              'hasMany',
+              belongsToRecord.constructor,
+              model
+            )
+            if (hasManyName) {
+              belongsToRecord.get(hasManyName).addObject(model);
+            }
+            var oneToOneName = self.findRelationshipName(
+              'belongsTo',
+              belongsToRecord.constructor,
+              model
+            )
+            if (oneToOneName) {
+              belongsToRecord.set(oneToOneName, model);
+            }
+          }
           if (belongsToRecord.then) {
             belongsToRecord.then(function(record) {
               belongsToRecord = record;
-              setAssociation();
+              setAssociations();
             })
           } else {
-            setAssociation();
+            setAssociations();
           }
         }
       }
     })
   },
 
-  findHasManyRelationshipName: function (belongToModelType, childModel) {
+  findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
       function (name, relationship) {
-        if (relationship.kind == 'hasMany' &&
+        if (relationship.kind == kind &&
           childModel instanceof relationship.type) {
           relationshipName = relationship.key;
         }
@@ -652,7 +665,8 @@ DS.FixtureAdapter.reopen({
         relationShips.belongsTo.forEach(function (relationship) {
           var belongsToRecord = record.get(relationship);
           if (belongsToRecord) {
-            var hasManyName = store.findHasManyRelationshipName(
+            var hasManyName = store.findRelationshipName(
+              'hasMany',
               belongsToRecord.constructor,
               record
             );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email:
@@ -44,11 +44,13 @@ files:
 - tests/store_test.js
 - tests/support/factories/company_factory.js
 - tests/support/factories/hat_factory.js
+- tests/support/factories/profile_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/profile.js
 - tests/support/models/project.js
 - tests/support/models/user.js
 - tests/support/test_helper.js