ember-data-factory-guy 0.7.1.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc55c97449faf820c7ddc020be8d174fa9271e6a
-  data.tar.gz: 2e776acdbd061fc25699ad9a439e4890e68f927e
+  metadata.gz: ba3f2a078115f1ac18c7a5e4502bda094ac6d68c
+  data.tar.gz: b9baceeda91d911aeeaf113bd2faf8b2a7359ad3
 SHA512:
-  metadata.gz: e3841ed91434571ec513a772fd2fc0773448fdcfb6fe9172827dc30c22e6859153e1ad63d2a1c6cff49a019ccc50e3aff9db248745ba603e7d907b3518298939
-  data.tar.gz: cf12b43d19e816e2fa7ee480c59d98d00208bafb38bc0798bda321f41cf27f80919184d99d3bab1f6675c089a2bf18eaf6e115642aad4a7cc3bfd6e3c766a490
+  metadata.gz: a4b2779dd07b5abd725131d34b0a49c4d0e961e649fb65c1183868ff716fa16bf55defbc6e79bd62502a529b443d7ad341e7526fd998361cbb0b6aacfb22a95a
+  data.tar.gz: bae5b33e21690265d59056fedcc4f6b3ef4a90b5136f9ee105c0d602cfa13d391a3fc21d432f58c778a7581ee18194170aae305fac7225456c5005d8917cffcc

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-factory-guy",
-  "version": "0.7.1.1",
+  "version": "0.7.2",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"
@@ -19,7 +19,7 @@
     "handlebars": "~1.1.2",
     "jquery": "2.0.3",
     "ember": "1.7.0",
-    "ember-data": "1.0.0-beta.10",
+    "ember-data": "1.0.0-beta.11",
     "chance": "latest",
     "qunit": "latest"
   },

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

@@ -554,7 +554,7 @@ DS.Store.reopen({
   setAssociationsForFixtureAdapter: function (modelType, modelName, fixture) {
     var self = this;
     var adapter = this.adapterFor('application');
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'hasMany') {
         var hasManyRelation = fixture[relationship.key];
         if (hasManyRelation) {
@@ -605,11 +605,10 @@ DS.Store.reopen({
    */
   findEmbeddedAssociationsForRESTAdapter: function (modelType, fixture) {
     var store = this;
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = fixture[relationship.key];
         if (Ember.typeOf(belongsToRecord) == 'object') {
-          store.findEmbeddedAssociationsForRESTAdapter(relationship.type, belongsToRecord);
           belongsToRecord = store.push(relationship.type, belongsToRecord);
           fixture[relationship.key] = belongsToRecord;
         }
@@ -654,8 +653,9 @@ DS.Store.reopen({
    ```
 
    NOTE:
-   As of ember-data-1.0.0-beta.10, this method is only needed because the belongsTo
-   is not assigned when there is a self referential polymorphic has many association.
+   As of ember-data-1.0.0-beta.10 and ember-data-1.0.0-beta.12,
+   this method is only needed because the belongsTo is not assigned when
+   there is a self referential polymorphic has many association.
 
    @param {DS.Model} modelType model type like 'User'
    @param {String} modelName model name like 'user'
@@ -663,7 +663,7 @@ DS.Store.reopen({
    */
   setAssociationsForRESTAdapter: function (modelType, modelName, model) {
     var self = this;
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'hasMany') {
         var children = model.get(name) || [];
         children.forEach(function (child) {
@@ -672,12 +672,12 @@ DS.Store.reopen({
             child.constructor,
             model
           );
-          var inverseName = (relationship.options && relationship.options.inverse)
-          if (belongsToName || inverseName) {
-            child.set(belongsToName || inverseName, model);
+          if (belongsToName) {
+            child.set(belongsToName, model);
           }
         })
       }
+
     })
   },
 
@@ -685,7 +685,7 @@ DS.Store.reopen({
   findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (name, relationship) {
+      function (relationship, name) {
         if (relationship.kind == kind &&
           childModel instanceof relationship.type) {
           relationshipName = relationship.key;
@@ -698,7 +698,7 @@ DS.Store.reopen({
   findHasManyRelationshipNameForFixtureAdapter: function (belongToModelType, childModelType) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (name, relationship) {
+      function (relationship, name) {
         if (relationship.kind == 'hasMany' &&
           childModelType == relationship.type) {
           relationshipName = relationship.key;

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 traits={};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,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,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,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.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;parseTraits(config.traits);delete config.traits;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)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){console.log("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,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(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,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.findEmbeddedAssociationsForRESTAdapter(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"){var hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){id=object.id;hasManyRelation[index]=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)}}})},findEmbeddedAssociationsForRESTAdapter: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"){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,belongsToRecord);belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"){if(Ember.typeOf(hasManyRecords[0])=="object"){var records=Em.A();hasManyRecords.map(function(object){var record=store.push(relationship.type,object);records.push(record);return record});fixture[relationship.key]=records}}}})},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 inverseName=relationship.options&&relationship.options.inverse;if(belongsToName||inverseName){child.set(belongsToName||inverseName,model)}})}})},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)}}});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}}},buildURL:function(type,id){return this.getStore().adapterFor("application").buildURL(type,id)},handleSideloadFind:function(modelName,json,sideload){var id=json.id;var url=this.buildURL(modelName,id);var responseJson={};responseJson[modelName]=json;$.extend(responseJson,sideload);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200})},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url=this.buildURL(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=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:status||200})},handleDelete:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,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 traits={};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,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,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,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.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;parseTraits(config.traits);delete config.traits;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)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){console.log("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,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(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,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.findEmbeddedAssociationsForRESTAdapter(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(relationship,name){if(relationship.kind=="hasMany"){var hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){id=object.id;hasManyRelation[index]=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)}}})},findEmbeddedAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"){if(Ember.typeOf(hasManyRecords[0])=="object"){var records=Em.A();hasManyRecords.map(function(object){var record=store.push(relationship.type,object);records.push(record);return record});fixture[relationship.key]=records}}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);if(belongsToName){child.set(belongsToName,model)}})}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(relationship,name){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(relationship,name){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)}}});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}}},buildURL:function(type,id){return this.getStore().adapterFor("application").buildURL(type,id)},handleSideloadFind:function(modelName,json,sideload){var id=json.id;var url=this.buildURL(modelName,id);var responseJson={};responseJson[modelName]=json;$.extend(responseJson,sideload);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200})},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url=this.buildURL(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=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:status||200})},handleDelete:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,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.7.1.1"
+  s.version     = "0.7.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.7.1.1",
+  "version": "0.7.2",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/store.js

@@ -88,7 +88,7 @@ DS.Store.reopen({
   setAssociationsForFixtureAdapter: function (modelType, modelName, fixture) {
     var self = this;
     var adapter = this.adapterFor('application');
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'hasMany') {
         var hasManyRelation = fixture[relationship.key];
         if (hasManyRelation) {
@@ -139,11 +139,10 @@ DS.Store.reopen({
    */
   findEmbeddedAssociationsForRESTAdapter: function (modelType, fixture) {
     var store = this;
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = fixture[relationship.key];
         if (Ember.typeOf(belongsToRecord) == 'object') {
-          store.findEmbeddedAssociationsForRESTAdapter(relationship.type, belongsToRecord);
           belongsToRecord = store.push(relationship.type, belongsToRecord);
           fixture[relationship.key] = belongsToRecord;
         }
@@ -188,8 +187,9 @@ DS.Store.reopen({
    ```
 
    NOTE:
-   As of ember-data-1.0.0-beta.10, this method is only needed because the belongsTo
-   is not assigned when there is a self referential polymorphic has many association.
+   As of ember-data-1.0.0-beta.10 and ember-data-1.0.0-beta.12,
+   this method is only needed because the belongsTo is not assigned when
+   there is a self referential polymorphic has many association.
 
    @param {DS.Model} modelType model type like 'User'
    @param {String} modelName model name like 'user'
@@ -197,7 +197,7 @@ DS.Store.reopen({
    */
   setAssociationsForRESTAdapter: function (modelType, modelName, model) {
     var self = this;
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'hasMany') {
         var children = model.get(name) || [];
         children.forEach(function (child) {
@@ -206,12 +206,12 @@ DS.Store.reopen({
             child.constructor,
             model
           );
-          var inverseName = (relationship.options && relationship.options.inverse)
-          if (belongsToName || inverseName) {
-            child.set(belongsToName || inverseName, model);
+          if (belongsToName) {
+            child.set(belongsToName, model);
           }
         })
       }
+
     })
   },
 
@@ -219,7 +219,7 @@ DS.Store.reopen({
   findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (name, relationship) {
+      function (relationship, name) {
         if (relationship.kind == kind &&
           childModel instanceof relationship.type) {
           relationshipName = relationship.key;
@@ -232,7 +232,7 @@ DS.Store.reopen({
   findHasManyRelationshipNameForFixtureAdapter: function (belongToModelType, childModelType) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (name, relationship) {
+      function (relationship, name) {
         if (relationship.kind == 'hasMany' &&
           childModelType == relationship.type) {
           relationshipName = relationship.key;

data/tests/rest_adapter_factory_test.js

@@ -68,16 +68,6 @@ test("when hasMany associations assigned, belongTo parent is assigned", function
 });
 
 
-test("when belongsTo has a hasMany associations in the definition", function() {
-  var project = store.makeFixture('project', 'with_user_having_hats');
-  var user = project.get('user');
-  var hats = user.get('hats');
-
-  ok(user.get('projects.firstObject') == project)
-  ok(hats.get('firstObject.user') == user)
-});
-
-
 asyncTest("when hasMany ( asnyc ) associations assigned, belongTo parent is assigned", function() {
   var user = store.makeFixture('user');
   var company = store.makeFixture('company', {users: [user]});
@@ -265,3 +255,25 @@ test("creates records in the store", function() {
   ok(storeUsers[0] == users[0]);
   ok(storeUsers[1] == users[1]);
 });
+
+//test("creates records in the store", function() {
+//  var lesson = store.makeFixture('lesson');
+//  var unit = store.makeFixture('unit');
+//  var unit = store.makeFixture('unit', {lesson: lesson});
+//  console.log('@@###',unit+'', unit.get('lesson')+'')
+
+//    var unit = FactoryGuy.build('unit_with_lesson')
+//    store.push('unit' , unit)
+//    console.log(store.modelFor('lesson')+'')
+//    var relationshipsByName = Ember.get(Lesson, 'relationshipsByName');
+//    console.log(relationshipsByName)
+
+//    var unit = store.makeFixture('unit_with_lesson');
+//    console.log('@@###',unit+'', unit.get('lesson')+'')
+
+//  console.log(FactoryGuy.build('unit_with_lesson'));
+//  unit.get('lesson').then(function(lesson) {
+//    ok(lesson instanceof Lesson == true)
+//  })
+
+//})

data/tests/support/factories/company_factory.js

@@ -1,18 +1,5 @@
 FactoryGuy.define("company", {
   default: {
     name: 'Silly corp'
-  },
-  traits: {
-    with_projects: {
-      projects: FactoryGuy.hasMany('project', 2)
-    }
-  }
-
-})
-
-FactoryGuy.define("small_company", {
-  default: {
-    name: 'Small Corp',
-    projects: FactoryGuy.hasMany('project', 2)
   }
 })

data/tests/support/factories/project_factory.js

@@ -6,7 +6,6 @@ FactoryGuy.define("project", {
     big: { title: 'Big Project' },
     with_title_sequence: { title: FactoryGuy.generate('title') },
     with_user: { user: {} },
-    with_user_having_hats: { user: FactoryGuy.belongsTo('user', 'with_hats') },
     with_dude: { user: {name: 'Dude'} },
     with_admin: { user: FactoryGuy.belongsTo('admin') }
   },

data/tests/support/models/user.js

@@ -5,4 +5,3 @@ User = DS.Model.extend({
   projects:   DS.hasMany('project'),
   hats:       DS.hasMany('hat', {polymorphic: true})
 });
-

data/tests/test_setup.js

@@ -1,19 +1,6 @@
 FactoryGuy.define("company", {
   default: {
     name: 'Silly corp'
-  },
-  traits: {
-    with_projects: {
-      projects: FactoryGuy.hasMany('project', 2)
-    }
-  }
-
-})
-
-FactoryGuy.define("small_company", {
-  default: {
-    name: 'Small Corp',
-    projects: FactoryGuy.hasMany('project', 2)
   }
 })
 FactoryGuy.define("group", {
@@ -84,7 +71,6 @@ FactoryGuy.define("project", {
     big: { title: 'Big Project' },
     with_title_sequence: { title: FactoryGuy.generate('title') },
     with_user: { user: {} },
-    with_user_having_hats: { user: FactoryGuy.belongsTo('user', 'with_hats') },
     with_dude: { user: {name: 'Dude'} },
     with_admin: { user: FactoryGuy.belongsTo('admin') }
   },
@@ -224,7 +210,6 @@ User = DS.Model.extend({
   hats:       DS.hasMany('hat', {polymorphic: true})
 });
 
-
 /*!
  * MockJax - jQuery Plugin to Mock Ajax requests
  *

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -554,7 +554,7 @@ DS.Store.reopen({
   setAssociationsForFixtureAdapter: function (modelType, modelName, fixture) {
     var self = this;
     var adapter = this.adapterFor('application');
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'hasMany') {
         var hasManyRelation = fixture[relationship.key];
         if (hasManyRelation) {
@@ -605,11 +605,10 @@ DS.Store.reopen({
    */
   findEmbeddedAssociationsForRESTAdapter: function (modelType, fixture) {
     var store = this;
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = fixture[relationship.key];
         if (Ember.typeOf(belongsToRecord) == 'object') {
-          store.findEmbeddedAssociationsForRESTAdapter(relationship.type, belongsToRecord);
           belongsToRecord = store.push(relationship.type, belongsToRecord);
           fixture[relationship.key] = belongsToRecord;
         }
@@ -654,8 +653,9 @@ DS.Store.reopen({
    ```
 
    NOTE:
-   As of ember-data-1.0.0-beta.10, this method is only needed because the belongsTo
-   is not assigned when there is a self referential polymorphic has many association.
+   As of ember-data-1.0.0-beta.10 and ember-data-1.0.0-beta.12,
+   this method is only needed because the belongsTo is not assigned when
+   there is a self referential polymorphic has many association.
 
    @param {DS.Model} modelType model type like 'User'
    @param {String} modelName model name like 'user'
@@ -663,7 +663,7 @@ DS.Store.reopen({
    */
   setAssociationsForRESTAdapter: function (modelType, modelName, model) {
     var self = this;
-    Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
+    Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
       if (relationship.kind == 'hasMany') {
         var children = model.get(name) || [];
         children.forEach(function (child) {
@@ -672,12 +672,12 @@ DS.Store.reopen({
             child.constructor,
             model
           );
-          var inverseName = (relationship.options && relationship.options.inverse)
-          if (belongsToName || inverseName) {
-            child.set(belongsToName || inverseName, model);
+          if (belongsToName) {
+            child.set(belongsToName, model);
           }
         })
       }
+
     })
   },
 
@@ -685,7 +685,7 @@ DS.Store.reopen({
   findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (name, relationship) {
+      function (relationship, name) {
         if (relationship.kind == kind &&
           childModel instanceof relationship.type) {
           relationshipName = relationship.key;
@@ -698,7 +698,7 @@ DS.Store.reopen({
   findHasManyRelationshipNameForFixtureAdapter: function (belongToModelType, childModelType) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (name, relationship) {
+      function (relationship, name) {
         if (relationship.kind == 'hasMany' &&
           childModelType == relationship.type) {
           relationshipName = relationship.key;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.7.1.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email: