ember-data-factory-guy 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3487ba4072e7e89a32ffd9235291a65f24f79503
-  data.tar.gz: c55698399c38e7f46f7036346a379f2a4648def4
+  metadata.gz: 6abc061f668dd5d677abe7b0ec4f559d16af91f9
+  data.tar.gz: 2d38bdb9f7f4f5255609cf8fe42f49f88d9857da
 SHA512:
-  metadata.gz: 6fa20e03471792329dfec799f3a47f6471d7c3d255ae024e615d6c64fdc28e2d2419b8bfdffd1a0ceac2d8b59456abab91164637489f6e888ed920bd400f3155
-  data.tar.gz: 5002f87e0d686881e3260d2725c4d2ce5a2e1d65fd13c9e3d7faf4e109b2075258fc24bfda52adaad5bda794e7766825bcf3364838e0eb90b4444d2ceb1be1f5
+  metadata.gz: 8cb599906cc1ce6ed367506f141aebaf405676142d34ee85984e3d76c85e167586a47abb8ffc30ae5e859e8eca1343930b4109f51436103478cebe203a34fc43
+  data.tar.gz: 9969fb77e5903fe169847c9bb741073194222b4e5fb92c1071df6fe17606e51a5d9a24b3e75f5e67e74b41aeb7da6b1d171d3da7811e88ade8a40674fe4f6de7

data/README.md

@@ -10,9 +10,12 @@ 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.3   -> ember-data-1.0.0-beta.12
+  - 0.9.4   -> ember-data-1.0.0-beta.12
 
-** Support for fixture adapter is back in business as of version 0.9.3 **
+**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**
+
+**Support for fixture adapter is back in business as of version 0.9.3**
 
 *Version 0.9.0 and up deprecates explicit call to store.makeFixture in your tests, in favor
 of using the FactoryGuy.make or testHelper.make function from FactoryGuyTestHelperMixin instead.
@@ -39,7 +42,7 @@ gem 'ember-data-factory-guy', group: test
 or for particular version:
 
 ```ruby
-gem 'ember-data-factory-guy', '0.9.3', group: test
+gem 'ember-data-factory-guy', '0.9.4', group: test
 ```
 
 then:
@@ -74,7 +77,7 @@ or for particular version:
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
-    "ember-data-factory-guy": "0.9.3"
+    "ember-data-factory-guy": "0.9.4"
   }
 ```
 
@@ -460,7 +463,7 @@ the reverse user hasMany 'projects' association is being setup for you on the us
 
 ``` javascript
   FactoryGuy.define('user', {
-    user_with_projects: { FactoryGuy.hasMany('project', 2) }
+    user_with_projects: { projects: FactoryGuy.hasMany('project', 2) }
   });
 
   var user = FactoryGuy.make('user_with_projects');
@@ -594,8 +597,8 @@ test("make a user using your applications default adapter", function() {
 
 - Uses mockjax
 - Has helper methods
-  - handleFindMany
-  - handleFindOne
+  - handleFindAll
+  - handleFind
   - handleFindQuery
   - handleCreate
   - handleUpdate
@@ -619,24 +622,43 @@ and this is already bundled for you when you use the ember-data-factory-guy libr
 tests run as shown in the previous section (Using FactoryGuyTestMixin)**
 
 
-##### handleFindMany
+##### handleFindAll
   - for dealing with finding all records of a particular type
+  - handleFindMany ( deprecated alias )
 
 ```javascript
     // can use traits and extra fixture options here as you would with FactoryGuy#makeList
-    testHelper.handleFindMany('profile', 2);
+    testHelper.handleFindAll('profile', 2);
 
     store.find('profile').then(function (profiles) {
       profiles.get('length') //=> 2
     });
 ```
 
-##### handleFindOne
-  - for dealing with finding one record with an id
+##### handleFind
+  - 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 )
+
+*Passing in a model instance*
 
 ```javascript
-    // can use traits and extra fixture options here as you would with FactoryGuy#make
-    testHelper.handleFindOne('profile', {id: 1});
+    var profile = FactoryGuy.make('profile')
+    testHelper.handleFind(profile);
+
+    profile.reload().then(function (profile2) {
+      ok(profile2.id == profile.id);
+      start();
+    });
+```
+
+*Passing in fixture name and options*
+
+```javascript
+    // can use traits and extra fixture options here as you would with FactoryGuy#make,
+    // since a record will be made, and placed in the store for you.
+    testHelper.handleFind('profile', {id: 1});
 
     store.find('profile', 1).then(function (profile) {
       profile.get('id') //=> 1
@@ -714,8 +736,13 @@ match and or returns options.
   // 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: {name: "Moo"}})
+
   // Exactly matching attributes, and returning extra attributes
   testHelper.handleCreate('project', {
     match: {name: "Moo", user: user}, returns: {created_at: new Date()}
@@ -732,7 +759,7 @@ match and or returns options.
   // when the createRecord on the 'project' is called, it will fail
   store.createRecord('project').save() //=> fails
 
-  // or fail only if the attribues match exactly
+  // or fail only if the attributes match the match options
   testHelper.handleCreate('project', {
     match: {name: "Moo", user: user}, {succeed: false}
   })

data/bower.json

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

data/dist/amd/factory-guy.js

@@ -913,6 +913,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     if (options.data) {
       request.data = options.data;
     }
+
     $.mockjax(request);
   },
   /**
@@ -934,7 +935,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      // Pass in the parameters you would normally pass into FactoryGuy.makeList,
      // like fixture name, number of fixtures to make, and optional traits,
      // or fixture options
-     testHelper.handleFindMany('user', 2, 'with_hats');
+     testHelper.handleFindAll('user', 2, 'with_hats');
 
      store.find('user').then(function(users){
 
@@ -946,7 +947,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options
    */
-  handleFindMany: function () {
+  handleFindAll: function () {
     // make the records and load them in the store
     var records = FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
@@ -957,7 +958,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
-
+  handleFindMany: function() {
+    Ember.deprecate('DEPRECATION Warning: use handleFindAll instead');
+    this.handleFindAll.apply(this, arguments)
+  },
   /**
      Handling ajax GET for finding one record for a type of model and an id.
      You can mock failed find by passing in success argument as false.
@@ -977,18 +981,28 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options (including id)
    */
-  handleFindOne: function () {
-    // make the records and load them in the store
-    var record = FactoryGuy.make.apply(FactoryGuy, arguments);
-    var name = arguments[0];
-    var modelName = FactoryGuy.lookupModelForFixtureName(name);
+  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 {
+      // make the record and load it in the store
+      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) },
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
@@ -1053,55 +1067,74 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     succeed - flag to indicate if the request should succeed ( default is true )
 
     Note:
-     1) that any attributes in match will be added to the response json automatically,
-    so you don't need to include them in the returns hash as well.
+     1) Any attributes in match will be added to the response json automatically,
+    so you don't need to include them in the returns hash.
+
+     2) As long as all the match attributes are found in the record being created,
+     the create will succeed. In other words, there may be other attributes in the
+     createRecord call, but you don't have to match them all. For example:
 
-     2) If you don't use match options for exact match, there will be no id returned to the model.
-        The reason being, that this method purposely returns an empty hash response with a 'don't match'
-        style handleCreate, because if the responseJson returns a non empty data hash ( with even only
-        the id), this essentially empty hash of attributes will override ( and nullify ) all the attributes
-        that set when you created the record.
-     3) If you match on a belongsTo association, you don't have to include that in the
-    returns hash.
+      ```js
+        handleCreate('post', {match: {title: 'foo'})
+        store.createRecord('post', {title: 'foo', created_at: new Date()})
+      ```
+
+     2) If you match on a belongsTo association, you don't have to include that in the
+    returns hash either.
 
    @param {String} modelName  name of model your creating like 'profile' for Profile
    @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 || {};
 
-    var url = this.buildURL(modelName);
-    var definition = FactoryGuy.modelDefinitions[modelName];
-
-    var httpOptions = {type: 'POST'};
     if (opts.match) {
-      var expectedRequest = {};
-      var record = this.getStore().createRecord(modelName, match);
-      expectedRequest[modelName] = record.serialize();
-      httpOptions.data = JSON.stringify(expectedRequest);
+      var record = store.createRecord(modelName, match);
+      var expectedRequest = record.serialize();
     }
 
-    var modelType = this.getStore().modelFor(modelName)
+    var modelType = store.modelFor(modelName)
 
     var responseJson = {};
     if (succeed) {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, match, returnArgs);
-        // Remove belongsTo associations since they will already be set when you called
-        // createRecord, and included them in those attributes
-        Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
-          if (relationship.kind == 'belongsTo') {
-            delete responseJson[modelName][relationship.key];
+      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
           }
-        })
-    } else {
-      httpOptions.status = 500;
+        }
+      }
+      var responseStatus = (succeed ? 200: 500);
+      return {
+        responseText: responseJson,
+        status: responseStatus
+      };
     }
 
-    this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
+    $.mockjax(handler);
   },
+
   /**
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in success argument as false.

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

@@ -908,6 +908,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     if (options.data) {
       request.data = options.data;
     }
+
     $.mockjax(request);
   },
   /**
@@ -929,7 +930,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      // Pass in the parameters you would normally pass into FactoryGuy.makeList,
      // like fixture name, number of fixtures to make, and optional traits,
      // or fixture options
-     testHelper.handleFindMany('user', 2, 'with_hats');
+     testHelper.handleFindAll('user', 2, 'with_hats');
 
      store.find('user').then(function(users){
 
@@ -941,7 +942,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options
    */
-  handleFindMany: function () {
+  handleFindAll: function () {
     // make the records and load them in the store
     var records = FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
@@ -952,7 +953,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
-
+  handleFindMany: function() {
+    Ember.deprecate('DEPRECATION Warning: use handleFindAll instead');
+    this.handleFindAll.apply(this, arguments)
+  },
   /**
      Handling ajax GET for finding one record for a type of model and an id.
      You can mock failed find by passing in success argument as false.
@@ -972,18 +976,28 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options (including id)
    */
-  handleFindOne: function () {
-    // make the records and load them in the store
-    var record = FactoryGuy.make.apply(FactoryGuy, arguments);
-    var name = arguments[0];
-    var modelName = FactoryGuy.lookupModelForFixtureName(name);
+  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 {
+      // make the record and load it in the store
+      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) },
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
@@ -1048,55 +1062,74 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     succeed - flag to indicate if the request should succeed ( default is true )
 
     Note:
-     1) that any attributes in match will be added to the response json automatically,
-    so you don't need to include them in the returns hash as well.
+     1) Any attributes in match will be added to the response json automatically,
+    so you don't need to include them in the returns hash.
+
+     2) As long as all the match attributes are found in the record being created,
+     the create will succeed. In other words, there may be other attributes in the
+     createRecord call, but you don't have to match them all. For example:
 
-     2) If you don't use match options for exact match, there will be no id returned to the model.
-        The reason being, that this method purposely returns an empty hash response with a 'don't match'
-        style handleCreate, because if the responseJson returns a non empty data hash ( with even only
-        the id), this essentially empty hash of attributes will override ( and nullify ) all the attributes
-        that set when you created the record.
-     3) If you match on a belongsTo association, you don't have to include that in the
-    returns hash.
+      ```js
+        handleCreate('post', {match: {title: 'foo'})
+        store.createRecord('post', {title: 'foo', created_at: new Date()})
+      ```
+
+     2) If you match on a belongsTo association, you don't have to include that in the
+    returns hash either.
 
    @param {String} modelName  name of model your creating like 'profile' for Profile
    @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 || {};
 
-    var url = this.buildURL(modelName);
-    var definition = FactoryGuy.modelDefinitions[modelName];
-
-    var httpOptions = {type: 'POST'};
     if (opts.match) {
-      var expectedRequest = {};
-      var record = this.getStore().createRecord(modelName, match);
-      expectedRequest[modelName] = record.serialize();
-      httpOptions.data = JSON.stringify(expectedRequest);
+      var record = store.createRecord(modelName, match);
+      var expectedRequest = record.serialize();
     }
 
-    var modelType = this.getStore().modelFor(modelName)
+    var modelType = store.modelFor(modelName)
 
     var responseJson = {};
     if (succeed) {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, match, returnArgs);
-        // Remove belongsTo associations since they will already be set when you called
-        // createRecord, and included them in those attributes
-        Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
-          if (relationship.kind == 'belongsTo') {
-            delete responseJson[modelName][relationship.key];
+      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
           }
-        })
-    } else {
-      httpOptions.status = 500;
+        }
+      }
+      var responseStatus = (succeed ? 200: 500);
+      return {
+        responseText: responseJson,
+        status: responseStatus
+      };
     }
 
-    this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
+    $.mockjax(handler);
   },
+
   /**
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in success argument as false.

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)},handleFindMany: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)},handleFindOne:function(){var record=FactoryGuy.make.apply(FactoryGuy,arguments);var name=arguments[0];var 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)},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 succeed=opts.succeed===undefined?true:opts.succeed;var match=opts.match||{};var returnArgs=opts.returns||{};var url=this.buildURL(modelName);var definition=FactoryGuy.modelDefinitions[modelName];var httpOptions={type:"POST"};if(opts.match){var expectedRequest={};var record=this.getStore().createRecord(modelName,match);expectedRequest[modelName]=record.serialize();httpOptions.data=JSON.stringify(expectedRequest)}var modelType=this.getStore().modelFor(modelName);var responseJson={};if(succeed){responseJson[modelName]=$.extend({id:definition.nextId()},match,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}else{httpOptions.status=500}this.stubEndpointForHttpRequest(url,responseJson,httpOptions)},handleUpdate:function(){var args=Array.prototype.slice.call(arguments);Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var succeed=true;if(typeof args[args.length-1]=="boolean"){args.pop();succeed=false}Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0);var type,id;if(args[0]instanceof DS.Model){var model=args[0];type=model.constructor.typeKey;id=model.id}else if(typeof args[0]=="string"&&typeof parseInt(args[1])=="number"){type=args[0];id=args[1]}Ember.assert("To handleUpdate pass in a model instance or a type and an id",type&&id);this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:succeed?200:500})},handleDelete:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:succeed?200:500})},teardown:function(){FactoryGuy.resetModels(this.getStore());$.mockjax.clear()}});if(FactoryGuy!==undefined){FactoryGuy.testMixin=FactoryGuyTestMixin}
+var Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};var MissingSequenceError=function(message){this.toString=function(){return message}};if(FactoryGuy!==undefined){FactoryGuy.sequence=Sequence;FactoryGuy.missingSequenceError=MissingSequenceError}var ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;var sequenceName=null;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.nextId=function(){return modelId++};this.generate=function(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,opts);for(var attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){if(FactoryGuy.getStore()){if(FactoryGuy.isAttributeRelationship(this.model,attribute)){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}else{fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}}if(!fixture.id){fixture.id=this.nextId()}return fixture};this.buildList=function(name,number,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(var name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.typeOf(sequenceFn)!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseTraits(config.traits);delete config.traits;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};if(FactoryGuy!==undefined){FactoryGuy.modelDefiniton=ModelDefinition}var FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},setStore:function(store){Ember.assert("FactoryGuy#setStore needs a valid store instance.You passed in ["+store+"]",store instanceof DS.Store);this.store=store},getStore:function(){return this.store},isAttributeRelationship:function(typeName,attribute){if(!this.store){Ember.debug("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures");return true}var model=this.store.modelFor(typeName);return!!model.typeForRelationship(attribute)},generate:function(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){Ember.deprecate("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(var model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},make:function(){var store=this.store;Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures",store);var fixture=this.build.apply(this,arguments);var name=arguments[0];var modelName=this.lookupModelForFixtureName(name);var modelType=store.modelFor(modelName);if(store.usingFixtureAdapter()){store.setAssociationsForFixtureAdapter(modelType,modelName,fixture);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}

data/package.json

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

data/src/factory_guy_test_mixin.js

@@ -60,6 +60,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     if (options.data) {
       request.data = options.data;
     }
+
     $.mockjax(request);
   },
   /**
@@ -81,7 +82,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      // Pass in the parameters you would normally pass into FactoryGuy.makeList,
      // like fixture name, number of fixtures to make, and optional traits,
      // or fixture options
-     testHelper.handleFindMany('user', 2, 'with_hats');
+     testHelper.handleFindAll('user', 2, 'with_hats');
 
      store.find('user').then(function(users){
 
@@ -93,7 +94,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options
    */
-  handleFindMany: function () {
+  handleFindAll: function () {
     // make the records and load them in the store
     var records = FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
@@ -104,7 +105,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
-
+  handleFindMany: function() {
+    Ember.deprecate('DEPRECATION Warning: use handleFindAll instead');
+    this.handleFindAll.apply(this, arguments)
+  },
   /**
      Handling ajax GET for finding one record for a type of model and an id.
      You can mock failed find by passing in success argument as false.
@@ -124,18 +128,28 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options (including id)
    */
-  handleFindOne: function () {
-    // make the records and load them in the store
-    var record = FactoryGuy.make.apply(FactoryGuy, arguments);
-    var name = arguments[0];
-    var modelName = FactoryGuy.lookupModelForFixtureName(name);
+  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 {
+      // make the record and load it in the store
+      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) },
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
@@ -200,55 +214,74 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     succeed - flag to indicate if the request should succeed ( default is true )
 
     Note:
-     1) that any attributes in match will be added to the response json automatically,
-    so you don't need to include them in the returns hash as well.
+     1) Any attributes in match will be added to the response json automatically,
+    so you don't need to include them in the returns hash.
+
+     2) As long as all the match attributes are found in the record being created,
+     the create will succeed. In other words, there may be other attributes in the
+     createRecord call, but you don't have to match them all. For example:
+
+      ```js
+        handleCreate('post', {match: {title: 'foo'})
+        store.createRecord('post', {title: 'foo', created_at: new Date()})
+      ```
 
-     2) If you don't use match options for exact match, there will be no id returned to the model.
-        The reason being, that this method purposely returns an empty hash response with a 'don't match'
-        style handleCreate, because if the responseJson returns a non empty data hash ( with even only
-        the id), this essentially empty hash of attributes will override ( and nullify ) all the attributes
-        that set when you created the record.
-     3) If you match on a belongsTo association, you don't have to include that in the
-    returns hash.
+     2) If you match on a belongsTo association, you don't have to include that in the
+    returns hash either.
 
    @param {String} modelName  name of model your creating like 'profile' for Profile
    @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 || {};
 
-    var url = this.buildURL(modelName);
-    var definition = FactoryGuy.modelDefinitions[modelName];
-
-    var httpOptions = {type: 'POST'};
     if (opts.match) {
-      var expectedRequest = {};
-      var record = this.getStore().createRecord(modelName, match);
-      expectedRequest[modelName] = record.serialize();
-      httpOptions.data = JSON.stringify(expectedRequest);
+      var record = store.createRecord(modelName, match);
+      var expectedRequest = record.serialize();
     }
 
-    var modelType = this.getStore().modelFor(modelName)
+    var modelType = store.modelFor(modelName)
 
     var responseJson = {};
     if (succeed) {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, match, returnArgs);
-        // Remove belongsTo associations since they will already be set when you called
-        // createRecord, and included them in those attributes
-        Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
-          if (relationship.kind == 'belongsTo') {
-            delete responseJson[modelName][relationship.key];
+      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
           }
-        })
-    } else {
-      httpOptions.status = 500;
+        }
+      }
+      var responseStatus = (succeed ? 200: 500);
+      return {
+        responseText: responseJson,
+        status: responseStatus
+      };
     }
 
-    this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
+    $.mockjax(handler);
   },
+
   /**
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in success argument as false.

data/tests/factory_guy_test_mixin_test.js

@@ -107,10 +107,10 @@ asyncTest("#handleFindQuery passing in existing instances with hasMany and belon
 });
 
 
-/////// handleFindMany //////////
+/////// handleFindAll //////////
 
-asyncTest("#handleFindMany the basic", function () {
-  testHelper.handleFindMany('profile', 2);
+asyncTest("#handleFindAll the basic", function () {
+  testHelper.handleFindAll('profile', 2);
 
   store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
@@ -118,8 +118,8 @@ asyncTest("#handleFindMany the basic", function () {
   });
 });
 
-asyncTest("#handleFindMany with fixture options", function () {
-  testHelper.handleFindMany('profile', 2, {description: 'dude'});
+asyncTest("#handleFindAll with fixture options", function () {
+  testHelper.handleFindAll('profile', 2, {description: 'dude'});
 
   store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
@@ -128,8 +128,8 @@ asyncTest("#handleFindMany with fixture options", function () {
   });
 });
 
-asyncTest("#handleFindMany with traits", function () {
-  testHelper.handleFindMany('profile', 2, 'goofy_description');
+asyncTest("#handleFindAll with traits", function () {
+  testHelper.handleFindAll('profile', 2, 'goofy_description');
 
   store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
@@ -138,8 +138,8 @@ asyncTest("#handleFindMany with traits", function () {
   });
 });
 
-asyncTest("#handleFindMany with traits and extra options", function () {
-  testHelper.handleFindMany('profile', 2, 'goofy_description', {description: 'dude'});
+asyncTest("#handleFindAll with traits and extra options", function () {
+  testHelper.handleFindAll('profile', 2, 'goofy_description', {description: 'dude'});
 
   store.findAll('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
@@ -149,9 +149,9 @@ asyncTest("#handleFindMany with traits and extra options", function () {
 });
 
 
-//////// handleFindOne /////////
+//////// handleFind /////////
 
-asyncTest("#handleFindOne the basic", function () {
+asyncTest("#handleFindOne aliases handleFind", function () {
   var id = 1
   testHelper.handleFindOne('profile', {id: id});
 
@@ -159,11 +159,45 @@ asyncTest("#handleFindOne the basic", function () {
     ok(profile.get('id') == id);
     start();
   });
+
+});
+
+asyncTest("#handleFind with a record returns the record", function () {
+  var profile = FactoryGuy.make('profile')
+  testHelper.handleFind(profile);
+
+  store.find('profile', 1).then(function (profile2) {
+    ok(profile2.id == profile.id);
+    start();
+  });
+
+});
+
+asyncTest("#handleFind with a record handles reload", function () {
+  var profile = FactoryGuy.make('profile')
+  testHelper.handleFind(profile);
+
+  profile.reload().then(function (profile2) {
+    ok(profile2.id == profile.id);
+    start();
+  });
+
+});
+
+asyncTest("#handleFind with options", function () {
+  var id = 1
+  testHelper.handleFind('profile', {id: id});
+
+  store.find('profile', 1).then(function (profile) {
+    ok(profile.get('id') == id);
+    start();
+  });
+
 });
 
-asyncTest("#handleFindOne with traits", function () {
+asyncTest("#handleFind with traits", function () {
   var id = 1
-  testHelper.handleFindOne('profile', 'goofy_description', {id: id});
+  testHelper.handleFind('profile', 'goofy_description', {id: id});
 
   store.find('profile', 1).then(function (profile) {
     ok(profile.get('description') == 'goofy');
@@ -171,10 +205,10 @@ asyncTest("#handleFindOne with traits", function () {
   });
 });
 
-asyncTest("#handleFindOne with arguments", function () {
+asyncTest("#handleFind with arguments", function () {
   var id = 1
   var description = 'guy';
-  testHelper.handleFindOne('profile', {id: id, description: description });
+  testHelper.handleFind('profile', {id: id, description: description });
 
   store.find('profile', 1).then(function (profile) {
     ok(profile.get('description') == description);
@@ -182,10 +216,10 @@ asyncTest("#handleFindOne with arguments", function () {
   });
 });
 
-asyncTest("#handleFindOne with traits and arguments", function () {
+asyncTest("#handleFind with traits and arguments", function () {
   var id = 1
   var description = 'guy';
-  testHelper.handleFindOne('profile', 'goofy_description', {id: id, description: description});
+  testHelper.handleFind('profile', 'goofy_description', {id: id, description: description});
 
   store.find('profile', 1).then(function (profile) {
     ok(profile.get('description') == description);
@@ -219,15 +253,16 @@ asyncTest("#handleCreate with no specific match", function() {
   });
 });
 
-asyncTest("#handleCreate matches attributes and returns these", function() {
+asyncTest("#handleCreate match some attributes", function() {
   var customDescription = "special description"
+  var date = new Date();
 
   testHelper.handleCreate('profile', {
     match: {description: customDescription}
   })
 
   store.createRecord('profile', {
-    description: customDescription
+    description: customDescription, created_at: date
   }).save().then(function(profile) {
     ok(profile instanceof Profile)
     ok(profile.id == 1)
@@ -236,6 +271,25 @@ asyncTest("#handleCreate matches attributes and returns these", function() {
   });
 });
 
+asyncTest("#handleCreate match all attributes", 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 returns attributes", function() {
   var date = new Date()
@@ -342,12 +396,21 @@ asyncTest("#handleCreate match but still fail", function() {
 
 
 
-/////// handleFindMany //////////
+/////// handleFindAll //////////
 
-
-asyncTest("#handleFindMany the basic", function () {
+asyncTest("#handleFindMany aliases handleFindAll", function () {
   testHelper.handleFindMany('profile', 2);
 
+  store.find('profile').then(function (profiles) {
+    ok(profiles.get('length') == 2);
+    ok(profiles.get('firstObject.description') == 'Text goes here');
+    start();
+  });
+})
+
+asyncTest("#handleFindAll the basic", function () {
+  testHelper.handleFindAll('profile', 2);
+
   store.find('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
     ok(profiles.get('firstObject.description') == 'Text goes here');
@@ -355,8 +418,8 @@ asyncTest("#handleFindMany the basic", function () {
   });
 });
 
-asyncTest("#handleFindMany with fixture options", function () {
-  testHelper.handleFindMany('profile', 2, {description: 'dude'});
+asyncTest("#handleFindAll with fixture options", function () {
+  testHelper.handleFindAll('profile', 2, {description: 'dude'});
 
   store.find('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
@@ -365,8 +428,8 @@ asyncTest("#handleFindMany with fixture options", function () {
   });
 });
 
-asyncTest("#handleFindMany with traits", function () {
-  testHelper.handleFindMany('profile', 2, 'goofy_description');
+asyncTest("#handleFindAll with traits", function () {
+  testHelper.handleFindAll('profile', 2, 'goofy_description');
 
   store.find('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);
@@ -375,8 +438,8 @@ asyncTest("#handleFindMany with traits", function () {
   });
 });
 
-asyncTest("#handleFindMany with traits and fixture options", function () {
-  testHelper.handleFindMany('profile', 2, 'goofy_description', {description: 'dude'});
+asyncTest("#handleFindAll with traits and fixture options", function () {
+  testHelper.handleFindAll('profile', 2, 'goofy_description', {description: 'dude'});
 
   store.find('profile').then(function (profiles) {
     ok(profiles.get('length') == 2);

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -908,6 +908,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     if (options.data) {
       request.data = options.data;
     }
+
     $.mockjax(request);
   },
   /**
@@ -929,7 +930,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      // Pass in the parameters you would normally pass into FactoryGuy.makeList,
      // like fixture name, number of fixtures to make, and optional traits,
      // or fixture options
-     testHelper.handleFindMany('user', 2, 'with_hats');
+     testHelper.handleFindAll('user', 2, 'with_hats');
 
      store.find('user').then(function(users){
 
@@ -941,7 +942,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options
    */
-  handleFindMany: function () {
+  handleFindAll: function () {
     // make the records and load them in the store
     var records = FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
@@ -952,7 +953,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
-
+  handleFindMany: function() {
+    Ember.deprecate('DEPRECATION Warning: use handleFindAll instead');
+    this.handleFindAll.apply(this, arguments)
+  },
   /**
      Handling ajax GET for finding one record for a type of model and an id.
      You can mock failed find by passing in success argument as false.
@@ -972,18 +976,28 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      @param {String} trait  optional traits (one or more)
      @param {Object} opts  optional fixture options (including id)
    */
-  handleFindOne: function () {
-    // make the records and load them in the store
-    var record = FactoryGuy.make.apply(FactoryGuy, arguments);
-    var name = arguments[0];
-    var modelName = FactoryGuy.lookupModelForFixtureName(name);
+  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 {
+      // make the record and load it in the store
+      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) },
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
@@ -1048,55 +1062,74 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     succeed - flag to indicate if the request should succeed ( default is true )
 
     Note:
-     1) that any attributes in match will be added to the response json automatically,
-    so you don't need to include them in the returns hash as well.
+     1) Any attributes in match will be added to the response json automatically,
+    so you don't need to include them in the returns hash.
+
+     2) As long as all the match attributes are found in the record being created,
+     the create will succeed. In other words, there may be other attributes in the
+     createRecord call, but you don't have to match them all. For example:
+
+      ```js
+        handleCreate('post', {match: {title: 'foo'})
+        store.createRecord('post', {title: 'foo', created_at: new Date()})
+      ```
 
-     2) If you don't use match options for exact match, there will be no id returned to the model.
-        The reason being, that this method purposely returns an empty hash response with a 'don't match'
-        style handleCreate, because if the responseJson returns a non empty data hash ( with even only
-        the id), this essentially empty hash of attributes will override ( and nullify ) all the attributes
-        that set when you created the record.
-     3) If you match on a belongsTo association, you don't have to include that in the
-    returns hash.
+     2) If you match on a belongsTo association, you don't have to include that in the
+    returns hash either.
 
    @param {String} modelName  name of model your creating like 'profile' for Profile
    @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 || {};
 
-    var url = this.buildURL(modelName);
-    var definition = FactoryGuy.modelDefinitions[modelName];
-
-    var httpOptions = {type: 'POST'};
     if (opts.match) {
-      var expectedRequest = {};
-      var record = this.getStore().createRecord(modelName, match);
-      expectedRequest[modelName] = record.serialize();
-      httpOptions.data = JSON.stringify(expectedRequest);
+      var record = store.createRecord(modelName, match);
+      var expectedRequest = record.serialize();
     }
 
-    var modelType = this.getStore().modelFor(modelName)
+    var modelType = store.modelFor(modelName)
 
     var responseJson = {};
     if (succeed) {
-        responseJson[modelName] = $.extend({id: definition.nextId()}, match, returnArgs);
-        // Remove belongsTo associations since they will already be set when you called
-        // createRecord, and included them in those attributes
-        Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
-          if (relationship.kind == 'belongsTo') {
-            delete responseJson[modelName][relationship.key];
+      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
           }
-        })
-    } else {
-      httpOptions.status = 500;
+        }
+      }
+      var responseStatus = (succeed ? 200: 500);
+      return {
+        responseText: responseJson,
+        status: responseStatus
+      };
     }
 
-    this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
+    $.mockjax(handler);
   },
+
   /**
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in success argument as false.
@@ -1650,6 +1683,7 @@ if (FactoryGuy !== undefined) {
 			}
 
 			mockHandler = getMockForRequest( mockHandlers[k], requestSettings );
+
 			if(!mockHandler) {
 				// No valid mock found for this request
 				continue;
@@ -1701,7 +1735,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.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email: