ember-data-factory-guy 0.2.0 → 0.2.1

data/README.md

@@ -52,8 +52,10 @@ NOTE: The benefit of using FactoryGuy is that you can run your tests with the
 default adapter that your application's store normally uses. In other words:
 You do not have to use the DS.FixtureAdapter.  But if you do choose to use the Fixture adapter,
 which does not run any faster, and does not handle associations as elegantly
-( and in some cases not at all ),
-you may run into problems with accessing associations.
+( and in some cases not at all ), you may run into problems with accessing associations.
+
+Error: Assertion Failed: You looked up the 'projects' relationship on '<User:ember379:1>' but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.hasMany({ async: true })`)
+
 If you do get these types of errors try requiring the factory_guy_has_many.js file
 ( located in dist dir and vendor dir ) AFTER you require ember-data,
 but BEFORE you require your models.
@@ -134,7 +136,7 @@ but BEFORE you require your models.
   store.makeFixture('user'); //  user.FIXTURES = [{id: 1, name: 'User1', type: 'normal'}]
   store.makeFixture('user', {name: 'bob'}); //  user.FIXTURES = [{id: 2, name: 'bob', type: 'normal'}]
   store.makeFixture('admin'); //  user.FIXTURES = [{id: 3, name: 'Admin', type: 'superuser'}]
-  store.makeFixture('admin', name: 'Fred'); //  user.FIXTURES = [{id: 4, name: 'Fred', type: 'superuser'}]
+  store.makeFixture('admin', {name: 'Fred'}); //  user.FIXTURES = [{id: 4, name: 'Fred', type: 'superuser'}]
 
 
   // Use store.find to get the model instance ( Remember this is the Fixture adapter, if
@@ -146,15 +148,17 @@ but BEFORE you require your models.
   });
 
   // and to setup associations ...
-  var project = store.makeFixture('project');
-  var user = store.makeFixture('user', projects: [project.id]);
-
-  // and for lists
-  var users = store.makeList('user', 2, projects: [project.id]);
+  var projectJson = store.makeFixture('project');
+  var userJson = store.makeFixture('user', projects: [project.id]);
+  // OR
+  var userJson = store.makeFixture('user');
+  var projectJson = store.makeFixture('project', user: userJson.id);
 
-  // with fixture adapter all associations are treated as async, so it's
+  // will give you the same result, but with fixture adapter all associations
+  // are treated as async ( by factory_guy_has_many.js fix ), so it's
   // a bit clunky to get this associated data. When using DS.FixtureAdapter
-  // in view specs though, this clunk is dealt with for you.
+  // in view specs though, this clunk is dealt with for you. But remember,
+  // you don't have to use the Fixture adapter.
   store.find('user', 1).then(function(user) {
     user.get('name') == 'My name';
     user.get('projects').then(function(projects) {
@@ -162,6 +166,8 @@ but BEFORE you require your models.
     });
   });
 
+  // and for lists
+  var users = store.makeList('user', 2, projects: [project.id]);
 
   //////////////////////////////////////////////////////////////////
   //
@@ -184,12 +190,16 @@ but BEFORE you require your models.
   // and to setup associations ...
 
   var project = store.makeFixture('project');
-  var user = store.makeFixture('user', projects: [project.id]);
+  var user = store.makeFixture('user', projects: [project]);
+  //  OR
+  var user = store.makeFixture('user');
+  var project = store.makeFixture('project', user: user);
 
+  // will get you the same results
   user.get('projects.length') == 1;
   user.get('projects.firstObject.user') == user;
 
-  // and to create lists
+  // and to create lists ( of 3 users in this case )
   var users = store.makeList('user', 3);
 
 ```
@@ -215,6 +225,7 @@ var testHelper, store;
 module('User Model', {
   setup: function() {
     testHelper = TestHelper.setup(App);
+    store = testHelper.getStore();
   },
   teardown: function() {
     Em.run(function() { testHelper.teardown(); });
@@ -244,3 +255,9 @@ test("make a user using your applications default adapter", function() {
 
 
 ```
+
+
+Further Extra Goodies
+=====================
+
+mockjax

data/bower.json

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

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

@@ -401,22 +401,33 @@ DS.Store.reopen({
    @param {String} modelName model name like 'user'
    @param {Object} parentFixture parent to assign as belongTo
    */
-  setBelongsToFixturesAdapter: function (modelType, modelName, parentFixture) {
-    var store = this;
+  setBelongsToFixturesAdapter: function(modelType, modelName, fixture) {
+    var self = this;
     var adapter = this.adapterFor('application');
-    var relationShips = Ember.get(modelType, 'relationshipNames');
-    if (relationShips.hasMany) {
-      relationShips.hasMany.forEach(function (relationship) {
-        var hasManyModel = store.modelFor(Em.String.singularize(relationship));
-        if (parentFixture[relationship]) {
-          parentFixture[relationship].forEach(function (id) {
-            var hasManyfixtures = adapter.fixturesForType(hasManyModel);
+    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] = parentFixture.id;
+            fixture[modelName] = fixture.id;
           })
         }
-      })
-    }
+      }
+
+      if (relationship.kind == 'belongsTo') {
+        var belongsToRecord = fixture[relationship.key];
+        if (belongsToRecord) {
+          var hasManyName = self.findHasManyRelationshipName2(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);
+        }
+      }
+    })
   },
 
   /**
@@ -454,6 +465,18 @@ DS.Store.reopen({
     })
   },
 
+  findHasManyRelationshipName2: function (belongToModel, childModel) {
+    var relationshipName;
+    Ember.get(belongToModel, 'relationshipsByName').forEach(
+      function (name, relationship) {
+        if (relationship.kind == 'hasMany' &&
+          relationship.type == childModel) {
+          relationshipName = relationship.key;
+        }
+      }
+    )
+    return relationshipName;
+  },
   findHasManyRelationshipName: function (belongToModel, childModel) {
     var relationshipName;
     Ember.get(belongToModel.constructor, 'relationshipsByName').forEach(
@@ -559,7 +582,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-    Proxy to store's find method
+   Proxy to store's find method
 
    @param {String or subclass of DS.Model} type
    @param {Object|String|Integer|null} id
@@ -638,12 +661,24 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return hash;
   },
 
+  /**
+    Handling ajax PUT ( update record ) for a model type
+
+    @param {String} root modelType like 'user' for User
+    @param {String} id id of record to update
+   */
   handleUpdate: function (root, id) {
     this.stubEndpointForHttpRequest(
       "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
     )
   },
 
+  /**
+    Handling ajax DELETE ( delete record ) for a model type
+
+    @param {String} root modelType like 'user' for User
+    @param {String} id id of record to update
+   */
   handleDelete: function (root, id) {
     this.stubEndpointForHttpRequest(
       "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'DELETE'}

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(typeof fixture[attribute]=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}}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)}},lookupModelForName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition.model}}},lookupDefinitionForName: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.lookupDefinitionForName(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.lookupDefinitionForName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,opts)},resetModels:function(store){var typeMaps=store.typeMaps;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={};return}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var modelName=FactoryGuy.lookupModelForName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.modelFor(modelName);if(this.usingFixtureAdapter()){this.setBelongsToFixturesAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var self=this;var model;Em.run(function(){model=self.push(modelName,fixture);self.setBelongsToRESTAdapter(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},setBelongsToFixturesAdapter:function(modelType,modelName,parentFixture){var store=this;var adapter=this.adapterFor("application");var relationShips=Ember.get(modelType,"relationshipNames");if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){var hasManyModel=store.modelFor(Em.String.singularize(relationship));if(parentFixture[relationship]){parentFixture[relationship].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(hasManyModel);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=parentFixture.id})}})}},setBelongsToRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){child.set(modelName,model)})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var hasManyName=self.findHasManyRelationshipName(belongsToRecord,model);belongsToRecord.get(hasManyName).addObject(model)}}})},findHasManyRelationshipName:function(belongToModel,childModel){var relationshipName;Ember.get(belongToModel.constructor,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&relationship.type==childModel.constructor){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,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.lookupModelForName(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.lookupModelForName(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(typeof fixture[attribute]=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}}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)}},lookupModelForName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition.model}}},lookupDefinitionForName: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.lookupDefinitionForName(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.lookupDefinitionForName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,opts)},resetModels:function(store){var typeMaps=store.typeMaps;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={};return}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var modelName=FactoryGuy.lookupModelForName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.modelFor(modelName);if(this.usingFixtureAdapter()){this.setBelongsToFixturesAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var self=this;var model;Em.run(function(){model=self.push(modelName,fixture);self.setBelongsToRESTAdapter(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},setBelongsToFixturesAdapter: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){var hasManyName=self.findHasManyRelationshipName2(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)}}})},setBelongsToRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){child.set(modelName,model)})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var hasManyName=self.findHasManyRelationshipName(belongsToRecord,model);belongsToRecord.get(hasManyName).addObject(model)}}})},findHasManyRelationshipName2:function(belongToModel,childModel){var relationshipName;Ember.get(belongToModel,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&relationship.type==childModel){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipName:function(belongToModel,childModel){var relationshipName;Ember.get(belongToModel.constructor,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&relationship.type==childModel.constructor){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,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.lookupModelForName(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.lookupModelForName(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.2.0"
+  s.version     = "0.2.1"
   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.2.0",
+  "version": "0.2.1",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/factory_guy_test_mixin.js

@@ -12,7 +12,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-    Proxy to store's find method
+   Proxy to store's find method
 
    @param {String or subclass of DS.Model} type
    @param {Object|String|Integer|null} id
@@ -91,12 +91,24 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return hash;
   },
 
+  /**
+    Handling ajax PUT ( update record ) for a model type
+
+    @param {String} root modelType like 'user' for User
+    @param {String} id id of record to update
+   */
   handleUpdate: function (root, id) {
     this.stubEndpointForHttpRequest(
       "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
     )
   },
 
+  /**
+    Handling ajax DELETE ( delete record ) for a model type
+
+    @param {String} root modelType like 'user' for User
+    @param {String} id id of record to update
+   */
   handleDelete: function (root, id) {
     this.stubEndpointForHttpRequest(
       "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'DELETE'}

data/src/store.js

@@ -62,22 +62,33 @@ DS.Store.reopen({
    @param {String} modelName model name like 'user'
    @param {Object} parentFixture parent to assign as belongTo
    */
-  setBelongsToFixturesAdapter: function (modelType, modelName, parentFixture) {
-    var store = this;
+  setBelongsToFixturesAdapter: function(modelType, modelName, fixture) {
+    var self = this;
     var adapter = this.adapterFor('application');
-    var relationShips = Ember.get(modelType, 'relationshipNames');
-    if (relationShips.hasMany) {
-      relationShips.hasMany.forEach(function (relationship) {
-        var hasManyModel = store.modelFor(Em.String.singularize(relationship));
-        if (parentFixture[relationship]) {
-          parentFixture[relationship].forEach(function (id) {
-            var hasManyfixtures = adapter.fixturesForType(hasManyModel);
+    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] = parentFixture.id;
+            fixture[modelName] = fixture.id;
           })
         }
-      })
-    }
+      }
+
+      if (relationship.kind == 'belongsTo') {
+        var belongsToRecord = fixture[relationship.key];
+        if (belongsToRecord) {
+          var hasManyName = self.findHasManyRelationshipName2(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);
+        }
+      }
+    })
   },
 
   /**
@@ -115,6 +126,18 @@ DS.Store.reopen({
     })
   },
 
+  findHasManyRelationshipName2: function (belongToModel, childModel) {
+    var relationshipName;
+    Ember.get(belongToModel, 'relationshipsByName').forEach(
+      function (name, relationship) {
+        if (relationship.kind == 'hasMany' &&
+          relationship.type == childModel) {
+          relationshipName = relationship.key;
+        }
+      }
+    )
+    return relationshipName;
+  },
   findHasManyRelationshipName: function (belongToModel, childModel) {
     var relationshipName;
     Ember.get(belongToModel.constructor, 'relationshipsByName').forEach(

data/tests/fixture_adapter_factory_test.js

@@ -76,23 +76,38 @@ test("#makeFixture builds and pushes fixture into the models FIXTURE array", fun
 });
 
 
-asyncTest("#makeFixture sets hasMany associations on fixtures", function() {
+asyncTest("#makeFixture sets belongsTo on hasMany associations", function() {
   var p1 = store.makeFixture('project');
   // second project not added on purpose to make sure only one is
   // assigned in hasMany
   store.makeFixture('project');
   var user = store.makeFixture('user', {projects: [p1.id]})
 
-  store.find('user', 1).then ( function(user) {
+  store.find('user', 1).then( function(user) {
     user.get('projects').then( function(projects) {
       equal(projects.get('length'), 1, "adds hasMany records");
-      equal(projects.get('firstObject.user.id'), 1, "sets belongsTo record");
+      equal(projects.get('firstObject.user.id'), user.id, "sets belongsTo record");
       start();
     })
   })
 })
 
-asyncTest("#createRecord adds belongsTo associations to hasMany array", function() {
+
+asyncTest("#makeFixture adds record to hasMany association array for which it belongsTo", function() {
+  var userJson = store.makeFixture('user');
+  var projectJson = store.makeFixture('project', {user: userJson.id});
+
+  store.find('user', userJson.id).then( function(user) {
+    user.get('projects').then( function(projects) {
+      equal(projects.get('length'), 1, "adds hasMany records");
+      equal(projects.get('firstObject.user.id'), user.id, "sets belongsTo record");
+      start();
+    })
+  })
+})
+
+
+asyncTest("#createRecord adds belongsTo association to records it hasMany of", function() {
   var user = store.makeFixture('user');
 
   store.find('user', user.id).then(function(user) {

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -401,22 +401,33 @@ DS.Store.reopen({
    @param {String} modelName model name like 'user'
    @param {Object} parentFixture parent to assign as belongTo
    */
-  setBelongsToFixturesAdapter: function (modelType, modelName, parentFixture) {
-    var store = this;
+  setBelongsToFixturesAdapter: function(modelType, modelName, fixture) {
+    var self = this;
     var adapter = this.adapterFor('application');
-    var relationShips = Ember.get(modelType, 'relationshipNames');
-    if (relationShips.hasMany) {
-      relationShips.hasMany.forEach(function (relationship) {
-        var hasManyModel = store.modelFor(Em.String.singularize(relationship));
-        if (parentFixture[relationship]) {
-          parentFixture[relationship].forEach(function (id) {
-            var hasManyfixtures = adapter.fixturesForType(hasManyModel);
+    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] = parentFixture.id;
+            fixture[modelName] = fixture.id;
           })
         }
-      })
-    }
+      }
+
+      if (relationship.kind == 'belongsTo') {
+        var belongsToRecord = fixture[relationship.key];
+        if (belongsToRecord) {
+          var hasManyName = self.findHasManyRelationshipName2(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);
+        }
+      }
+    })
   },
 
   /**
@@ -454,6 +465,18 @@ DS.Store.reopen({
     })
   },
 
+  findHasManyRelationshipName2: function (belongToModel, childModel) {
+    var relationshipName;
+    Ember.get(belongToModel, 'relationshipsByName').forEach(
+      function (name, relationship) {
+        if (relationship.kind == 'hasMany' &&
+          relationship.type == childModel) {
+          relationshipName = relationship.key;
+        }
+      }
+    )
+    return relationshipName;
+  },
   findHasManyRelationshipName: function (belongToModel, childModel) {
     var relationshipName;
     Ember.get(belongToModel.constructor, 'relationshipsByName').forEach(
@@ -559,7 +582,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-    Proxy to store's find method
+   Proxy to store's find method
 
    @param {String or subclass of DS.Model} type
    @param {Object|String|Integer|null} id
@@ -638,12 +661,24 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return hash;
   },
 
+  /**
+    Handling ajax PUT ( update record ) for a model type
+
+    @param {String} root modelType like 'user' for User
+    @param {String} id id of record to update
+   */
   handleUpdate: function (root, id) {
     this.stubEndpointForHttpRequest(
       "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
     )
   },
 
+  /**
+    Handling ajax DELETE ( delete record ) for a model type
+
+    @param {String} root modelType like 'user' for User
+    @param {String} id id of record to update
+   */
   handleDelete: function (root, id) {
     this.stubEndpointForHttpRequest(
       "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'DELETE'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 +03:00
+date: 2014-05-10 00:00:00.000000000 +03:00
 default_executable: 
 dependencies: []
 description: Easily create Fixtures for Ember Data