ember-data-factory-guy 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e79cf8c600cf6d977adb4d9c988e0d31486785a
-  data.tar.gz: 64dd2732df1804268becf7d76c3f3c593d05be12
+  metadata.gz: e855e2ca1b850446f44ca658109ecb36dadee68d
+  data.tar.gz: 45a768f6054ac593b17264a108dbf4bf7d576fa3
 SHA512:
-  metadata.gz: d3b8ab0f269111f6b6583e4cae4936e3e7b3f055a1ae56bb2128494d61729790172fe6f5768f94f6a810077918fdfb9adf34502d5dc391ff07464e19c767ce25
-  data.tar.gz: f2dba9d3a2e780cd58afadf3f32c913924a53e927c7c36886f8906116dc6497ffcdc39f80c437ff6920ff50406a31f6bd035feb7f0f7a89a9b246a36044a3d7d
+  metadata.gz: 27d190e0cb7914401149537061468ad75398c39618620d61360ae1819db71bf881c42aa0472bbff30900a2b5efee76396459720f8685717bf3e54fff99b5cade
+  data.tar.gz: 90e4cb0bc2b6613363aa8f0f0dbb13436367cf800f6cb2876429b94b9e5599c1302c51578997fa4ebf7d77498cf39725fe4934d35575cd77d809e90018785b8e

data/bower.json

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

data/dist/amd/factory-guy.js

@@ -98,8 +98,9 @@ var ModelDefinition = function (model, config) {
         // If it's an object and it's a model association attribute, build the json
         // for the association and replace the attribute with that json
         if (FactoryGuy.getStore()) {
-          if (FactoryGuy.isAttributeRelationship(this.model, attribute)) {
-            fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+          var relationship = FactoryGuy.getAttributeRelationship(this.model, attribute);
+          if (relationship) {
+            fixture[attribute] = FactoryGuy.build(relationship.typeKey, fixture[attribute]);
           }
         } else {
           // For legacy reasons, if the store is not set in FactoryGuy, keep
@@ -222,11 +223,7 @@ var FactoryGuy = {
    @param {Object} config your model definition
    */
   define: function (model, config) {
-    if (this.modelDefinitions[model]) {
-      this.modelDefinitions[model].merge(config);
-    } else {
-      this.modelDefinitions[model] = new ModelDefinition(model, config);
-    }
+    this.modelDefinitions[model] = new ModelDefinition(model, config);
   },
   /**
    Setting the store so FactoryGuy can do some model introspection.
@@ -245,14 +242,15 @@ var FactoryGuy = {
    @param {String} attribute  attribute you want to check
    @returns {Boolean} true if the attribute is a relationship, false if not
    */
-  isAttributeRelationship: function(typeName, attribute) {
+  getAttributeRelationship: function(typeName, attribute) {
     if (!this.store) {
       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);
+    var relationship = model.typeForRelationship(attribute);
+    return !!relationship ? relationship : null;
   },
   /**
    Used in model definitions to declare use of a sequence. For example:
@@ -575,6 +573,7 @@ var FactoryGuy = {
 };
 
 var MockCreateRequest = function(url, store, modelName, options) {
+  var status = options.status;
   var succeed = options.succeed === undefined ? true : options.succeed;
   var matchArgs = options.match;
   var returnArgs = options.returns;
@@ -584,6 +583,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
   this.calculate = function() {
     if (matchArgs) {
+      // although not ideal to create and delete a record, using this technique to
+      // get properly serialized payload.
+      // TODO: Need to figure out how to use serializer without a record
       var tmpRecord = store.createRecord(modelName, matchArgs);
       expectedRequest = tmpRecord.serialize(matchArgs);
       tmpRecord.deleteRecord();
@@ -591,12 +593,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
     if (succeed) {
       var definition = FactoryGuy.modelDefinitions[modelName];
-      if (responseJson[modelName]) {
-        // already calculated once, keep the same id
-        responseJson[modelName] = $.extend({id: responseJson[modelName].id}, matchArgs, returnArgs);
-      } else {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, matchArgs, returnArgs);
-      }
+      // If already calculated once, keep the same id
+      var id = responseJson[modelName] ? responseJson[modelName].id : definition.nextId();
+      responseJson[modelName] = $.extend({id: id}, matchArgs, returnArgs);
       // Remove belongsTo associations since they will already be set when you called
       // createRecord, so they don't need to be returned.
       Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
@@ -604,84 +603,96 @@ var MockCreateRequest = function(url, store, modelName, options) {
           delete responseJson[modelName][relationship.key];
         }
       })
+    } else {
+      this.andFail(options);
     }
-
-  }
+  };
 
   this.match = function(matches) {
     matchArgs = matches;
     this.calculate();
     return this;
-  }
+  };
 
   this.andReturn = function(returns) {
     returnArgs = returns;
     this.calculate();
     return this;
-  }
+  };
 
-  this.andFail = function() {
-    succeed = false;
-    return this;
-  }
+  this.andFail = function(options) {
+    options = options || {}
+ 		succeed = false;
+ 		status = options.status || 500;
+    if (options.response) {
+      responseJson = options.response;
+    }
+ 		return this;
+ 	};
 
   this.handler = function(settings) {
-    if (settings.url != url || settings.type != 'POST') { return false}
-
-    if (matchArgs) {
-      var requestData = JSON.parse(settings.data)[modelName];
-      for (var attribute in expectedRequest) {
-        if (expectedRequest[attribute] &&
-            requestData[attribute] != expectedRequest[attribute]) {
-          return false
+    if (succeed) {
+      if (matchArgs) {
+        var requestData = JSON.parse(settings.data)[modelName];
+        for (var attribute in expectedRequest) {
+          if (expectedRequest[attribute] &&
+              requestData[attribute] != expectedRequest[attribute]) {
+            return false;
+          }
         }
       }
+      this.status = 200;
+    } else {
+      this.status = status;
     }
-    var responseStatus = (succeed ? 200: 500);
-    return {
-      responseText: responseJson,
-      status: responseStatus
-    };
-  }
+    this.responseText = responseJson;
+  };
 
   this.calculate();
 
-  $.mockjax(this.handler);
+  var requestConfig = {
+ 		url: url,
+ 		dataType: 'json',
+ 		type: 'POST',
+ 		response: this.handler
+ 	};
+
+  $.mockjax(requestConfig);
 };
 
 var MockUpdateRequest = function(url, model, mapFind, options) {
 	var status = options.status || 200;
 	var succeed = true;
-    var response = null;
+  var response = null;
 
-    if ('succeed' in options) {
-        succeed = options.succeed;
-    }
+  if ('succeed' in options) {
+    succeed = options.succeed;
+  }
 
-    if ('response' in options) {
-        response = options.response;
-    }
+  if ('response' in options) {
+    response = options.response;
+  }
 
 	this.andSucceed = function(options) {
-        succeed = true;
+    succeed = true;
 		return this;
 	};
 
 	this.andFail = function(options) {
 		succeed = false;
 		status = options.status || 500;
-        if ('response' in options) {
-            response = options.response;
-        }
+    if ('response' in options) {
+      response = options.response;
+    }
 		return this;
 	};
 
 	this.handler = function(settings) {
 		if (!succeed) {
 			this.status = status;
-            if (response !== null) {
-                this.responseText = response;
-            }
+      if (response !== null) {
+        this.responseText = response;
+      }
 		} else {
 			var json = model.toJSON({includeId: true});
 			this.responseText = mapFind(model.constructor.typeKey, json);

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

@@ -93,8 +93,9 @@ var ModelDefinition = function (model, config) {
         // If it's an object and it's a model association attribute, build the json
         // for the association and replace the attribute with that json
         if (FactoryGuy.getStore()) {
-          if (FactoryGuy.isAttributeRelationship(this.model, attribute)) {
-            fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+          var relationship = FactoryGuy.getAttributeRelationship(this.model, attribute);
+          if (relationship) {
+            fixture[attribute] = FactoryGuy.build(relationship.typeKey, fixture[attribute]);
           }
         } else {
           // For legacy reasons, if the store is not set in FactoryGuy, keep
@@ -217,11 +218,7 @@ var FactoryGuy = {
    @param {Object} config your model definition
    */
   define: function (model, config) {
-    if (this.modelDefinitions[model]) {
-      this.modelDefinitions[model].merge(config);
-    } else {
-      this.modelDefinitions[model] = new ModelDefinition(model, config);
-    }
+    this.modelDefinitions[model] = new ModelDefinition(model, config);
   },
   /**
    Setting the store so FactoryGuy can do some model introspection.
@@ -240,14 +237,15 @@ var FactoryGuy = {
    @param {String} attribute  attribute you want to check
    @returns {Boolean} true if the attribute is a relationship, false if not
    */
-  isAttributeRelationship: function(typeName, attribute) {
+  getAttributeRelationship: function(typeName, attribute) {
     if (!this.store) {
       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);
+    var relationship = model.typeForRelationship(attribute);
+    return !!relationship ? relationship : null;
   },
   /**
    Used in model definitions to declare use of a sequence. For example:
@@ -570,6 +568,7 @@ var FactoryGuy = {
 };
 
 var MockCreateRequest = function(url, store, modelName, options) {
+  var status = options.status;
   var succeed = options.succeed === undefined ? true : options.succeed;
   var matchArgs = options.match;
   var returnArgs = options.returns;
@@ -579,6 +578,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
   this.calculate = function() {
     if (matchArgs) {
+      // although not ideal to create and delete a record, using this technique to
+      // get properly serialized payload.
+      // TODO: Need to figure out how to use serializer without a record
       var tmpRecord = store.createRecord(modelName, matchArgs);
       expectedRequest = tmpRecord.serialize(matchArgs);
       tmpRecord.deleteRecord();
@@ -586,12 +588,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
     if (succeed) {
       var definition = FactoryGuy.modelDefinitions[modelName];
-      if (responseJson[modelName]) {
-        // already calculated once, keep the same id
-        responseJson[modelName] = $.extend({id: responseJson[modelName].id}, matchArgs, returnArgs);
-      } else {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, matchArgs, returnArgs);
-      }
+      // If already calculated once, keep the same id
+      var id = responseJson[modelName] ? responseJson[modelName].id : definition.nextId();
+      responseJson[modelName] = $.extend({id: id}, matchArgs, returnArgs);
       // Remove belongsTo associations since they will already be set when you called
       // createRecord, so they don't need to be returned.
       Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
@@ -599,84 +598,96 @@ var MockCreateRequest = function(url, store, modelName, options) {
           delete responseJson[modelName][relationship.key];
         }
       })
+    } else {
+      this.andFail(options);
     }
-
-  }
+  };
 
   this.match = function(matches) {
     matchArgs = matches;
     this.calculate();
     return this;
-  }
+  };
 
   this.andReturn = function(returns) {
     returnArgs = returns;
     this.calculate();
     return this;
-  }
+  };
 
-  this.andFail = function() {
-    succeed = false;
-    return this;
-  }
+  this.andFail = function(options) {
+    options = options || {}
+ 		succeed = false;
+ 		status = options.status || 500;
+    if (options.response) {
+      responseJson = options.response;
+    }
+ 		return this;
+ 	};
 
   this.handler = function(settings) {
-    if (settings.url != url || settings.type != 'POST') { return false}
-
-    if (matchArgs) {
-      var requestData = JSON.parse(settings.data)[modelName];
-      for (var attribute in expectedRequest) {
-        if (expectedRequest[attribute] &&
-            requestData[attribute] != expectedRequest[attribute]) {
-          return false
+    if (succeed) {
+      if (matchArgs) {
+        var requestData = JSON.parse(settings.data)[modelName];
+        for (var attribute in expectedRequest) {
+          if (expectedRequest[attribute] &&
+              requestData[attribute] != expectedRequest[attribute]) {
+            return false;
+          }
         }
       }
+      this.status = 200;
+    } else {
+      this.status = status;
     }
-    var responseStatus = (succeed ? 200: 500);
-    return {
-      responseText: responseJson,
-      status: responseStatus
-    };
-  }
+    this.responseText = responseJson;
+  };
 
   this.calculate();
 
-  $.mockjax(this.handler);
+  var requestConfig = {
+ 		url: url,
+ 		dataType: 'json',
+ 		type: 'POST',
+ 		response: this.handler
+ 	};
+
+  $.mockjax(requestConfig);
 };
 
 var MockUpdateRequest = function(url, model, mapFind, options) {
 	var status = options.status || 200;
 	var succeed = true;
-    var response = null;
+  var response = null;
 
-    if ('succeed' in options) {
-        succeed = options.succeed;
-    }
+  if ('succeed' in options) {
+    succeed = options.succeed;
+  }
 
-    if ('response' in options) {
-        response = options.response;
-    }
+  if ('response' in options) {
+    response = options.response;
+  }
 
 	this.andSucceed = function(options) {
-        succeed = true;
+    succeed = true;
 		return this;
 	};
 
 	this.andFail = function(options) {
 		succeed = false;
 		status = options.status || 500;
-        if ('response' in options) {
-            response = options.response;
-        }
+    if ('response' in options) {
+      response = options.response;
+    }
 		return this;
 	};
 
 	this.handler = function(settings) {
 		if (!succeed) {
 			this.status = status;
-            if (response !== null) {
-                this.responseText = response;
-            }
+      if (response !== null) {
+        this.responseText = response;
+      }
 		} else {
 			var json = model.toJSON({includeId: true});
 			this.responseText = mapFind(model.constructor.typeKey, json);

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){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);fixture=FactoryGuy.pushFixture(modelType,fixture);store.loadModelForFixtureAdapter(modelType,fixture);return 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={}}}};var MockCreateRequest=function(url,store,modelName,options){var succeed=options.succeed===undefined?true:options.succeed;var matchArgs=options.match;var returnArgs=options.returns;var responseJson={};var expectedRequest={};var modelType=store.modelFor(modelName);this.calculate=function(){if(matchArgs){var tmpRecord=store.createRecord(modelName,matchArgs);expectedRequest=tmpRecord.serialize(matchArgs);tmpRecord.deleteRecord()}if(succeed){var definition=FactoryGuy.modelDefinitions[modelName];if(responseJson[modelName]){responseJson[modelName]=$.extend({id:responseJson[modelName].id},matchArgs,returnArgs)}else{responseJson[modelName]=$.extend({id:definition.nextId()},matchArgs,returnArgs)}Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}};this.match=function(matches){matchArgs=matches;this.calculate();return this};this.andReturn=function(returns){returnArgs=returns;this.calculate();return this};this.andFail=function(){succeed=false;return this};this.handler=function(settings){if(settings.url!=url||settings.type!="POST"){return false}if(matchArgs){var requestData=JSON.parse(settings.data)[modelName];for(var attribute in expectedRequest){if(expectedRequest[attribute]&&requestData[attribute]!=expectedRequest[attribute]){return false}}}var responseStatus=succeed?200:500;return{responseText:responseJson,status:responseStatus}};this.calculate();$.mockjax(this.handler)};var MockUpdateRequest=function(url,model,mapFind,options){var status=options.status||200;var succeed=true;var response=null;if("succeed"in options){succeed=options.succeed}if("response"in options){response=options.response}this.andSucceed=function(options){succeed=true;return this};this.andFail=function(options){succeed=false;status=options.status||500;if("response"in options){response=options.response}return this};this.handler=function(settings){if(!succeed){this.status=status;if(response!==null){this.responseText=response}}else{var json=model.toJSON({includeId:true});this.responseText=mapFind(model.constructor.typeKey,json);this.status=200}};var requestConfig={url:url,dataType:"json",type:"PUT",response:this.handler};$.mockjax(requestConfig)};(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){var hasManyRelation,belongsToRecord;if(relationship.kind=="hasMany"){hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){FactoryGuy.pushFixture(relationship.type,object);id=object.id;hasManyRelation[index]=id}var hasManyfixtures=adapter.fixturesForType(relationship.type);var hasManyFixture=adapter.findFixtureById(hasManyfixtures,id);hasManyFixture[modelName]=fixture.id;self.loadModelForFixtureAdapter(relationship.type,hasManyFixture)})}}if(relationship.kind=="belongsTo"){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);self.loadModelForFixtureAdapter(relationship.type,belongsTofixture)}}})},loadModelForFixtureAdapter:function(modelType,fixture){var storeModel=this.getById(modelType,fixture.id),that=this;if(!Ember.isPresent(storeModel)||storeModel.get("isEmpty")){Ember.run(function(){var dup=Ember.copy(fixture,true);that.push(modelType,fixture);Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(fixture[relationship.key]){fixture[relationship.key]=dup[relationship.key]}})})}},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){var typeName,model;if(this.usingFixtureAdapter()){if(Ember.typeOf(type)==="string"&&Ember.isPresent(payload)&&Ember.isPresent(payload.id)){model=this.modelFor(type);FactoryGuy.pushFixture(model,payload);this.push(model,Ember.copy(payload,true))}else if(Ember.typeOf(type)==="object"||Ember.typeOf(payload)==="object"){if(Ember.isBlank(payload)){payload=type}for(var prop in payload){typeName=Ember.String.camelize(Ember.String.singularize(prop));model=this.modelFor(typeName);this.pushMany(model,Ember.makeArray(Ember.copy(payload[prop],true)));Ember.ArrayPolyfills.forEach.call(Ember.makeArray(payload[prop]),function(hash){FactoryGuy.pushFixture(model,hash)},this)}}else{throw new Ember.Error("Assertion Failed: You cannot use `store#pushPayload` with this method signature pushPayload("+type+","+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)},mapFindAll:function(modelName,json){var responseJson={};responseJson[modelName.pluralize()]=json;return responseJson},mapFind:function(modelName,json){var responseJson={};responseJson[modelName.pluralize()]=json;return responseJson},handleFindAll:function(){var records=FactoryGuy.makeList.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var json=records.map(function(record){return record.toJSON({includeId:true})});var responseJson=this.mapFindAll(modelName,json);var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson)},handleFindMany:function(){Ember.deprecate("DEPRECATION Warning: use handleFindAll instead");this.handleFindAll.apply(this,arguments)},handleFind:function(){var args=Array.prototype.slice.call(arguments);Ember.assert("To handleFindOne pass in a model instance or a type and model options",args.length>0);var record,modelName;if(args[0]instanceof DS.Model){record=args[0];modelName=record.constructor.typeKey}else{record=FactoryGuy.make.apply(FactoryGuy,arguments);var name=arguments[0];modelName=FactoryGuy.lookupModelForFixtureName(name)}var json=record.toJSON({includeId:true});var responseJson=this.mapFind(modelName,json);var url=this.buildURL(modelName,record.id);this.stubEndpointForHttpRequest(url,responseJson)},handleFindOne:function(){this.handleFind.apply(this,arguments)},handleFindQuery:function(modelName,searchParams,records){Ember.assert("The second argument of searchParams must be an array",Em.typeOf(searchParams)=="array");if(records){Ember.assert("The third argument ( records ) must be an array - found type:"+Em.typeOf(records),Em.typeOf(records)=="array")}else{records=[]}var json=records.map(function(record){return record.toJSON({includeId:true})});var responseJson=this.mapFindAll(modelName,json);var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{urlParams:searchParams})},handleCreate:function(modelName,options){var url=this.buildURL(modelName);var store=this.getStore();var opts=options===undefined?{}:options;return new MockCreateRequest(url,store,modelName,opts)},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 options={};if(args.length>1&&typeof args[args.length-1]==="object"){options=args.pop()}var model,type,id;var store=this.getStore();if(args[0]instanceof DS.Model){model=args[0];id=model.id;type=model.constructor.typeKey}else if(typeof args[0]=="string"&&typeof parseInt(args[1])=="number"){type=args[0];id=args[1];model=store.getById(type,id)}Ember.assert("To handleUpdate pass in a model instance or a type and an id",type&&id);var url=this.buildURL(type,id);return new MockUpdateRequest(url,model,this.mapFind,options)},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()){var relationship=FactoryGuy.getAttributeRelationship(this.model,attribute);if(relationship){fixture[attribute]=FactoryGuy.build(relationship.typeKey,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){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},getAttributeRelationship: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);var relationship=model.typeForRelationship(attribute);return!!relationship?relationship:null},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);fixture=FactoryGuy.pushFixture(modelType,fixture);store.loadModelForFixtureAdapter(modelType,fixture);return 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={}}}};var MockCreateRequest=function(url,store,modelName,options){var status=options.status;var succeed=options.succeed===undefined?true:options.succeed;var matchArgs=options.match;var returnArgs=options.returns;var responseJson={};var expectedRequest={};var modelType=store.modelFor(modelName);this.calculate=function(){if(matchArgs){var tmpRecord=store.createRecord(modelName,matchArgs);expectedRequest=tmpRecord.serialize(matchArgs);tmpRecord.deleteRecord()}if(succeed){var definition=FactoryGuy.modelDefinitions[modelName];var id=responseJson[modelName]?responseJson[modelName].id:definition.nextId();responseJson[modelName]=$.extend({id:id},matchArgs,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}else{this.andFail(options)}};this.match=function(matches){matchArgs=matches;this.calculate();return this};this.andReturn=function(returns){returnArgs=returns;this.calculate();return this};this.andFail=function(options){options=options||{};succeed=false;status=options.status||500;if(options.response){responseJson=options.response}return this};this.handler=function(settings){if(succeed){if(matchArgs){var requestData=JSON.parse(settings.data)[modelName];for(var attribute in expectedRequest){if(expectedRequest[attribute]&&requestData[attribute]!=expectedRequest[attribute]){return false}}}this.status=200}else{this.status=status}this.responseText=responseJson};this.calculate();var requestConfig={url:url,dataType:"json",type:"POST",response:this.handler};$.mockjax(requestConfig)};var MockUpdateRequest=function(url,model,mapFind,options){var status=options.status||200;var succeed=true;var response=null;if("succeed"in options){succeed=options.succeed}if("response"in options){response=options.response}this.andSucceed=function(options){succeed=true;return this};this.andFail=function(options){succeed=false;status=options.status||500;if("response"in options){response=options.response}return this};this.handler=function(settings){if(!succeed){this.status=status;if(response!==null){this.responseText=response}}else{var json=model.toJSON({includeId:true});this.responseText=mapFind(model.constructor.typeKey,json);this.status=200}};var requestConfig={url:url,dataType:"json",type:"PUT",response:this.handler};$.mockjax(requestConfig)};(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){var hasManyRelation,belongsToRecord;if(relationship.kind=="hasMany"){hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){FactoryGuy.pushFixture(relationship.type,object);id=object.id;hasManyRelation[index]=id}var hasManyfixtures=adapter.fixturesForType(relationship.type);var hasManyFixture=adapter.findFixtureById(hasManyfixtures,id);hasManyFixture[modelName]=fixture.id;self.loadModelForFixtureAdapter(relationship.type,hasManyFixture)})}}if(relationship.kind=="belongsTo"){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);self.loadModelForFixtureAdapter(relationship.type,belongsTofixture)}}})},loadModelForFixtureAdapter:function(modelType,fixture){var storeModel=this.getById(modelType,fixture.id),that=this;if(!Ember.isPresent(storeModel)||storeModel.get("isEmpty")){Ember.run(function(){var dup=Ember.copy(fixture,true);that.push(modelType,fixture);Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(fixture[relationship.key]){fixture[relationship.key]=dup[relationship.key]}})})}},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){var typeName,model;if(this.usingFixtureAdapter()){if(Ember.typeOf(type)==="string"&&Ember.isPresent(payload)&&Ember.isPresent(payload.id)){model=this.modelFor(type);FactoryGuy.pushFixture(model,payload);this.push(model,Ember.copy(payload,true))}else if(Ember.typeOf(type)==="object"||Ember.typeOf(payload)==="object"){if(Ember.isBlank(payload)){payload=type}for(var prop in payload){typeName=Ember.String.camelize(Ember.String.singularize(prop));model=this.modelFor(typeName);this.pushMany(model,Ember.makeArray(Ember.copy(payload[prop],true)));Ember.ArrayPolyfills.forEach.call(Ember.makeArray(payload[prop]),function(hash){FactoryGuy.pushFixture(model,hash)},this)}}else{throw new Ember.Error("Assertion Failed: You cannot use `store#pushPayload` with this method signature pushPayload("+type+","+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)},mapFindAll:function(modelName,json){var responseJson={};responseJson[modelName.pluralize()]=json;return responseJson},mapFind:function(modelName,json){var responseJson={};responseJson[modelName.pluralize()]=json;return responseJson},handleFindAll:function(){var records=FactoryGuy.makeList.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var json=records.map(function(record){return record.toJSON({includeId:true})});var responseJson=this.mapFindAll(modelName,json);var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson)},handleFindMany:function(){Ember.deprecate("DEPRECATION Warning: use handleFindAll instead");this.handleFindAll.apply(this,arguments)},handleFind:function(){var args=Array.prototype.slice.call(arguments);Ember.assert("To handleFindOne pass in a model instance or a type and model options",args.length>0);var record,modelName;if(args[0]instanceof DS.Model){record=args[0];modelName=record.constructor.typeKey}else{record=FactoryGuy.make.apply(FactoryGuy,arguments);var name=arguments[0];modelName=FactoryGuy.lookupModelForFixtureName(name)}var json=record.toJSON({includeId:true});var responseJson=this.mapFind(modelName,json);var url=this.buildURL(modelName,record.id);this.stubEndpointForHttpRequest(url,responseJson)},handleFindOne:function(){this.handleFind.apply(this,arguments)},handleFindQuery:function(modelName,searchParams,records){Ember.assert("The second argument of searchParams must be an array",Em.typeOf(searchParams)=="array");if(records){Ember.assert("The third argument ( records ) must be an array - found type:"+Em.typeOf(records),Em.typeOf(records)=="array")}else{records=[]}var json=records.map(function(record){return record.toJSON({includeId:true})});var responseJson=this.mapFindAll(modelName,json);var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{urlParams:searchParams})},handleCreate:function(modelName,options){var url=this.buildURL(modelName);var store=this.getStore();var opts=options===undefined?{}:options;return new MockCreateRequest(url,store,modelName,opts)},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 options={};if(args.length>1&&typeof args[args.length-1]==="object"){options=args.pop()}var model,type,id;var store=this.getStore();if(args[0]instanceof DS.Model){model=args[0];id=model.id;type=model.constructor.typeKey}else if(typeof args[0]=="string"&&typeof parseInt(args[1])=="number"){type=args[0];id=args[1];model=store.getById(type,id)}Ember.assert("To handleUpdate pass in a model instance or a type and an id",type&&id);var url=this.buildURL(type,id);return new MockUpdateRequest(url,model,this.mapFind,options)},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/package.json

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

data/src/factory_guy.js

@@ -39,11 +39,7 @@ var FactoryGuy = {
    @param {Object} config your model definition
    */
   define: function (model, config) {
-    if (this.modelDefinitions[model]) {
-      this.modelDefinitions[model].merge(config);
-    } else {
-      this.modelDefinitions[model] = new ModelDefinition(model, config);
-    }
+    this.modelDefinitions[model] = new ModelDefinition(model, config);
   },
   /**
    Setting the store so FactoryGuy can do some model introspection.
@@ -62,14 +58,15 @@ var FactoryGuy = {
    @param {String} attribute  attribute you want to check
    @returns {Boolean} true if the attribute is a relationship, false if not
    */
-  isAttributeRelationship: function(typeName, attribute) {
+  getAttributeRelationship: function(typeName, attribute) {
     if (!this.store) {
       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);
+    var relationship = model.typeForRelationship(attribute);
+    return !!relationship ? relationship : null;
   },
   /**
    Used in model definitions to declare use of a sequence. For example:

data/src/mock_create_request.js

@@ -1,4 +1,5 @@
 var MockCreateRequest = function(url, store, modelName, options) {
+  var status = options.status;
   var succeed = options.succeed === undefined ? true : options.succeed;
   var matchArgs = options.match;
   var returnArgs = options.returns;
@@ -8,6 +9,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
   this.calculate = function() {
     if (matchArgs) {
+      // although not ideal to create and delete a record, using this technique to
+      // get properly serialized payload.
+      // TODO: Need to figure out how to use serializer without a record
       var tmpRecord = store.createRecord(modelName, matchArgs);
       expectedRequest = tmpRecord.serialize(matchArgs);
       tmpRecord.deleteRecord();
@@ -15,12 +19,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
     if (succeed) {
       var definition = FactoryGuy.modelDefinitions[modelName];
-      if (responseJson[modelName]) {
-        // already calculated once, keep the same id
-        responseJson[modelName] = $.extend({id: responseJson[modelName].id}, matchArgs, returnArgs);
-      } else {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, matchArgs, returnArgs);
-      }
+      // If already calculated once, keep the same id
+      var id = responseJson[modelName] ? responseJson[modelName].id : definition.nextId();
+      responseJson[modelName] = $.extend({id: id}, matchArgs, returnArgs);
       // Remove belongsTo associations since they will already be set when you called
       // createRecord, so they don't need to be returned.
       Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
@@ -28,47 +29,59 @@ var MockCreateRequest = function(url, store, modelName, options) {
           delete responseJson[modelName][relationship.key];
         }
       })
+    } else {
+      this.andFail(options);
     }
-
-  }
+  };
 
   this.match = function(matches) {
     matchArgs = matches;
     this.calculate();
     return this;
-  }
+  };
 
   this.andReturn = function(returns) {
     returnArgs = returns;
     this.calculate();
     return this;
-  }
+  };
 
-  this.andFail = function() {
-    succeed = false;
-    return this;
-  }
+  this.andFail = function(options) {
+    options = options || {}
+ 		succeed = false;
+ 		status = options.status || 500;
+    if (options.response) {
+      responseJson = options.response;
+    }
+ 		return this;
+ 	};
 
   this.handler = function(settings) {
-    if (settings.url != url || settings.type != 'POST') { return false}
-
-    if (matchArgs) {
-      var requestData = JSON.parse(settings.data)[modelName];
-      for (var attribute in expectedRequest) {
-        if (expectedRequest[attribute] &&
-            requestData[attribute] != expectedRequest[attribute]) {
-          return false
+    if (succeed) {
+      if (matchArgs) {
+        var requestData = JSON.parse(settings.data)[modelName];
+        for (var attribute in expectedRequest) {
+          if (expectedRequest[attribute] &&
+              requestData[attribute] != expectedRequest[attribute]) {
+            return false;
+          }
         }
       }
+      this.status = 200;
+    } else {
+      this.status = status;
     }
-    var responseStatus = (succeed ? 200: 500);
-    return {
-      responseText: responseJson,
-      status: responseStatus
-    };
-  }
+    this.responseText = responseJson;
+  };
 
   this.calculate();
 
-  $.mockjax(this.handler);
+  var requestConfig = {
+ 		url: url,
+ 		dataType: 'json',
+ 		type: 'POST',
+ 		response: this.handler
+ 	};
+
+  $.mockjax(requestConfig);
 };

data/src/mock_update_request.js

@@ -1,36 +1,36 @@
 var MockUpdateRequest = function(url, model, mapFind, options) {
 	var status = options.status || 200;
 	var succeed = true;
-    var response = null;
+  var response = null;
 
-    if ('succeed' in options) {
-        succeed = options.succeed;
-    }
+  if ('succeed' in options) {
+    succeed = options.succeed;
+  }
 
-    if ('response' in options) {
-        response = options.response;
-    }
+  if ('response' in options) {
+    response = options.response;
+  }
 
 	this.andSucceed = function(options) {
-        succeed = true;
+    succeed = true;
 		return this;
 	};
 
 	this.andFail = function(options) {
 		succeed = false;
 		status = options.status || 500;
-        if ('response' in options) {
-            response = options.response;
-        }
+    if ('response' in options) {
+      response = options.response;
+    }
 		return this;
 	};
 
 	this.handler = function(settings) {
 		if (!succeed) {
 			this.status = status;
-            if (response !== null) {
-                this.responseText = response;
-            }
+      if (response !== null) {
+        this.responseText = response;
+      }
 		} else {
 			var json = model.toJSON({includeId: true});
 			this.responseText = mapFind(model.constructor.typeKey, json);

data/src/model_definition.js

@@ -72,8 +72,9 @@ var ModelDefinition = function (model, config) {
         // If it's an object and it's a model association attribute, build the json
         // for the association and replace the attribute with that json
         if (FactoryGuy.getStore()) {
-          if (FactoryGuy.isAttributeRelationship(this.model, attribute)) {
-            fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+          var relationship = FactoryGuy.getAttributeRelationship(this.model, attribute);
+          if (relationship) {
+            fixture[attribute] = FactoryGuy.build(relationship.typeKey, fixture[attribute]);
           }
         } else {
           // For legacy reasons, if the store is not set in FactoryGuy, keep

data/tests/factory_guy_test.js

@@ -195,12 +195,12 @@ test("#buildList creates list of fixtures", function() {
 });
 
 
-test("#isAttributeRelationship", function() {
+test("#getAttributeRelationship", function() {
   FactoryGuy.setStore(store);
   var typeName = 'user'
-  equal(FactoryGuy.isAttributeRelationship(typeName,'company'),true);
-  equal(FactoryGuy.isAttributeRelationship(typeName,'hats'),true);
-  equal(FactoryGuy.isAttributeRelationship(typeName,'name'),false);
+  equal(FactoryGuy.getAttributeRelationship(typeName,'company').typeKey,'company');
+  equal(FactoryGuy.getAttributeRelationship(typeName,'hats').typeKey,'hat');
+  equal(FactoryGuy.getAttributeRelationship(typeName,'name'),null);
 });
 
 

data/tests/factory_guy_test_mixin_test.js

@@ -403,6 +403,22 @@ asyncTest("#handleCreate failure", function() {
   });
 });
 
+asyncTest("#handleCreate failure with status code 422 and errors in response", function() {
+  Em.run(function() {
+    testHelper.handleCreate('profile', {succeed: false, status: 422, response: {errors: {description: ['bad']}} } )
+
+    store.createRecord('profile').save()
+      .then(
+        function() {},
+        function(reason) {
+          equal(reason.errors.description, ['bad']+'');
+          ok(true)
+          start();
+        }
+      )
+  });
+});
+
 
 asyncTest("#handleCreate match but still fail", function() {
   Em.run(function() {
@@ -543,7 +559,7 @@ asyncTest("#handleCreate failure with andFail method", function() {
 });
 
 
-asyncTest("#handleCreate match but still fail with chaining methods", function() {
+asyncTest("#handleCreate match but still fail with andFail method", function() {
   Em.run(function() {
     var description = "special description"
 
@@ -560,7 +576,21 @@ asyncTest("#handleCreate match but still fail with chaining methods", function()
   });
 });
 
+asyncTest("#handleCreate failure with status code 422 and errors in response with andFail method", function() {
+  Em.run(function() {
+    testHelper.handleCreate('profile').andFail({status: 422, response: {errors: {description: ['bad']}}});
 
+    store.createRecord('profile').save()
+      .then(
+        function() {},
+        function(reason) {
+          equal(reason.errors.description, ['bad']+'');
+          ok(true)
+          start();
+        }
+      )
+  });
+});
 
 
 

data/tests/index.html

@@ -27,11 +27,11 @@
 </head>
 <body>
 <div id="qunit"></div> <!-- QUnit fills this with results, etc -->
-<script src='active_model_adapter_factory_test.js'></script>
-<script src='rest_adapter_factory_test.js'></script>
+<!--<script src='active_model_adapter_factory_test.js'></script>-->
+<!--<script src='rest_adapter_factory_test.js'></script>-->
 <!--<script src='fixture_adapter_factory_test.js'></script>-->
-<script src='store_test.js'></script>
-<script src='factory_guy_test.js'></script>
+<!--<script src='store_test.js'></script>-->
+<!--<script src='factory_guy_test.js'></script>-->
 <script src='factory_guy_test_mixin_test.js'></script>
 <div id='qunit-fixture'>
 

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -93,8 +93,9 @@ var ModelDefinition = function (model, config) {
         // If it's an object and it's a model association attribute, build the json
         // for the association and replace the attribute with that json
         if (FactoryGuy.getStore()) {
-          if (FactoryGuy.isAttributeRelationship(this.model, attribute)) {
-            fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+          var relationship = FactoryGuy.getAttributeRelationship(this.model, attribute);
+          if (relationship) {
+            fixture[attribute] = FactoryGuy.build(relationship.typeKey, fixture[attribute]);
           }
         } else {
           // For legacy reasons, if the store is not set in FactoryGuy, keep
@@ -217,11 +218,7 @@ var FactoryGuy = {
    @param {Object} config your model definition
    */
   define: function (model, config) {
-    if (this.modelDefinitions[model]) {
-      this.modelDefinitions[model].merge(config);
-    } else {
-      this.modelDefinitions[model] = new ModelDefinition(model, config);
-    }
+    this.modelDefinitions[model] = new ModelDefinition(model, config);
   },
   /**
    Setting the store so FactoryGuy can do some model introspection.
@@ -240,14 +237,15 @@ var FactoryGuy = {
    @param {String} attribute  attribute you want to check
    @returns {Boolean} true if the attribute is a relationship, false if not
    */
-  isAttributeRelationship: function(typeName, attribute) {
+  getAttributeRelationship: function(typeName, attribute) {
     if (!this.store) {
       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);
+    var relationship = model.typeForRelationship(attribute);
+    return !!relationship ? relationship : null;
   },
   /**
    Used in model definitions to declare use of a sequence. For example:
@@ -570,6 +568,7 @@ var FactoryGuy = {
 };
 
 var MockCreateRequest = function(url, store, modelName, options) {
+  var status = options.status;
   var succeed = options.succeed === undefined ? true : options.succeed;
   var matchArgs = options.match;
   var returnArgs = options.returns;
@@ -579,6 +578,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
   this.calculate = function() {
     if (matchArgs) {
+      // although not ideal to create and delete a record, using this technique to
+      // get properly serialized payload.
+      // TODO: Need to figure out how to use serializer without a record
       var tmpRecord = store.createRecord(modelName, matchArgs);
       expectedRequest = tmpRecord.serialize(matchArgs);
       tmpRecord.deleteRecord();
@@ -586,12 +588,9 @@ var MockCreateRequest = function(url, store, modelName, options) {
 
     if (succeed) {
       var definition = FactoryGuy.modelDefinitions[modelName];
-      if (responseJson[modelName]) {
-        // already calculated once, keep the same id
-        responseJson[modelName] = $.extend({id: responseJson[modelName].id}, matchArgs, returnArgs);
-      } else {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, matchArgs, returnArgs);
-      }
+      // If already calculated once, keep the same id
+      var id = responseJson[modelName] ? responseJson[modelName].id : definition.nextId();
+      responseJson[modelName] = $.extend({id: id}, matchArgs, returnArgs);
       // Remove belongsTo associations since they will already be set when you called
       // createRecord, so they don't need to be returned.
       Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
@@ -599,84 +598,96 @@ var MockCreateRequest = function(url, store, modelName, options) {
           delete responseJson[modelName][relationship.key];
         }
       })
+    } else {
+      this.andFail(options);
     }
-
-  }
+  };
 
   this.match = function(matches) {
     matchArgs = matches;
     this.calculate();
     return this;
-  }
+  };
 
   this.andReturn = function(returns) {
     returnArgs = returns;
     this.calculate();
     return this;
-  }
+  };
 
-  this.andFail = function() {
-    succeed = false;
-    return this;
-  }
+  this.andFail = function(options) {
+    options = options || {}
+ 		succeed = false;
+ 		status = options.status || 500;
+    if (options.response) {
+      responseJson = options.response;
+    }
+ 		return this;
+ 	};
 
   this.handler = function(settings) {
-    if (settings.url != url || settings.type != 'POST') { return false}
-
-    if (matchArgs) {
-      var requestData = JSON.parse(settings.data)[modelName];
-      for (var attribute in expectedRequest) {
-        if (expectedRequest[attribute] &&
-            requestData[attribute] != expectedRequest[attribute]) {
-          return false
+    if (succeed) {
+      if (matchArgs) {
+        var requestData = JSON.parse(settings.data)[modelName];
+        for (var attribute in expectedRequest) {
+          if (expectedRequest[attribute] &&
+              requestData[attribute] != expectedRequest[attribute]) {
+            return false;
+          }
         }
       }
+      this.status = 200;
+    } else {
+      this.status = status;
     }
-    var responseStatus = (succeed ? 200: 500);
-    return {
-      responseText: responseJson,
-      status: responseStatus
-    };
-  }
+    this.responseText = responseJson;
+  };
 
   this.calculate();
 
-  $.mockjax(this.handler);
+  var requestConfig = {
+ 		url: url,
+ 		dataType: 'json',
+ 		type: 'POST',
+ 		response: this.handler
+ 	};
+
+  $.mockjax(requestConfig);
 };
 
 var MockUpdateRequest = function(url, model, mapFind, options) {
 	var status = options.status || 200;
 	var succeed = true;
-    var response = null;
+  var response = null;
 
-    if ('succeed' in options) {
-        succeed = options.succeed;
-    }
+  if ('succeed' in options) {
+    succeed = options.succeed;
+  }
 
-    if ('response' in options) {
-        response = options.response;
-    }
+  if ('response' in options) {
+    response = options.response;
+  }
 
 	this.andSucceed = function(options) {
-        succeed = true;
+    succeed = true;
 		return this;
 	};
 
 	this.andFail = function(options) {
 		succeed = false;
 		status = options.status || 500;
-        if ('response' in options) {
-            response = options.response;
-        }
+    if ('response' in options) {
+      response = options.response;
+    }
 		return this;
 	};
 
 	this.handler = function(settings) {
 		if (!succeed) {
 			this.status = status;
-            if (response !== null) {
-                this.responseText = response;
-            }
+      if (response !== null) {
+        this.responseText = response;
+      }
 		} else {
 			var json = model.toJSON({includeId: true});
 			this.responseText = mapFind(model.constructor.typeKey, json);
@@ -1411,10 +1422,12 @@ if (FactoryGuy !== undefined) {
 				return null;
 			}
 		}
-
 		// Inspect the data submitted in the request (either POST body or GET query string)
 		if ( handler.data ) {
-			if ( ! requestSettings.data || !isMockDataEqual(handler.data, requestSettings.data) ) {
+//      console.log('request.data', requestSettings.data )
+//      console.log('handler.data', handler.data )
+//      console.log('data equal', isMockDataEqual(handler.data, requestSettings.data) )
+			if  ( ! requestSettings.data || !isMockDataEqual(handler.data, requestSettings.data) ) {
 				// They're not identical, do not mock this request
 				return null;
 			}
@@ -1425,7 +1438,6 @@ if (FactoryGuy !== undefined) {
 			// The request type doesn't match (GET vs. POST)
 			return null;
 		}
-
 		return handler;
 	}
 
@@ -1789,6 +1801,7 @@ if (FactoryGuy !== undefined) {
 			}
 
 			mockHandler = getMockForRequest( mockHandlers[k], requestSettings );
+
 			if(!mockHandler) {
 				// No valid mock found for this request
 				continue;
@@ -1840,7 +1853,7 @@ if (FactoryGuy !== undefined) {
 			}
 
 			copyUrlParameters(mockHandler, origSettings);
-
+		 	//console.log('here copyUrlParameters', 'mockHandler=>',mockHandler, 'requestSettings=>',requestSettings, 'origSettings=>',origSettings)
 			(function(mockHandler, requestSettings, origSettings, origHandler) {
 
 				mockRequest = _ajax.call($, $.extend(true, {}, origSettings, {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email: