ember-data-factory-guy 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6abc061f668dd5d677abe7b0ec4f559d16af91f9
-  data.tar.gz: 2d38bdb9f7f4f5255609cf8fe42f49f88d9857da
+  metadata.gz: 144fe2b151234c1c12f5fbc7c65ec2b10041a9cc
+  data.tar.gz: 2bce284e264f02e5fe52b7873e547b8269054d48
 SHA512:
-  metadata.gz: 8cb599906cc1ce6ed367506f141aebaf405676142d34ee85984e3d76c85e167586a47abb8ffc30ae5e859e8eca1343930b4109f51436103478cebe203a34fc43
-  data.tar.gz: 9969fb77e5903fe169847c9bb741073194222b4e5fb92c1071df6fe17606e51a5d9a24b3e75f5e67e74b41aeb7da6b1d171d3da7811e88ade8a40674fe4f6de7
+  metadata.gz: ab291d9acdf10c07f817e3e1472001e85dfff454b9f5e58b1708b358b2f8a0f1105e8891030ddc89fd710523c82a90b14324d717bf549c717558efedd264bfa5
+  data.tar.gz: 625aaea6c2fbc4098cd96855605ec34a5cd13a51b9d38b6c777cd8b6775dc7bdabb626d800ce4537037fe463ed2989f2dd47ea9bc3af816b90bd375a2b0d9461

data/Gruntfile.js

@@ -10,6 +10,7 @@ module.exports = function(grunt) {
           'src/sequence.js',
           'src/model_definition.js',
           'src/factory_guy.js',
+          'src/mock_create_request.js',
           'src/store.js',
           'src/factory_guy_test_mixin.js',
         ],
@@ -21,6 +22,7 @@ module.exports = function(grunt) {
           'src/sequence.js',
           'src/model_definition.js',
           'src/factory_guy.js',
+          'src/mock_create_request.js',
           'src/store.js',
           'src/factory_guy_test_mixin.js',
           'src/epilogue.js'

data/README.md

@@ -10,7 +10,7 @@ of ember-data-factory-guy.
   - 0.6.4   -> ember-data-1.0.0-beta.8 and under
   - 0.7.1.1 -> ember-data-1.0.0-beta.10
   - 0.8.6   -> ember-data-1.0.0-beta.11
-  - 0.9.4   -> ember-data-1.0.0-beta.12
+  - 0.9.5   -> ember-data-1.0.0-beta.12
 
 **Waiting for ember-data-1.0.0-beta.15 to make upgrade release, since there are a few issues with
  ember-data-1.0.0-beta.14.1 that make it difficult to use**
@@ -42,7 +42,7 @@ gem 'ember-data-factory-guy', group: test
 or for particular version:
 
 ```ruby
-gem 'ember-data-factory-guy', '0.9.4', group: test
+gem 'ember-data-factory-guy', '0.9.5', group: test
 ```
 
 then:
@@ -77,7 +77,7 @@ or for particular version:
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
-    "ember-data-factory-guy": "0.9.4"
+    "ember-data-factory-guy": "0.9.5"
   }
 ```
 
@@ -102,7 +102,7 @@ The preferred way to use this project is to use the default adapter for your pro
 which is usually going to be the RESTAdapter/ActiveModelAdapter.
 *In other words, it is NOT recommended to use the DS.FixtureAdapter.*
 
-When you call: store.makeFixture('user'), you create model in the store and this method
+When you call: FactoryGuy.make('user'), you create model in the store and this method
 returns this model instance
 
 *Since you are synchronously getting model instances, you can immediately start asking
@@ -567,11 +567,11 @@ module('User Model', {
     // Assumes the application's namespace is App, though yours may not be.
     testHelper = TestHelper.setup(App);
     store = testHelper.getStore();
-    // You could at this point, make fixtures with testHelper.make,
+    // You could at this point, make fixtures with FactoryGuy.make,
     // but to be even more concise try this shortcut method to your tests
-    make = testHelper.make.bind(testHelper)
+    make = FactoryGuy.make.bind(FactoryGuy)
     // or if your running in phantomjs and it does not support bind method try this:
-    // make = function() {return testHelper.make.apply(testHelper,arguments)}
+    // make = function() {return FactoryGuy.make.apply(FactoryGuy,arguments)}
   },
   teardown: function() {
     Em.run(function() { testHelper.teardown(); });
@@ -593,7 +593,7 @@ test("make a user using your applications default adapter", function() {
 ### Integration Tests
 
 
-#### Using FactoryGuyTestMixin
+##### With FactoryGuyTestMixin
 
 - Uses mockjax
 - Has helper methods
@@ -609,10 +609,10 @@ FactoryGuyTestMixin assumes you will want to use that adapter to do your integra
 
 To do that you will still have to deal with ember data trying to create, update or delete records.
 
-If you put models into the store ( with store#makeFixture ), the http GET call does not need to be mocked,
+If you put models into the store ( with FactoryGuy#make ), the http GET call does not need to be mocked,
 since that model is already in the store.
 
-But what if you want to handle create, update, and delete? Or even findAll records?
+But what if you want to handle create, update, and delete? Or even reload or findAll records?
 
 FactoryGuy assumes you want to mock ajax calls with the mockjax library,
 and this is already bundled for you when you use the ember-data-factory-guy library.
@@ -624,7 +624,7 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
 
 ##### handleFindAll
   - for dealing with finding all records of a particular type
-  - handleFindMany ( deprecated alias )
+  - handleFindMany is a deprecated alias for handleFindAll
 
 ```javascript
     // can use traits and extra fixture options here as you would with FactoryGuy#makeList
@@ -639,7 +639,7 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
   - pass in a record to handle reload
   - pass in fixture name and options ( including id if needed ) to handle making a record
     with those options and finding that record
-  - handleFindOne ( deprecated alias )
+  - handleFindOne is a deprecated alias for handleFind
 
 *Passing in a model instance*
 
@@ -698,10 +698,16 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
 
 
 ##### handleCreate
-  - options
+  - use chainable methods to build the response
+    - match - attributes that must be in request json
+    - andReturns - attributes to include in response json
+    - andFail - request should fail
+
+  - use hash of options to build the response
     - match - attributes that must be in request json
     - returns - attributes to include in response json
     - succeed - flag to indicate if the request should succeed ( default is true )
+    - this style will eventually be deprecated
 
 **Note**
 
@@ -732,17 +738,51 @@ In this case, you are are creating a 'project' record with a specific name, and
 to a particular user. To mock this createRecord call here are a few ways to do this using
 match and or returns options.
 
+
+######Using chainable methods
+
 ```javascript
   // Simplest case
   // Don't care about a match just handle createRecord for any project
   testHelper.handleCreate('project')
 
-  // Exactly matching attributes
-  testHelper.handleCreate('project', {match: {name: "Moo", user: user}})
+  // Matching some attributes
+  testHelper.handleCreate('project').match({match: {name: "Moo"})
+
+  // Match all attributes
+  testHelper.handleCreate('project').match({match: {name: "Moo", user: user})
+
+  // Exactly matching attributes, and returning extra attributes
+  testHelper.handleCreate('project')
+    .match({name: "Moo", user: user})
+    .andReturn({created_at: new Date()})
+
+```
+
+*mocking a failed create*
+
+```javascript
+
+  // Mocking failure case is easy with chainable methods, just use #andFail
+  testHelper.handleCreate('project').match({match: {name: "Moo"}).andFail()
+
+  store.createRecord('project', {name: "Moo"}).save() //=> fails
+```
+
+
+######Using hash of options
+
+```javascript
+  // Simplest case
+  // Don't care about a match just handle createRecord for any project
+  testHelper.handleCreate('project')
 
   // Matching some attributes
   testHelper.handleCreate('project', {match: {name: "Moo"}})
 
+  // Match all attributes
+  testHelper.handleCreate('project', {match: {name: "Moo", user: user}})
+
   // Exactly matching attributes, and returning extra attributes
   testHelper.handleCreate('project', {
     match: {name: "Moo", user: user}, returns: {created_at: new Date()}
@@ -776,7 +816,7 @@ match and or returns options.
 *success case is the default*
 
 ```javascript
-  var profile = testHelper.make('profile');
+  var profile = FactoryGuy.make('profile');
 
   // Pass in the model that will be updated ( if you have it available )
   testHelper.handleUpdate(profile);
@@ -792,7 +832,7 @@ match and or returns options.
 *mocking a failed update*
 
 ```javascript
-  var profile = testHelper.make('profile');
+  var profile = FactoryGuy.make('profile');
 
   // set the succeed flag to 'false'
   testHelper.handleUpdate('profile', profile.id, false);
@@ -810,7 +850,7 @@ match and or returns options.
 *success case is the default*
 
 ```javascript
-  var profile = testHelper.make('profile');
+  var profile = FactoryGuy.make('profile');
   testHelper.handleDelete('profile', profile.id);
 
   profile.destroyRecord() // => will succeed
@@ -819,7 +859,7 @@ match and or returns options.
 *mocking a failed delete*
 
 ```javascript
-  var profile = testHelper.make('profile');
+  var profile = FactoryGuy.make('profile');
   // set the succeed flag to 'false'
   testHelper.handleDelete('profile', profile.id, false);
 
@@ -847,7 +887,7 @@ var viewHelper, user;
 module('User View', {
   setup: function() {
     viewHelper = ViewTestHelper.setup(App); // set up helper
-    user = viewHelper.make('user'); // create a user in the store
+    user = FactoryGuy.make('user'); // create a user in the store
     visit('/users/'+user.id); // visit the users route
   },
   teardown: function() {

data/bower.json

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

data/dist/amd/factory-guy.js

@@ -574,6 +574,80 @@ var FactoryGuy = {
   }
 };
 
+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 record = store.createRecord(modelName, matchArgs);
+      expectedRequest = record.serialize();
+    }
+
+    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);
+      }
+      // 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) {
+        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 (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);
+};
+
 (function () {
   DS.Store.reopen({
     /**
@@ -1086,53 +1160,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    @param {Object} options  hash of options for handling request
    */
   handleCreate: function (modelName, options) {
-    var opts = options === undefined ? {} : options;
-    var store = this.getStore()
-    var succeed = opts.succeed === undefined ? true : opts.succeed;
-    var match = opts.match || {};
-    var returnArgs = opts.returns || {};
-
-    if (opts.match) {
-      var record = store.createRecord(modelName, match);
-      var expectedRequest = record.serialize();
-    }
-
-    var modelType = store.modelFor(modelName)
-
-    var responseJson = {};
-    if (succeed) {
-      var definition = FactoryGuy.modelDefinitions[modelName];
-      responseJson[modelName] = $.extend({id: definition.nextId()}, match, 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) {
-        if (relationship.kind == 'belongsTo') {
-          delete responseJson[modelName][relationship.key];
-        }
-      })
-    }
-
     var url = this.buildURL(modelName);
-
-    var handler = function(settings) {
-      if (settings.url != url || settings.type != 'POST') { return false}
-
-      if (opts.match) {
-        var requestData = JSON.parse(settings.data)[modelName];
-        for (attribute in expectedRequest) {
-          if (expectedRequest[attribute] && requestData[attribute] != expectedRequest[attribute]) {
-            return false
-          }
-        }
-      }
-      var responseStatus = (succeed ? 200: 500);
-      return {
-        responseText: responseJson,
-        status: responseStatus
-      };
-    }
-
-    $.mockjax(handler);
+    var store = this.getStore();
+    var opts = options === undefined ? {} : options;
+    return new MockCreateRequest(url, store, modelName, opts);
   },
 
   /**

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

@@ -569,6 +569,80 @@ var FactoryGuy = {
   }
 };
 
+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 record = store.createRecord(modelName, matchArgs);
+      expectedRequest = record.serialize();
+    }
+
+    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);
+      }
+      // 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) {
+        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 (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);
+};
+
 (function () {
   DS.Store.reopen({
     /**
@@ -1081,53 +1155,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    @param {Object} options  hash of options for handling request
    */
   handleCreate: function (modelName, options) {
-    var opts = options === undefined ? {} : options;
-    var store = this.getStore()
-    var succeed = opts.succeed === undefined ? true : opts.succeed;
-    var match = opts.match || {};
-    var returnArgs = opts.returns || {};
-
-    if (opts.match) {
-      var record = store.createRecord(modelName, match);
-      var expectedRequest = record.serialize();
-    }
-
-    var modelType = store.modelFor(modelName)
-
-    var responseJson = {};
-    if (succeed) {
-      var definition = FactoryGuy.modelDefinitions[modelName];
-      responseJson[modelName] = $.extend({id: definition.nextId()}, match, 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) {
-        if (relationship.kind == 'belongsTo') {
-          delete responseJson[modelName][relationship.key];
-        }
-      })
-    }
-
     var url = this.buildURL(modelName);
-
-    var handler = function(settings) {
-      if (settings.url != url || settings.type != 'POST') { return false}
-
-      if (opts.match) {
-        var requestData = JSON.parse(settings.data)[modelName];
-        for (attribute in expectedRequest) {
-          if (expectedRequest[attribute] && requestData[attribute] != expectedRequest[attribute]) {
-            return false
-          }
-        }
-      }
-      var responseStatus = (succeed ? 200: 500);
-      return {
-        responseText: responseJson,
-        status: responseStatus
-      };
-    }
-
-    $.mockjax(handler);
+    var store = this.getStore();
+    var opts = options === undefined ? {} : options;
+    return new MockCreateRequest(url, store, modelName, opts);
   },
 
   /**

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={}}}};(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)},handleFindAll:function(){var records=FactoryGuy.makeList.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};var json=records.map(function(record){return record.toJSON({includeId:true})});responseJson[modelName.pluralize()]=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 responseJson={};var json=record.toJSON({includeId:true});responseJson[modelName.pluralize()]=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={};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 store=this.getStore();var succeed=opts.succeed===undefined?true:opts.succeed;var match=opts.match||{};var returnArgs=opts.returns||{};if(opts.match){var record=store.createRecord(modelName,match);var expectedRequest=record.serialize()}var modelType=store.modelFor(modelName);var responseJson={};if(succeed){var definition=FactoryGuy.modelDefinitions[modelName];responseJson[modelName]=$.extend({id:definition.nextId()},match,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}var url=this.buildURL(modelName);var handler=function(settings){if(settings.url!=url||settings.type!="POST"){return false}if(opts.match){var requestData=JSON.parse(settings.data)[modelName];for(attribute in expectedRequest){if(expectedRequest[attribute]&&requestData[attribute]!=expectedRequest[attribute]){return false}}}var responseStatus=succeed?200:500;return{responseText:responseJson,status:responseStatus}};$.mockjax(handler)},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);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 record=store.createRecord(modelName,matchArgs);expectedRequest=record.serialize()}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(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)};(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)},handleFindAll:function(){var records=FactoryGuy.makeList.apply(FactoryGuy,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};var json=records.map(function(record){return record.toJSON({includeId:true})});responseJson[modelName.pluralize()]=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 responseJson={};var json=record.toJSON({includeId:true});responseJson[modelName.pluralize()]=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={};responseJson[modelName.pluralize()]=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 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/package.json

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

data/src/factory_guy_test_mixin.js

@@ -233,53 +233,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    @param {Object} options  hash of options for handling request
    */
   handleCreate: function (modelName, options) {
-    var opts = options === undefined ? {} : options;
-    var store = this.getStore()
-    var succeed = opts.succeed === undefined ? true : opts.succeed;
-    var match = opts.match || {};
-    var returnArgs = opts.returns || {};
-
-    if (opts.match) {
-      var record = store.createRecord(modelName, match);
-      var expectedRequest = record.serialize();
-    }
-
-    var modelType = store.modelFor(modelName)
-
-    var responseJson = {};
-    if (succeed) {
-      var definition = FactoryGuy.modelDefinitions[modelName];
-      responseJson[modelName] = $.extend({id: definition.nextId()}, match, 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) {
-        if (relationship.kind == 'belongsTo') {
-          delete responseJson[modelName][relationship.key];
-        }
-      })
-    }
-
     var url = this.buildURL(modelName);
-
-    var handler = function(settings) {
-      if (settings.url != url || settings.type != 'POST') { return false}
-
-      if (opts.match) {
-        var requestData = JSON.parse(settings.data)[modelName];
-        for (attribute in expectedRequest) {
-          if (expectedRequest[attribute] && requestData[attribute] != expectedRequest[attribute]) {
-            return false
-          }
-        }
-      }
-      var responseStatus = (succeed ? 200: 500);
-      return {
-        responseText: responseJson,
-        status: responseStatus
-      };
-    }
-
-    $.mockjax(handler);
+    var store = this.getStore();
+    var opts = options === undefined ? {} : options;
+    return new MockCreateRequest(url, store, modelName, opts);
   },
 
   /**

data/src/mock_create_request.js

@@ -0,0 +1,73 @@
+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 record = store.createRecord(modelName, matchArgs);
+      expectedRequest = record.serialize();
+    }
+
+    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);
+      }
+      // 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) {
+        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 (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);
+};

data/tests/factory_guy_test_mixin_test.js

@@ -28,7 +28,7 @@ module('FactoryGuyTestMixin (using mockjax) 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 () {
     testHelper.teardown();
@@ -233,7 +233,7 @@ module('FactoryGuyTestMixin (using mockjax) with DS.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();
@@ -241,8 +241,9 @@ module('FactoryGuyTestMixin (using mockjax) with DS.ActiveModelAdapter', {
 });
 
 
-/////// handleCreate //////////
+  /////// handleCreate //////////
 
+/////// with hash of parameters ///////////////////
 asyncTest("#handleCreate with no specific match", function() {
   testHelper.handleCreate('profile');
 
@@ -394,6 +395,128 @@ asyncTest("#handleCreate match but still fail", function() {
     )
 });
 
+/////// handleCreate //////////
+/////// with chaining methods ///////////////////
+
+asyncTest("#handleCreate match some attributes with match method", function() {
+  var customDescription = "special description"
+  var date = new Date();
+
+  testHelper.handleCreate('profile').match({description: customDescription});
+
+  store.createRecord('profile', {
+    description: customDescription, created_at: date
+  }).save().then(function(profile) {
+    ok(profile instanceof Profile)
+    ok(profile.id == 1)
+    ok(profile.get('description') == customDescription)
+    start();
+  });
+});
+
+asyncTest("#handleCreate match all attributes  with match method", function() {
+  var customDescription = "special description"
+  var date = new Date();
+
+  testHelper.handleCreate('profile').match({description: customDescription, created_at: date});
+
+  store.createRecord('profile', {
+    description: customDescription, created_at: date
+  }).save().then(function(profile) {
+    ok(profile instanceof Profile)
+    ok(profile.id == 1)
+    ok(profile.get('description') == customDescription)
+    ok(profile.get('created_at') == date.toString())
+    start();
+  });
+});
+
+asyncTest("#handleCreate match belongsTo association with match method", function() {
+  var company = make('company')
+  testHelper.handleCreate('profile').match({company: company})
+
+  store.createRecord('profile', {company: company}).save().then(function(profile) {
+    ok(profile.get('company') == company)
+    start();
+  });
+});
+
+asyncTest("#handleCreate match belongsTo polymorphic association  with match method", function() {
+  var group = make('group')
+  testHelper.handleCreate('profile').match({group: group})
+
+  store.createRecord('profile', {group: group}).save().then(function(profile) {
+    ok(profile.get('group') == group)
+    start();
+  });
+});
+
+
+
+asyncTest("#handleCreate returns attributes with andReturns method", function() {
+  var date = new Date()
+
+  testHelper.handleCreate('profile').andReturn({created_at: date});
+
+  store.createRecord('profile').save().then(function(profile) {
+    ok(profile.get('created_at') == date.toString())
+    start();
+  });
+});
+
+asyncTest("#handleCreate match attributes and return attributes with match and andReturn methods", function() {
+  var date = new Date()
+  var customDescription = "special description"
+  var company = make('company')
+  var group = make('big_group')
+
+  testHelper.handleCreate('profile')
+    .match({description: customDescription, company: company, group: group})
+    .andReturn({created_at: new Date()})
+
+  store.createRecord('profile', {
+    description: customDescription, company: company, group: group
+  }).save().then(function(profile) {
+    start();
+    ok(profile.get('created_at') == date.toString())
+    ok(profile.get('group') == group)
+    ok(profile.get('company') == company)
+    ok(profile.get('description') == customDescription)
+  });
+});
+
+
+asyncTest("#handleCreate failure with andFail method", function() {
+  testHelper.handleCreate('profile').andFail();
+
+  store.createRecord('profile').save()
+    .then(
+      function() {},
+      function() {
+        ok(true)
+        start();
+      }
+    )
+});
+
+
+asyncTest("#handleCreate match but still fail with chaining methods", function() {
+  var description = "special description"
+
+  testHelper.handleCreate('profile').match({description: description}).andFail();
+
+  store.createRecord('profile', {description: description}).save()
+    .then(
+      function() {},
+      function() {
+        ok(true)
+        start();
+      }
+    )
+});
+
+
+
 
 
 /////// handleFindAll //////////
@@ -534,6 +657,4 @@ asyncTest("#handleDelete failure case", function() {
       start();
     }
   );
-});
-
-
+});

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -1081,53 +1081,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    @param {Object} options  hash of options for handling request
    */
   handleCreate: function (modelName, options) {
-    var opts = options === undefined ? {} : options;
-    var store = this.getStore()
-    var succeed = opts.succeed === undefined ? true : opts.succeed;
-    var match = opts.match || {};
-    var returnArgs = opts.returns || {};
-
-    if (opts.match) {
-      var record = store.createRecord(modelName, match);
-      var expectedRequest = record.serialize();
-    }
-
-    var modelType = store.modelFor(modelName)
-
-    var responseJson = {};
-    if (succeed) {
-      var definition = FactoryGuy.modelDefinitions[modelName];
-      responseJson[modelName] = $.extend({id: definition.nextId()}, match, 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) {
-        if (relationship.kind == 'belongsTo') {
-          delete responseJson[modelName][relationship.key];
-        }
-      })
-    }
-
     var url = this.buildURL(modelName);
-
-    var handler = function(settings) {
-      if (settings.url != url || settings.type != 'POST') { return false}
-
-      if (opts.match) {
-        var requestData = JSON.parse(settings.data)[modelName];
-        for (attribute in expectedRequest) {
-          if (expectedRequest[attribute] && requestData[attribute] != expectedRequest[attribute]) {
-            return false
-          }
-        }
-      }
-      var responseStatus = (succeed ? 200: 500);
-      return {
-        responseText: responseJson,
-        status: responseStatus
-      };
-    }
-
-    $.mockjax(handler);
+    var store = this.getStore();
+    var opts = options === undefined ? {} : options;
+    return new MockCreateRequest(url, store, modelName, opts);
   },
 
   /**

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email:
@@ -36,6 +36,7 @@ files:
 - src/factory_guy.js
 - src/factory_guy_test_mixin.js
 - src/has_many.js
+- src/mock_create_request.js
 - src/model_definition.js
 - src/prologue.js
 - src/sequence.js