ember-data-factory-guy 0.9.1 → 0.9.2

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

@@ -1 +1 @@
-var Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};var MissingSequenceError=function(message){this.toString=function(){return message}};if(FactoryGuy!==undefined){FactoryGuy.sequence=Sequence;FactoryGuy.missingSequenceError=MissingSequenceError}var ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;var sequenceName=null;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.nextId=function(){return modelId++};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(var attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){if(FactoryGuy.getStore()){if(FactoryGuy.isAttributeRelationship(this.model,attribute)){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}else{fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}}if(!fixture.id){fixture.id=this.nextId()}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(var 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)};if(FactoryGuy!==undefined){FactoryGuy.modelDefiniton=ModelDefinition}var FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},setStore:function(store){Ember.assert("FactoryGuy#setStore needs a valid store instance.You passed in ["+store+"]",store instanceof DS.Store);this.store=store},getStore:function(){return this.store},isAttributeRelationship:function(typeName,attribute){if(!this.store){console.log("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures");return true}var model=this.store.modelFor(typeName);return!!model.typeForRelationship(attribute)},make:function(){Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",this.store);return this.store.makeFixture.apply(this.store,arguments)},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(var 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(var 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){console.log("resetModels",e)}}},pushFixture:function(modelClass,fixture){var index;if(!modelClass.FIXTURES){modelClass.FIXTURES=[]}index=this.indexOfFixture(modelClass.FIXTURES,fixture);if(index>-1){modelClass.FIXTURES.splice(index,1)}modelClass.FIXTURES.push(fixture);return fixture},indexOfFixture:function(fixtures,fixture){var index=-1,id=fixture.id+"";Ember.A(fixtures).find(function(r,i){if(""+Ember.get(r,"id")===id){index=i;return true}else{return false}});return index},clear:function(opts){if(!opts){this.modelDefinitions={}}}};(function(){DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(){var store=this;var fixture=FactoryGuy.build.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var modelType=store.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{return store.makeModel(modelType,fixture)}},makeModel:function(modelType,fixture){var store=this,modelName=store.modelFor(modelType).typeKey,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(){var arr=[];var number=arguments[1];for(var i=0;i<number;i++){arr.push(this.makeFixture.apply(this,arguments))}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"){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){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,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(type);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}})})();var FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);FactoryGuy.setStore(this.getStore());return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var modelType=store.modelFor(type);var serializer=store.serializerFor(modelType.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(){var store=this.getStore();return store.makeFixture.apply(store,arguments)},getStore:function(){return this.get("container").lookup("store:main")},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)},buildURL:function(typeName,id){var type=this.getStore().modelFor(typeName);return this.getStore().adapterFor(type).buildURL(type.typeKey,id)},handleFindMany:function(){var store=this.getStore();store.makeList.apply(store,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};responseJson[modelName]=[];var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET"})},handleCreate:function(modelName,options){var opts=options===undefined?{}:options;var succeed=opts.succeed===undefined?true:opts.succeed;var match=opts.match||{};var returnArgs=opts.returns||{};var url=this.buildURL(modelName);var definition=FactoryGuy.modelDefinitions[modelName];var httpOptions={type:"POST"};if(opts.match){var expectedRequest={};var record=this.getStore().createRecord(modelName,match);expectedRequest[modelName]=record.serialize();httpOptions.data=JSON.stringify(expectedRequest)}var modelType=this.getStore().modelFor(modelName);var responseJson={};if(succeed){responseJson[modelName]=$.extend({id:definition.nextId()},match,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}else{httpOptions.status=500}this.stubEndpointForHttpRequest(url,responseJson,httpOptions)},handleUpdate:function(){var args=Array.prototype.slice.call(arguments);Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var succeed=true;if(typeof args[args.length-1]=="boolean"){args.pop();succeed=false}Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var type,id;if(args[0]instanceof DS.Model){var model=args[0];type=model.constructor.typeKey;id=model.id}else if(typeof args[0]=="string"&&typeof parseInt(args[1])=="number"){type=args[0];id=args[1]}Ember.assert("To handleUpdate pass in a model instance or a type and an id",type&&id);this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:succeed?200:500})},handleDelete:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:succeed?200:500})},teardown:function(){FactoryGuy.resetModels(this.getStore());$.mockjax.clear()}});if(FactoryGuy!==undefined){FactoryGuy.testMixin=FactoryGuyTestMixin}
+var Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};var MissingSequenceError=function(message){this.toString=function(){return message}};if(FactoryGuy!==undefined){FactoryGuy.sequence=Sequence;FactoryGuy.missingSequenceError=MissingSequenceError}var ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;var sequenceName=null;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.nextId=function(){return modelId++};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(var attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){if(FactoryGuy.getStore()){if(FactoryGuy.isAttributeRelationship(this.model,attribute)){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}else{fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}}if(!fixture.id){fixture.id=this.nextId()}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(var 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)};if(FactoryGuy!==undefined){FactoryGuy.modelDefiniton=ModelDefinition}var FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},setStore:function(store){Ember.assert("FactoryGuy#setStore needs a valid store instance.You passed in ["+store+"]",store instanceof DS.Store);this.store=store},getStore:function(){return this.store},isAttributeRelationship:function(typeName,attribute){if(!this.store){Ember.debug("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures");return true}var model=this.store.modelFor(typeName);return!!model.typeForRelationship(attribute)},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){Ember.deprecate("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(var 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)},make:function(){var store=this.store;Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",store);var fixture=this.build.apply(this,arguments);var name=arguments[0];var modelName=this.lookupModelForFixtureName(name);var modelType=store.modelFor(modelName);if(store.usingFixtureAdapter()){store.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return this.pushFixture(modelType,fixture)}else{return store.makeModel(modelType,fixture)}},makeList:function(){Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",this.store);var arr=[];var args=Array.prototype.slice.call(arguments);Ember.assert("makeList needs at least 2 arguments, a name and a number",args.length>=2);var number=args.splice(1,1)[0];Ember.assert("Second argument to makeList should be a number (of fixtures to make.)",typeof number=="number");for(var i=0;i<number;i++){arr.push(this.make.apply(this,args))}return arr},resetModels:function(store){for(var 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){console.log("resetModels",e)}}},pushFixture:function(modelClass,fixture){var index;if(!modelClass.FIXTURES){modelClass.FIXTURES=[]}index=this.indexOfFixture(modelClass.FIXTURES,fixture);if(index>-1){modelClass.FIXTURES.splice(index,1)}modelClass.FIXTURES.push(fixture);return fixture},indexOfFixture:function(fixtures,fixture){var index=-1,id=fixture.id+"";Ember.A(fixtures).find(function(r,i){if(""+Ember.get(r,"id")===id){index=i;return true}else{return false}});return index},clear:function(opts){if(!opts){this.modelDefinitions={}}}};(function(){DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.make instead");FactoryGuy.make.call(FactoryGuy,arguments)},makeList:function(){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.makeList instead");FactoryGuy.makeList.call(FactoryGuy,arguments)},makeModel:function(modelType,fixture){var store=this,modelName=store.modelFor(modelType).typeKey,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},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"){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){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,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(type);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}})})();var FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);FactoryGuy.setStore(this.getStore());return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var modelType=store.modelFor(type);var serializer=store.serializerFor(modelType.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(){return FactoryGuy.make.apply(FactoryGuy,arguments)},getStore:function(){return this.get("container").lookup("store:main")},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.urlParams){request.urlParams=options.urlParams}if(options.data){request.data=options.data}$.mockjax(request)},buildURL:function(typeName,id){var type=this.getStore().modelFor(typeName);return this.getStore().adapterFor(type).buildURL(type.typeKey,id)},handleFindMany:function(){FactoryGuy.makeList.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};responseJson[modelName]=[];var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson)},handleFindQuery:function(modelName,searchParams,json){var responseJson={};responseJson[modelName.pluralize()]=json;var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{urlParams:searchParams})},handleCreate:function(modelName,options){var opts=options===undefined?{}:options;var succeed=opts.succeed===undefined?true:opts.succeed;var match=opts.match||{};var returnArgs=opts.returns||{};var url=this.buildURL(modelName);var definition=FactoryGuy.modelDefinitions[modelName];var httpOptions={type:"POST"};if(opts.match){var expectedRequest={};var record=this.getStore().createRecord(modelName,match);expectedRequest[modelName]=record.serialize();httpOptions.data=JSON.stringify(expectedRequest)}var modelType=this.getStore().modelFor(modelName);var responseJson={};if(succeed){responseJson[modelName]=$.extend({id:definition.nextId()},match,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}else{httpOptions.status=500}this.stubEndpointForHttpRequest(url,responseJson,httpOptions)},handleUpdate:function(){var args=Array.prototype.slice.call(arguments);Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var succeed=true;if(typeof args[args.length-1]=="boolean"){args.pop();succeed=false}Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var type,id;if(args[0]instanceof DS.Model){var model=args[0];type=model.constructor.typeKey;id=model.id}else if(typeof args[0]=="string"&&typeof parseInt(args[1])=="number"){type=args[0];id=args[1]}Ember.assert("To handleUpdate pass in a model instance or a type and an id",type&&id);this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:succeed?200:500})},handleDelete:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:succeed?200:500})},teardown:function(){FactoryGuy.resetModels(this.getStore());$.mockjax.clear()}});if(FactoryGuy!==undefined){FactoryGuy.testMixin=FactoryGuyTestMixin}

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.9.1"
+  s.version     = "0.9.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.9.1",
+  "version": "0.9.2",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/factory_guy.js

@@ -71,18 +71,6 @@ var FactoryGuy = {
     var model = this.store.modelFor(typeName);
     return !!model.typeForRelationship(attribute);
   },
-  /**
-   Make new fixture and save to store. Proxy to store#makeFixture method
-
-   @param {String} name  fixture name
-   @param {String} trait  optional trait names ( one or more )
-   @param {Object} opts  optional fixture options that will override default fixture values
-   @returns {Object|DS.Model} json or record depending on the adapter type
-   */
-  make: function() {
-    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", this.store);
-    return this.store.makeFixture.apply(this.store,arguments);
-  },
   /**
    Used in model definitions to declare use of a sequence. For example:
 
@@ -277,7 +265,53 @@ var FactoryGuy = {
     }
     return definition.buildList(name, number, traits, opts);
   },
+  /**
+   Make new fixture and save to store.
 
+   @param {String} name  fixture name
+   @param {String} trait  optional trait names ( one or more )
+   @param {Object} options  optional fixture options that will override default fixture values
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
+  make: function() {
+    var store = this.store;
+    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", store);
+
+    var fixture = this.build.apply(this, arguments);
+    var name = arguments[0];
+    var modelName = this.lookupModelForFixtureName(name);
+    var modelType = store.modelFor(modelName);
+
+    if (store.usingFixtureAdapter()) {
+      store.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
+      return this.pushFixture(modelType, fixture);
+    } else {
+      return store.makeModel(modelType, fixture);
+    }
+  },
+  /**
+   Make a list of Fixtures
+
+   @param {String} name name of fixture
+   @param {Number} number number to create
+   @param {String} trait  optional trait names ( one or more )
+   @param {Object} options  optional fixture options that will override default fixture values
+   @returns {Array} list of json fixtures or records depending on the adapter type
+   */
+  makeList: function() {
+    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", this.store);
+
+    var arr = [];
+    var args = Array.prototype.slice.call(arguments);
+    Ember.assert("makeList needs at least 2 arguments, a name and a number",args.length >= 2);
+    var number = args.splice(1,1)[0];
+    Ember.assert("Second argument to makeList should be a number (of fixtures to make.)",typeof number == 'number');
+
+    for (var i = 0; i < number; i++) {
+      arr.push(this.make.apply(this, args));
+    }
+    return arr;
+  },
   /**
    Clear model instances from FIXTURES array, and from store cache.
    Reset the id sequence for the models back to zero.

data/src/factory_guy_test_mixin.js

@@ -30,11 +30,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
   /**
-   Make new fixture and save to store. Proxy to store#makeFixture method
+   Make new fixture and save to store. Proxy to FactoryGuy#make method
    */
   make: function () {
-    var store = this.getStore();
-    return store.makeFixture.apply(store, arguments);
+    return FactoryGuy.make.apply(FactoryGuy, arguments);
   },
   getStore: function () {
     return this.get('container').lookup('store:main');
@@ -55,6 +54,9 @@ var FactoryGuyTestMixin = Em.Mixin.create({
       type: options.type || 'GET',
       status: options.status || 200
     };
+    if (options.urlParams) {
+      request.urlParams = options.urlParams;
+    }
     if (options.data) {
       request.data = options.data;
     }
@@ -81,9 +83,8 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {Object} opts  optional fixture options
    */
   handleFindMany: function () {
-    var store = this.getStore();
     // make the records and load them in the store
-    store.makeList.apply(store, arguments);
+    FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = {};
@@ -91,7 +92,35 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     // mock the ajax call, but return nothing, since the records will be
     // retrieved from the store where they were just loaded above
-    this.stubEndpointForHttpRequest(url, responseJson, { type: 'GET' });
+    this.stubEndpointForHttpRequest(url, responseJson);
+  },
+  /**
+   Handling ajax GET for finding all records for a type of model with query parameters.
+
+   ```js
+     // First build json for the instances you want 'returned' in your query.
+     var usersJson = FactoryGuy.buildList('user', 2);
+
+     // Pass in the parameters you will search on ( in this case 'name' and 'age' ) as an array,
+     // in the second argument.
+     testHelper.handleFindQuery('user', ['name', 'age'], usersJson);
+
+     store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
+        /// userInstances were created from the usersJson that you passed in
+     })
+   ```
+
+   The model instances will be created from the json you have passed in.
+
+   @param {String} modelName  name of the mode like 'user' for User model type
+   @param {String} searchParams  the parameters that will be queried
+   @param {Object} json   fixture json used to build the resulting modelType instances
+   */
+  handleFindQuery: function (modelName, searchParams, json) {
+    var responseJson = {};
+    responseJson[modelName.pluralize()] = json;
+    var url = this.buildURL(modelName);
+    this.stubEndpointForHttpRequest(url, responseJson, {urlParams: searchParams});
   },
   /**
    Handling ajax POST ( create record ) for a model. You can mock

data/src/store.js

@@ -8,30 +8,30 @@
       return adapter instanceof DS.FixtureAdapter;
     },
     /**
-     Make new fixture and save to store. If the store is using FixtureAdapter,
-     will push to FIXTURE array, otherwise will use push method on adapter to load
-     the record into the store
-
-     @param {String} name  fixture name
-     @param {String} trait  optional trait names ( one or more )
-     @param {Object} opts  optional fixture options that will override default fixture values
-     @returns {Object|DS.Model} json or record depending on the adapter type
+      Deprecated in favor of FactoryGuy.make
      */
     makeFixture: function () {
-      var store = this;
-      var fixture = FactoryGuy.build.apply(FactoryGuy, arguments);
-      var name = arguments[0];
-      var modelName = FactoryGuy.lookupModelForFixtureName(name);
-      var modelType = store.modelFor(modelName);
-      if (this.usingFixtureAdapter()) {
-        this.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
-        return FactoryGuy.pushFixture(modelType, fixture);
-      } else {
-        return store.makeModel(modelType, fixture);
-      }
+      Ember.deprecate('DEPRECATION Warning: use FactoryGuy.make instead');
+      FactoryGuy.make.call(FactoryGuy, arguments)
+    },
+    /**
+      Deprecated in favor of FactoryGuy.makeList
+     */
+    makeList: function () {
+      Ember.deprecate('DEPRECATION Warning: use FactoryGuy.makeList instead');
+      FactoryGuy.makeList.call(FactoryGuy, arguments)
     },
+    /**
+     * Most of the work of making the model from the json fixture is going on here.
+     * @param modelType
+     * @param fixture
+     * @returns {*}
+     */
     makeModel: function (modelType, fixture) {
-      var store = this, modelName = store.modelFor(modelType).typeKey, model;
+      var store = this,
+          modelName = store.modelFor(modelType).typeKey,
+          model;
+
       Em.run(function () {
         store.findEmbeddedAssociationsForRESTAdapter(modelType, fixture);
         if (fixture.type) {
@@ -45,22 +45,6 @@
       });
       return model;
     },
-    /**
-     Make a list of Fixtures
-
-     @param {String} name name of fixture
-     @param {Number} number number to create
-     @param {Object} options fixture options
-     @returns {Array} list of json fixtures or records depending on the adapter type
-     */
-    makeList: function () {
-      var arr = [];
-      var number = arguments[1];
-      for (var i = 0; i < number; i++) {
-        arr.push(this.makeFixture.apply(this, arguments));
-      }
-      return arr;
-    },
     /**
      Set the hasMany and belongsTo associations for FixtureAdapter.
 

data/tests/active_model_adapter_factory_test.js

@@ -5,7 +5,7 @@ module('FactoryGuy with ActiveModelAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.ActiveModelAdapter);
     store = testHelper.getStore();
-    make = function() {return testHelper.make.apply(testHelper,arguments)}
+    make = function() {return FactoryGuy.make.apply(FactoryGuy,arguments)}
   },
   teardown: function() {
     testHelper.teardown();
@@ -35,11 +35,11 @@ test("#resetModels clears the store of models, and resets the model definition",
 });
 
 
-module('DS.Store#makeFixture with ActiveModelAdapter', {
+module('#make with ActiveModelAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.ActiveModelAdapter);
     store = testHelper.getStore();
-    make = function() {return testHelper.make.apply(testHelper,arguments)}
+    make = function() {return FactoryGuy.make.apply(FactoryGuy,arguments)}
   },
   teardown: function() {
     Em.run(function() { testHelper.teardown(); });
@@ -287,7 +287,7 @@ test("with (nested json fixture) belongsTo has a hasMany association which has a
 });
 
 
-module('DS.Store#makeList with ActiveModelAdapter', {
+module('#makeList with ActiveModelAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.ActiveModelAdapter);
     store = testHelper.getStore();
@@ -299,7 +299,7 @@ module('DS.Store#makeList with ActiveModelAdapter', {
 
 
 test("creates list of DS.Model instances", function() {
-  var users = store.makeList('user', 2);
+  var users = FactoryGuy.makeList('user', 2);
   equal(users.length, 2);
   ok(users[0] instanceof DS.Model == true);
 
@@ -308,3 +308,15 @@ test("creates list of DS.Model instances", function() {
   ok(storeUsers[1] == users[1]);
 });
 
+test("handles trait arguments", function() {
+  var users = FactoryGuy.makeList('user', 2, 'with_hats');
+  equal(users.length, 2);
+  equal(users[0].get('hats.length') == 2, true);
+});
+
+test("handles traits and optional fixture arguments", function() {
+  var users = FactoryGuy.makeList('user', 2, 'with_hats', {name: 'Bob'});
+  equal(users[0].get('name'), 'Bob');
+  equal(users[0].get('hats.length') == 2, true);
+});
+

data/tests/factory_guy_test.js

@@ -242,7 +242,6 @@ module('FactoryGuy with DS.FixtureAdapter', {
 
 
 asyncTest("#make loads the fixture in the store and returns an object", function() {
-  FactoryGuy.setStore(store);
   var user = FactoryGuy.make('user');
   ok(user instanceof Object )
   store.find('user', user.id).then(function(u){

data/tests/factory_guy_test_mixin_test.js

@@ -54,6 +54,20 @@ asyncTest("#handleCreate the basic", function() {
 });
 
 
+/////// handleFindQuery //////////
+
+asyncTest("#handleFindQuery", function() {
+  var users = FactoryGuy.buildList('user', 2);
+  testHelper.handleFindQuery('user', ['name'], users);
+
+  store.findQuery('user', {name: 'Bob'}).then(function (users) {
+    equal(users.get('length'), 2)
+    equal(users.get('firstObject.name'), 'User1')
+    equal(users.get('lastObject.name'), 'User2')
+    start();
+  })
+});
+
 
 /////// handleFindMany //////////
 
@@ -376,3 +390,5 @@ asyncTest("#handleDelete failure case", function() {
     }
   );
 });
+
+

data/tests/rest_adapter_factory_test.js

@@ -4,7 +4,7 @@ module('FactoryGuy with DS.RESTAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.RESTAdapter);
     store = testHelper.getStore();
-    make = function() {return testHelper.make.apply(testHelper,arguments)}
+    make = function() {return FactoryGuy.make.apply(FactoryGuy,arguments)}
   },
   teardown: function() {
     Em.run(function() { testHelper.teardown(); });
@@ -34,11 +34,11 @@ test("#resetModels clears the store of models, and resets the model definition",
 });
 
 
-module('DS.Store#makeFixture with RestAdapter', {
+module('#make with RestAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.RESTAdapter);
     store = testHelper.getStore();
-    make = function() {return testHelper.make.apply(testHelper,arguments)}
+    make = function() {return FactoryGuy.make.apply(FactoryGuy,arguments)}
   },
   teardown: function() {
     Em.run(function() { testHelper.teardown(); });
@@ -279,7 +279,7 @@ test("with (nested json fixture) belongsTo has a hasMany association which has a
 });
 
 
-module('DS.Store#makeList with DS.RESTAdapter', {
+module('#makeList with DS.RESTAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.RESTAdapter);
     store = testHelper.getStore();
@@ -291,16 +291,24 @@ module('DS.Store#makeList with DS.RESTAdapter', {
 
 
 test("creates list of DS.Model instances", function() {
-  var users = store.makeList('user', 2);
-  ok(users.length == 2);
+  var users = FactoryGuy.makeList('user', 2);
+  equal(users.length, 2);
   ok(users[0] instanceof DS.Model == true);
-});
-
-
-test("creates records in the store", function() {
-  var users = store.makeList('user', 2);
 
   var storeUsers = store.all('user').get('content');
   ok(storeUsers[0] == users[0]);
   ok(storeUsers[1] == users[1]);
-});
+});
+
+test("handles accept traits", function() {
+  var users = FactoryGuy.makeList('user', 2, 'with_hats');
+  equal(users.length, 2);
+  equal(users[0].get('hats.length') == 2, true);
+});
+
+test("handles accept traits and optional fixture arguments", function() {
+  var users = FactoryGuy.makeList('user', 2, 'with_hats', {name: 'Bob'});
+  equal(users[0].get('name'), 'Bob');
+  equal(users[0].get('hats.length') == 2, true);
+});
+

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -242,25 +242,13 @@ var FactoryGuy = {
    */
   isAttributeRelationship: function(typeName, attribute) {
     if (!this.store) {
-      console.log("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures")
+      Ember.debug("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures")
       // The legacy value was true.
       return true;
     }
     var model = this.store.modelFor(typeName);
     return !!model.typeForRelationship(attribute);
   },
-  /**
-   Make new fixture and save to store. Proxy to store#makeFixture method
-
-   @param {String} name  fixture name
-   @param {String} trait  optional trait names ( one or more )
-   @param {Object} opts  optional fixture options that will override default fixture values
-   @returns {Object|DS.Model} json or record depending on the adapter type
-   */
-  make: function() {
-    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", this.store);
-    return this.store.makeFixture.apply(this.store,arguments);
-  },
   /**
    Used in model definitions to declare use of a sequence. For example:
 
@@ -328,7 +316,7 @@ var FactoryGuy = {
     };
   },
   association: function (fixtureName, opts) {
-    console.log('DEPRECATION Warning: use FactoryGuy.belongsTo instead');
+    Ember.deprecate('DEPRECATION Warning: use FactoryGuy.belongsTo instead');
     return this.belongsTo(fixtureName, opts);
   },
   /**
@@ -455,7 +443,53 @@ var FactoryGuy = {
     }
     return definition.buildList(name, number, traits, opts);
   },
+  /**
+   Make new fixture and save to store.
+
+   @param {String} name  fixture name
+   @param {String} trait  optional trait names ( one or more )
+   @param {Object} options  optional fixture options that will override default fixture values
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
+  make: function() {
+    var store = this.store;
+    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", store);
+
+    var fixture = this.build.apply(this, arguments);
+    var name = arguments[0];
+    var modelName = this.lookupModelForFixtureName(name);
+    var modelType = store.modelFor(modelName);
+
+    if (store.usingFixtureAdapter()) {
+      store.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
+      return this.pushFixture(modelType, fixture);
+    } else {
+      return store.makeModel(modelType, fixture);
+    }
+  },
+  /**
+   Make a list of Fixtures
 
+   @param {String} name name of fixture
+   @param {Number} number number to create
+   @param {String} trait  optional trait names ( one or more )
+   @param {Object} options  optional fixture options that will override default fixture values
+   @returns {Array} list of json fixtures or records depending on the adapter type
+   */
+  makeList: function() {
+    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", this.store);
+
+    var arr = [];
+    var args = Array.prototype.slice.call(arguments);
+    Ember.assert("makeList needs at least 2 arguments, a name and a number",args.length >= 2);
+    var number = args.splice(1,1)[0];
+    Ember.assert("Second argument to makeList should be a number (of fixtures to make.)",typeof number == 'number');
+
+    for (var i = 0; i < number; i++) {
+      arr.push(this.make.apply(this, args));
+    }
+    return arr;
+  },
   /**
    Clear model instances from FIXTURES array, and from store cache.
    Reset the id sequence for the models back to zero.
@@ -543,30 +577,30 @@ var FactoryGuy = {
       return adapter instanceof DS.FixtureAdapter;
     },
     /**
-     Make new fixture and save to store. If the store is using FixtureAdapter,
-     will push to FIXTURE array, otherwise will use push method on adapter to load
-     the record into the store
-
-     @param {String} name  fixture name
-     @param {String} trait  optional trait names ( one or more )
-     @param {Object} opts  optional fixture options that will override default fixture values
-     @returns {Object|DS.Model} json or record depending on the adapter type
+      Deprecated in favor of FactoryGuy.make
      */
     makeFixture: function () {
-      var store = this;
-      var fixture = FactoryGuy.build.apply(FactoryGuy, arguments);
-      var name = arguments[0];
-      var modelName = FactoryGuy.lookupModelForFixtureName(name);
-      var modelType = store.modelFor(modelName);
-      if (this.usingFixtureAdapter()) {
-        this.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
-        return FactoryGuy.pushFixture(modelType, fixture);
-      } else {
-        return store.makeModel(modelType, fixture);
-      }
+      Ember.deprecate('DEPRECATION Warning: use FactoryGuy.make instead');
+      FactoryGuy.make.call(FactoryGuy, arguments)
+    },
+    /**
+      Deprecated in favor of FactoryGuy.makeList
+     */
+    makeList: function () {
+      Ember.deprecate('DEPRECATION Warning: use FactoryGuy.makeList instead');
+      FactoryGuy.makeList.call(FactoryGuy, arguments)
     },
+    /**
+     * Most of the work of making the model from the json fixture is going on here.
+     * @param modelType
+     * @param fixture
+     * @returns {*}
+     */
     makeModel: function (modelType, fixture) {
-      var store = this, modelName = store.modelFor(modelType).typeKey, model;
+      var store = this,
+          modelName = store.modelFor(modelType).typeKey,
+          model;
+
       Em.run(function () {
         store.findEmbeddedAssociationsForRESTAdapter(modelType, fixture);
         if (fixture.type) {
@@ -580,22 +614,6 @@ var FactoryGuy = {
       });
       return model;
     },
-    /**
-     Make a list of Fixtures
-
-     @param {String} name name of fixture
-     @param {Number} number number to create
-     @param {Object} options fixture options
-     @returns {Array} list of json fixtures or records depending on the adapter type
-     */
-    makeList: function () {
-      var arr = [];
-      var number = arguments[1];
-      for (var i = 0; i < number; i++) {
-        arr.push(this.makeFixture.apply(this, arguments));
-      }
-      return arr;
-    },
     /**
      Set the hasMany and belongsTo associations for FixtureAdapter.
 
@@ -812,11 +830,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
   /**
-   Make new fixture and save to store. Proxy to store#makeFixture method
+   Make new fixture and save to store. Proxy to FactoryGuy#make method
    */
   make: function () {
-    var store = this.getStore();
-    return store.makeFixture.apply(store, arguments);
+    return FactoryGuy.make.apply(FactoryGuy, arguments);
   },
   getStore: function () {
     return this.get('container').lookup('store:main');
@@ -837,6 +854,9 @@ var FactoryGuyTestMixin = Em.Mixin.create({
       type: options.type || 'GET',
       status: options.status || 200
     };
+    if (options.urlParams) {
+      request.urlParams = options.urlParams;
+    }
     if (options.data) {
       request.data = options.data;
     }
@@ -863,9 +883,8 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {Object} opts  optional fixture options
    */
   handleFindMany: function () {
-    var store = this.getStore();
     // make the records and load them in the store
-    store.makeList.apply(store, arguments);
+    FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = {};
@@ -873,7 +892,35 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     // mock the ajax call, but return nothing, since the records will be
     // retrieved from the store where they were just loaded above
-    this.stubEndpointForHttpRequest(url, responseJson, { type: 'GET' });
+    this.stubEndpointForHttpRequest(url, responseJson);
+  },
+  /**
+   Handling ajax GET for finding all records for a type of model with query parameters.
+
+   ```js
+     // First build json for the instances you want 'returned' in your query.
+     var usersJson = FactoryGuy.buildList('user', 2);
+
+     // Pass in the parameters you will search on ( in this case 'name' and 'age' ) as an array,
+     // in the second argument.
+     testHelper.handleFindQuery('user', ['name', 'age'], usersJson);
+
+     store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
+        /// userInstances were created from the usersJson that you passed in
+     })
+   ```
+
+   The model instances will be created from the json you have passed in.
+
+   @param {String} modelName  name of the mode like 'user' for User model type
+   @param {String} searchParams  the parameters that will be queried
+   @param {Object} json   fixture json used to build the resulting modelType instances
+   */
+  handleFindQuery: function (modelName, searchParams, json) {
+    var responseJson = {};
+    responseJson[modelName.pluralize()] = json;
+    var url = this.buildURL(modelName);
+    this.stubEndpointForHttpRequest(url, responseJson, {urlParams: searchParams});
   },
   /**
    Handling ajax POST ( create record ) for a model. You can mock