ember-data-factory-guy 0.3.9 → 0.4.0

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -390,9 +390,10 @@ DS.Store.reopen({
    @returns {Object|DS.Model} json or record depending on the adapter type
    */
   makeFixture: function (name, options) {
+    var store = this;
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var fixture = FactoryGuy.build(name, options);
-    var modelType = this.modelFor(modelName);
+    var modelType = store.modelFor(modelName);
 
     if (this.usingFixtureAdapter()) {
       this.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
@@ -406,6 +407,7 @@ DS.Store.reopen({
           // assuming its polymorphic if there is a type attribute
           // is this too bold an assumption?
           modelName = fixture.type.underscore();
+          modelType = store.modelFor(modelName);
         }
         model = store.push(modelName, fixture);
         store.setAssociationsForRESTAdapter(modelType, modelName, model);
@@ -543,12 +545,16 @@ 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) {
+          var belongsToName = self.findRelationshipName(
+            'belongsTo',
+            child.constructor,
+            model
+          );
+          if (relationship.options && relationship.options.inverse) {
+            belongsToName = relationship.options.inverse;
+          }
           child.set(belongsToName, model);
         })
       }
@@ -769,11 +775,10 @@ FactoryGuyTestMixin = Em.Mixin.create({
    */
   handleCreate: function (name, opts) {
     var model = FactoryGuy.lookupModelForFixtureName(name);
-    this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(model),
-      this.buildAjaxCreateResponse(name, opts),
-      {type: 'POST'}
-    )
+    var responseJson = this.buildAjaxCreateResponse(name, opts);
+    var url = "/" + Em.String.pluralize(model);
+    this.stubEndpointForHttpRequest(url, responseJson, {type: 'POST'})
+    return responseJson;
   },
 
   /**

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email:
@@ -44,12 +44,15 @@ files:
 - tests/store_test.js
 - tests/support/factories/company_factory.js
 - tests/support/factories/hat_factory.js
+- tests/support/factories/material_factory.js
 - tests/support/factories/profile_factory.js
 - tests/support/factories/project_factory.js
 - tests/support/factories/user_factory.js
+- tests/support/libs/mockjax.js
 - tests/support/libs/sinon.js
 - tests/support/models/company.js
 - tests/support/models/hat.js
+- tests/support/models/material.js
 - tests/support/models/profile.js
 - tests/support/models/project.js
 - tests/support/models/user.js
@@ -77,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ember-data-factory-guy
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Easily create Fixtures for Ember Data