ember-data-factory-guy 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc82d125a83024abd95b12c5f11892c76047002
-  data.tar.gz: e64f296ca9c2e7d82fa4d62d1e65356874ca6c5a
+  metadata.gz: 3487ba4072e7e89a32ffd9235291a65f24f79503
+  data.tar.gz: c55698399c38e7f46f7036346a379f2a4648def4
 SHA512:
-  metadata.gz: c8e7451735f51c0511124daf19add6710e490f904e48e61eb44b22761585bd7d29e78eed73a3468a2caae46047bc8eb1f0b835cca3b07c79d87bf106647609ec
-  data.tar.gz: ba2d24705c6e111e00ae752a0a16dc04e94981ca2e742314f66dbe76a5c2dbdf5cb9946f2d0076e0b1ff820b1f137b473191a4ef43f91a95f3f3d6cd3c488018
+  metadata.gz: 6fa20e03471792329dfec799f3a47f6471d7c3d255ae024e615d6c64fdc28e2d2419b8bfdffd1a0ceac2d8b59456abab91164637489f6e888ed920bd400f3155
+  data.tar.gz: 5002f87e0d686881e3260d2725c4d2ce5a2e1d65fd13c9e3d7faf4e109b2075258fc24bfda52adaad5bda794e7766825bcf3364838e0eb90b4444d2ceb1be1f5

data/README.md

@@ -1,7 +1,7 @@
 # Ember Data Factory Guy  [![Build Status](https://secure.travis-ci.org/danielspaniel/ember-data-factory-guy.png?branch=master)](http://travis-ci.org/danielspaniel/ember-data-factory-guy)
 
 *NOTE*
-  
+
 ember-data is changing the way they are doing relationships in 1.0.0-beta.10 and above
 so, if you are using ember-data-1.0.0-beta.8 and earlier, then be sure to use version 0.6.4
 of ember-data-factory-guy.
@@ -10,9 +10,9 @@ 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.2   -> ember-data-1.0.0-beta.12
+  - 0.9.3   -> ember-data-1.0.0-beta.12
 
-**Support for fixture adapter is currently kinda broken.**
+** 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.
@@ -21,8 +21,8 @@ FactoryGuy.setStore(store) somewhere in your code before you start making fixtur
 
 ## Using with Ember Cli
   - https://github.com/igorrKurr/ember-cli-factory-guy-example
-    An example of how to manually set up ember-data-factory-guy with ember cli 
-  
+    An example of how to manually set up ember-data-factory-guy with ember cli
+
   - https://github.com/cristinawithout/ember-cli-data-factory-guy
     A wrapper around ember-data-factory-guy for ember-cli for even easier setup
 
@@ -39,7 +39,7 @@ gem 'ember-data-factory-guy', group: test
 or for particular version:
 
 ```ruby
-gem 'ember-data-factory-guy', '0.9.2', group: test
+gem 'ember-data-factory-guy', '0.9.3', group: test
 ```
 
 then:
@@ -60,7 +60,7 @@ require the 'ember_data_factory_guy' javascript file in your test helper
 
 Add as one of your dependencies in bower.json file:
 
-```json    
+```json
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
@@ -74,7 +74,7 @@ or for particular version:
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
-    "ember-data-factory-guy": "0.9.2"
+    "ember-data-factory-guy": "0.9.3"
   }
 ```
 
@@ -85,29 +85,29 @@ then:
 
 ### How this works
 
-- Using DS.RestAdapter / DS.ActiveModelAdapter 
+- Using DS.RestAdapter / DS.ActiveModelAdapter
   - Add record instances to the store
-  - Faster, since models can be accessed synchronously  
-- Using DS.FixtureAdapter 
+  - Faster, since models can be accessed synchronously
+- Using DS.FixtureAdapter
   - Add fixtures to the store
   - Slower, since models are accessed asynchronously
-  
+
 
 ##### DS.RestAdapter / DS.ActiveModelAdapter
 
-The preferred way to use this project is to use the default adapter for your project, 
+The preferred way to use this project is to use the default adapter for your project,
 which is usually going to be the RESTAdapter/ActiveModelAdapter.
-*In other words, it is NOT recommended to use the DS.FixtureAdapter.*  
+*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 
-returns this model instance 
+When you call: store.makeFixture('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
  for data from the model, and its associations, which is why it is faster to use
  the REST/ActiveModel adapter than the FixtureAdapter*
 
 ##### Using DS.FixtureAdapter
- 
+
 The benefit of using FactoryGuy is that you can run your tests with the
 default adapter that your application's store normally uses. In other words:
 You do not have to use the DS.FixtureAdapter.  But if you do choose to use the Fixture adapter,
@@ -119,10 +119,10 @@ but some of the associated records were not loaded. Either make sure they are al
 
 If you do get these types of errors try requiring the factory_guy_has_many.js file
 ( located in dist dir and vendor dir ) AFTER you require ember-data,
-but BEFORE you require your models.  
+but BEFORE you require your models.
 
 
-### Setup 
+### Setup
 
 In the following examples, assume the models look like this:
 
@@ -139,22 +139,22 @@ In the following examples, assume the models look like this:
     title:  DS.attr('string'),
     user:   DS.belongsTo('user')
   });
-  
-  // polymorphic models 
+
+  // polymorphic models
   Hat = DS.Model.extend({
     type: DS.attr('string'),
     user: DS.belongsTo('user')
   });
-  
+
   BigHat = Hat.extend();
   SmallHat = Hat.extend();
 ```
 
 
 ### Defining Factories
- - A factory has a name and a set of attributes.  
- - The name should match the model type name. So, for 'User' model, the name would be 'user' 
-    
+ - A factory has a name and a set of attributes.
+ - The name should match the model type name. So, for 'User' model, the name would be 'user'
+
 
 ##### Standard models
 
@@ -187,7 +187,7 @@ It is better to define each polymorphic model in it's own typed definition:
       type: 'SmallHat'
     }
   })
-  
+
   FactoryGuy.define('big_hat', {
     default: {
       type: 'BigHat'
@@ -199,7 +199,7 @@ It is better to define each polymorphic model in it's own typed definition:
 rather than doing this:
 
 ```javascript
-  
+
   FactoryGuy.define('hat', {
     default: {},
     small_hat: {
@@ -209,10 +209,10 @@ rather than doing this:
       type: 'BigHat'
     }
   })
-  
+
 ```
 
-Since there are times that the latter can cause problems when 
+Since there are times that the latter can cause problems when
 the store is looking up the correct model type name
 
 
@@ -220,12 +220,12 @@ the store is looking up the correct model type name
  - FactorGuy.setStore
    - pass in the store instance to FactoryGuy before making fixtures.
  - FactoryGuy.build
-   - Builds json  
+   - Builds json
  - FactoryGuy.make
-   - Loads model instance into the store  
+   - Loads model instance into the store
  - Can override default attributes by passing in a hash
- - Can add attributes with traits ( see traits section )  
- 
+ - Can add attributes with traits ( see traits section )
+
 ```javascript
   // First set the store on FactoryGuy. You don't have to do this step manually
   // if you use FactoryGuyTestHelperMixin since this is done for you in the setup
@@ -234,41 +234,41 @@ the store is looking up the correct model type name
   var store = App.__container__.lookup('store:main');
   FactoryGuy.setStore(store);
 
-  // returns json   
-  var json = FactoryGuy.build('user'); 
+  // returns json
+  var json = FactoryGuy.build('user');
   json // => {id: 1, name: 'Dude', style: 'normal'}
 
-  // returns a User instance that is loaded into your application's store   
+  // returns a User instance that is loaded into your application's store
   var user = FactoryGuy.make('user');
   user.toJSON({includeId: true}) // => {id: 2, name: 'Dude', style: 'normal'}
 
-  var json = FactoryGuy.build('admin'); 
+  var json = FactoryGuy.build('admin');
   json // => {id: 3, name: 'Admin', style: 'super'}
 
   var user = FactoryGuy.make('admin');
   user.toJSON({includeId: true}) // => {id: 4, name: 'Admin', style: 'super'}
-  
+
 ```
 
-You can override the default attributes by passing in a hash 
+You can override the default attributes by passing in a hash
 
 ```javascript
-  
-  var json = FactoryGuy.build('user', {name: 'Fred'}); 
+
+  var json = FactoryGuy.build('user', {name: 'Fred'});
   // json.name => 'Fred'
-  
+
 ```
 
 
 ### Sequences
 
-- For generating unique attribute values. 
-- Can be defined: 
-    - In the model definition's sequences hash 
-    - Inline on the attribute 
+- For generating unique attribute values.
+- Can be defined:
+    - In the model definition's sequences hash
+    - Inline on the attribute
 - Values are generated by calling FactoryGuy.generate
 
-##### Declaring sequences in sequences hash 
+##### Declaring sequences in sequences hash
 
 ```javascript
 
@@ -285,7 +285,7 @@ You can override the default attributes by passing in a hash
     }
   });
 
-  var json = FactoryGuy.build('user'); 
+  var json = FactoryGuy.build('user');
   json.name // => 'User1'
 
   var user = FactoryGuy.make('user');
@@ -293,7 +293,7 @@ You can override the default attributes by passing in a hash
 
 ```
 
-##### Declaring an inline sequence on attribute 
+##### Declaring an inline sequence on attribute
 
 ```javascript
 
@@ -303,7 +303,7 @@ You can override the default attributes by passing in a hash
     },
   });
 
-  var json = FactoryGuy.build('special_project'); 
+  var json = FactoryGuy.build('special_project');
   json.title // => 'Project #1'
 
   var project = FactoryGuy.make('special_project');
@@ -313,15 +313,15 @@ You can override the default attributes by passing in a hash
 
 ### Inline Functions
 
-- Declare a function for an attribute 
+- Declare a function for an attribute
   - Can reference other attributes
 
-```javascript 
-   
+```javascript
+
   FactoryGuy.define('user', {
     // Assume that this definition includes the same sequences and default section
-    // from the user definition in: "Declaring sequences in sequences hash" section. 
-     
+    // from the user definition in: "Declaring sequences in sequences hash" section.
+
     funny_user: {
       style: function(f) { return 'funny '  + f.name }
     }
@@ -330,7 +330,7 @@ You can override the default attributes by passing in a hash
   var json = FactoryGuy.build('funny_user');
   json.name // => 'User1'
   json.style // => 'funny User1'
-  
+
   var user = FactoryGuy.make('funny_user');
   user.get('name') // => 'User2'
   user.get('style') // => 'funny User2'
@@ -343,10 +343,10 @@ You can override the default attributes by passing in a hash
 
 ### Traits
 
-- For grouping attributes together  
+- For grouping attributes together
 - Can use one or more traits in a row
  - The last trait included overrides any values in traits before it
- 
+
 ```javascript
 
   FactoryGuy.define('user', {
@@ -355,8 +355,8 @@ You can override the default attributes by passing in a hash
       friendly: { style: 'Friendly' }
     }
   });
-  
-  var json = FactoryGuy.build('user', 'big', 'friendly'); 
+
+  var json = FactoryGuy.build('user', 'big', 'friendly');
   json.name // => 'Big Guy'
   json.style // => 'Friendly'
 
@@ -366,9 +366,9 @@ You can override the default attributes by passing in a hash
 
 ```
 
-You can still pass in a hash of options when using traits. This hash of 
-attributes will override any trait attributes or default attributes  
-    
+You can still pass in a hash of options when using traits. This hash of
+attributes will override any trait attributes or default attributes
+
 ```javascript
 
   var user = FactoryGuy.make('user', 'big', 'friendly', {name: 'Dave'});
@@ -387,7 +387,7 @@ attributes will override any trait attributes or default attributes
 - The inverse association is being set up for you
 
 ##### Setup belongsTo associations in Factory Definition
- 
+
 ```javascript
   // Recall ( from above setup ) that there is a user belongsTo on the Project model
   // Also, assume 'user' factory is same as from 'user' factory definition above in
@@ -407,8 +407,8 @@ attributes will override any trait attributes or default attributes
       user: FactoryGuy.belongsTo('admin')
     }
   });
-  
-  var json = FactoryGuy.build('project_with_user'); 
+
+  var json = FactoryGuy.build('project_with_user');
   json.user // => {id:1, name: 'Dude', style: 'normal'}
 
   var json = FactoryGuy.build('project_with_bob');
@@ -423,17 +423,17 @@ attributes will override any trait attributes or default attributes
 *You could also accomplish the above with traits:*
 
 ```javascript
-  
+
   FactoryGuy.define('project', {
     traits: {
       with_user: { user: {} },
       with_admin: { user: FactoryGuy.belongsTo('admin') }
     }
   });
-  
+
   var user = FactoryGuy.make('project', 'with_user');
   project.get('user').toJSON({includeId: true}) // => {id:1, name: 'Dude', style: 'normal'}
-  
+
 ```
 
 
@@ -442,12 +442,12 @@ attributes will override any trait attributes or default attributes
 ```javascript
   var user = FactoryGuy.make('user');
   var project = FactoryGuy.make('project', {user: user});
-    
+
   project.get('user').toJSON({includeId: true}) // => {id:1, name: 'Dude', style: 'normal'}
 ```
 
 *Note that though you are setting the 'user' belongsTo association on a project,
-the reverse user hasMany 'projects' association is being setup for you on the user 
+the reverse user hasMany 'projects' association is being setup for you on the user
 ( for both manual and factory defined belongsTo associations ) as well*
 
 ```javascript
@@ -462,16 +462,16 @@ the reverse user hasMany 'projects' association is being setup for you on the us
   FactoryGuy.define('user', {
     user_with_projects: { FactoryGuy.hasMany('project', 2) }
   });
-  
+
   var user = FactoryGuy.make('user_with_projects');
   user.get('projects.length') // => 2
-  
+
 ```
 
 *You could also accomplish the above with traits:*
 
 ```javascript
-  
+
   FactoryGuy.define('project', {
     traits: {
       with_projects: {
@@ -479,10 +479,10 @@ the reverse user hasMany 'projects' association is being setup for you on the us
       }
     }
   });
-  
+
   var user = FactoryGuy.make('user', 'with_projects');
   user.get('projects.length') // => 2
-  
+
 ```
 
 ##### Setup hasMany associations manually
@@ -492,18 +492,18 @@ the reverse user hasMany 'projects' association is being setup for you on the us
   var project2 = FactoryGuy.make('project');
   var user = FactoryGuy.make('user', {projects: [project1,project2]});
   user.get('projects.length') // => 2
-  
-  // or  
+
+  // or
   var projects = FactoryGuy.makeList('project', 2);
   var user = FactoryGuy.make('user', {projects: projects});
   user.get('projects.length') // => 2
-  
+
 ```
 
 *Note that though you are setting the 'projects' hasMany association on a user,
-the reverse 'user' belongsTo association is being setup for you on the project 
+the reverse 'user' belongsTo association is being setup for you on the project
 ( for both manual and factory defined hasMany associations ) as well*
-   
+
 ```javascript
   projects.get('firstObject.user')  // => user
 ```
@@ -517,11 +517,11 @@ the reverse 'user' belongsTo association is being setup for you on the project
     - Loads one or more instances into store
 
 
-##### Building json array 
+##### Building json array
 
 ```javascript
-  var json = FactoryGuy.buildList('user', 2) 
-  json.length // => 2 
+  var json = FactoryGuy.buildList('user', 2)
+  json.length // => 2
   json[0] // => {id: 1, name: 'User1', style: 'normal'}
   json[1] // => {id: 2, name: 'User2', style: 'normal'}
 
@@ -531,14 +531,14 @@ the reverse 'user' belongsTo association is being setup for you on the project
 
 ```javascript
   var users = FactoryGuy.makeList('user', 2)
-  users.get('length') // => 2 
+  users.get('length') // => 2
   users[0].toJSON({includeId: true}) // => {id: 3, name: 'User3', style: 'normal'}
   users[1].toJSON({includeId: true}) // => {id: 4, name: 'User4', style: 'normal'}
 
 ```
 
 
-### Testing models, controllers, views 
+### Testing models, controllers, views
 
 - Testing the models, controllers and views in isolation
 - Use FactoryGuyTestMixin to help with testing
@@ -549,7 +549,7 @@ the reverse 'user' belongsTo association is being setup for you on the project
 - Using FactoryGuyTestMixin helper methods:
   - make
   - teardown
-  
+
 ```javascript
 
 // Create a helper class using FactoryGuyTestMixin.
@@ -594,11 +594,12 @@ test("make a user using your applications default adapter", function() {
 
 - Uses mockjax
 - Has helper methods
-  - handleFindMany 
+  - handleFindMany
+  - handleFindOne
   - handleFindQuery
   - handleCreate
-  - handleUpdate 
-  - handleDelete 
+  - handleUpdate
+  - handleDelete
 
 Since it is recommended to use your normal adapter ( which is usually a subclass of RESTAdapter, )
 FactoryGuyTestMixin assumes you will want to use that adapter to do your integration tests.
@@ -624,31 +625,29 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
 ```javascript
     // can use traits and extra fixture options here as you would with FactoryGuy#makeList
     testHelper.handleFindMany('profile', 2);
-     
+
     store.find('profile').then(function (profiles) {
       profiles.get('length') //=> 2
     });
 ```
 
+##### handleFindOne
+  - for dealing with finding one record with an id
 
-##### handleFindQuery
-   - for dealing with finding all records for a type of model with query parameters.
-     - can pass in fixture json, model instances or empty array
+```javascript
+    // can use traits and extra fixture options here as you would with FactoryGuy#make
+    testHelper.handleFindOne('profile', {id: 1});
 
-*Passing in array of fixture json*
+    store.find('profile', 1).then(function (profile) {
+      profile.get('id') //=> 1
+    });
+```
 
-```javascript
-     // First build json for the instances you want 'returned' in your query.
-     var usersJson = FactoryGuy.buildList('user', 2);
 
-     // Pass in the parameters you will search on ( in this case 'name' and 'age' )
-     // as an array, in the second argument.
-     testHelper.handleFindQuery('user', ['name', 'age'], usersJson);
+##### handleFindQuery
+   - for dealing with finding all records for a type of model with query parameters.
+     - can pass in model instances or empty array
 
-     store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
-        // userInstances returned are created from the usersJson that you passed in
-     })
-```
 
 *Passing in array of model instances*
 
@@ -683,19 +682,19 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
     - succeed - flag to indicate if the request should succeed ( default is true )
 
 **Note**
- 
+
   *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.*
-    
+
   *If you match on a belongsTo association, you don't have to include that in the
   returns hash.*
-  
-  
+
+
 Realistically, you will have code in a view action or controller action that will
- create the record, and setup any associations. 
- 
+ create the record, and setup any associations.
+
 ```javascript
-  
+
   // most actions that create a record look something like this:
   action: {
     addProject: function (user) {
@@ -710,10 +709,10 @@ Realistically, you will have code in a view action or controller action that wil
 In this case, you are are creating a 'project' record with a specific name, and belonging
 to a particular user. To mock this createRecord call here are a few ways to do this using
 match and or returns options.
-  
+
 ```javascript
-  // Simplest case  
-  // Don't care about a match just handle createRecord for any project  
+  // 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}})
@@ -727,17 +726,17 @@ match and or returns options.
 *mocking a failed create*
 
 ```javascript
-  // set the succeed flag to 'false' 
+  // set the succeed flag to 'false'
   testHelper.handleCreate('project', {succeed: false});
-  
+
   // 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 attribues match exactly
   testHelper.handleCreate('project', {
     match: {name: "Moo", user: user}, {succeed: false}
   })
-  
+
   store.createRecord('project', {name: "Moo", user: user}).save() //=> fails
 ```
 
@@ -864,26 +863,24 @@ test("Creates new project", function() {
 
 ### Using DS.Fixture adapter
 
-- Not recommended
 - FactoryGuy.make ... creates model in the store and returns json
 
 Technically when you call FactoryGuy.make with a store using the DS.FixtureAdapter,
-the fixture is actually added to the models FIXTURE array. It just seems to be added
-to the store because when you call store.find to get that record, the adapter looks
-in that FIXTURE array to find it and then puts it in the store.
+the fixture is added to the model's FIXTURE array and also pushed into the store. Normally the store is populated by the DS.FixtureAdapter when you call store.find.
 
-```javascript
 
+```javascript
 
 FactoryGuy.make('user'); // user.FIXTURES = [{id: 1, name: 'User1', style: 'normal'}]
 FactoryGuy.make('user', {name: 'bob'}); //  user.FIXTURES = [{id: 2, name: 'bob', style: 'normal'}]
 FactoryGuy.make('admin'); //  user.FIXTURES = [{id: 3, name: 'Admin', style: 'super'}]
 FactoryGuy.make('admin', {name: 'Fred'}); //  user.FIXTURES = [{id: 4, name: 'Fred', style: 'super'}]
 
+// This works because we push the models into the store when called FactoryGuy.make
+var userJson = FactoryGuy.make('user'); // user.FIXTURES = [{id: 1, name: 'User1', style: 'normal'}]
+store.all('user') // returns the user equal to userJson
 
-// Use store.find to get the model instance ( Remember this is the Fixture adapter, if
-// you use the ActiveModelAdapter or RESTAdapter the record is returned so you don't
-// have to then go and find it )
+// Use store.find to get the model instance
 var userJson = FactoryGuy.make('user');
 store.find('user', userJson.id).then(function(user) {
    user.toJSON({includeId: true}) ( pretty much equals ) userJson;
@@ -896,8 +893,15 @@ var userJson = FactoryGuy.make('user', {projects: [projectJson.id]});
 var userJson = FactoryGuy.make('user');
 var projectJson = FactoryGuy.make('project', {user: userJson.id});
 
-// will give you the same result, but with fixture adapter all associations
-// are treated as async ( by factory_guy_has_many.js fix ), so it's
+// Associations are pushed on as well
+store.find('user', 1).then(function (user) {
+  var projects = user.get('projects');
+  projects.get('length'); //1
+  projects.get('firstObject').toJSON({includeId: true}); //equal to projectJSON
+});
+
+// If you are using factory_guy_has_many.js fix, will give you the same result,
+// but all associations are treated as async, so it's
 // a bit clunky to get this associated data. When using DS.FixtureAdapter
 // in view specs though, this clunk is dealt with for you. But remember,
 // you DON'T have to use the Fixture adapter.

data/bower.json

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

data/dist/amd/factory-guy.js

@@ -601,7 +601,7 @@ var FactoryGuy = {
      * Most of the work of making the model from the json fixture is going on here.
      * @param modelType
      * @param fixture
-     * @returns {*}
+     * @returns {DS.Model} instance of DS.Model
      */
     makeModel: function (modelType, fixture) {
       var store = this,
@@ -957,10 +957,42 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
+
+  /**
+     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.
+
+   ```js
+     // Pass in the parameters you would normally pass into FactoryGuy.make,
+     // like fixture name, number of fixtures to make, and optional traits,
+     // or fixture options
+     testHelper.handleFindOne('user', 'with_hats', {id: 1});
+
+     store.find('user', 1).then(function(user){
+
+     });
+   ```
+
+     @param {String} name  name of the fixture ( or model ) to find
+     @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);
+    var responseJson = {};
+    var json = record.toJSON({includeId: true});
+    responseJson[modelName.pluralize()] = json;
+    var url = this.buildURL(modelName, record.id);
+    this.stubEndpointForHttpRequest(url, responseJson);
+  },
+
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
-          First variation = pass in model instances
+
    ```js
 
      // Create model instances
@@ -974,9 +1006,11 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      })
    ```
 
-        Third variation - pass in nothing for last argument
+      By omitting the last argument (pass in no records), this simulates a findQuery
+      request that returns no records
+
    ```js
-   // This simulates a query that returns no results
+   // Simulate a query that returns no results
    testHelper.handleFindQuery('user', ['age']);
 
    store.findQuery('user', {age: 10000}}).then(function(userInstances){

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

@@ -952,10 +952,42 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
+
+  /**
+     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.
+
+   ```js
+     // Pass in the parameters you would normally pass into FactoryGuy.make,
+     // like fixture name, number of fixtures to make, and optional traits,
+     // or fixture options
+     testHelper.handleFindOne('user', 'with_hats', {id: 1});
+
+     store.find('user', 1).then(function(user){
+
+     });
+   ```
+
+     @param {String} name  name of the fixture ( or model ) to find
+     @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);
+    var responseJson = {};
+    var json = record.toJSON({includeId: true});
+    responseJson[modelName.pluralize()] = json;
+    var url = this.buildURL(modelName, record.id);
+    this.stubEndpointForHttpRequest(url, responseJson);
+  },
+
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
-          First variation = pass in model instances
+
    ```js
 
      // Create model instances
@@ -969,9 +1001,11 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      })
    ```
 
-        Third variation - pass in nothing for last argument
+      By omitting the last argument (pass in no records), this simulates a findQuery
+      request that returns no records
+
    ```js
-   // This simulates a query that returns no results
+   // Simulate a query that returns no results
    testHelper.handleFindQuery('user', ['age']);
 
    store.findQuery('user', {age: 10000}}).then(function(userInstances){

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)},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)},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}

data/package.json

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

data/src/factory_guy_test_mixin.js

@@ -104,10 +104,42 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
+
+  /**
+     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.
+
+   ```js
+     // Pass in the parameters you would normally pass into FactoryGuy.make,
+     // like fixture name, number of fixtures to make, and optional traits,
+     // or fixture options
+     testHelper.handleFindOne('user', 'with_hats', {id: 1});
+
+     store.find('user', 1).then(function(user){
+
+     });
+   ```
+
+     @param {String} name  name of the fixture ( or model ) to find
+     @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);
+    var responseJson = {};
+    var json = record.toJSON({includeId: true});
+    responseJson[modelName.pluralize()] = json;
+    var url = this.buildURL(modelName, record.id);
+    this.stubEndpointForHttpRequest(url, responseJson);
+  },
+
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
-          First variation = pass in model instances
+
    ```js
 
      // Create model instances
@@ -121,9 +153,11 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      })
    ```
 
-        Third variation - pass in nothing for last argument
+      By omitting the last argument (pass in no records), this simulates a findQuery
+      request that returns no records
+
    ```js
-   // This simulates a query that returns no results
+   // Simulate a query that returns no results
    testHelper.handleFindQuery('user', ['age']);
 
    store.findQuery('user', {age: 10000}}).then(function(userInstances){

data/tests/factory_guy_test_mixin_test.js

@@ -149,6 +149,50 @@ asyncTest("#handleFindMany with traits and extra options", function () {
 });
 
 
+//////// handleFindOne /////////
+
+asyncTest("#handleFindOne the basic", function () {
+  var id = 1
+  testHelper.handleFindOne('profile', {id: id});
+
+  store.find('profile', 1).then(function (profile) {
+    ok(profile.get('id') == id);
+    start();
+  });
+});
+
+asyncTest("#handleFindOne with traits", function () {
+  var id = 1
+  testHelper.handleFindOne('profile', 'goofy_description', {id: id});
+
+  store.find('profile', 1).then(function (profile) {
+    ok(profile.get('description') == 'goofy');
+    start();
+  });
+});
+
+asyncTest("#handleFindOne with arguments", function () {
+  var id = 1
+  var description = 'guy';
+  testHelper.handleFindOne('profile', {id: id, description: description });
+
+  store.find('profile', 1).then(function (profile) {
+    ok(profile.get('description') == description);
+    start();
+  });
+});
+
+asyncTest("#handleFindOne with traits and arguments", function () {
+  var id = 1
+  var description = 'guy';
+  testHelper.handleFindOne('profile', 'goofy_description', {id: id, description: description});
+
+  store.find('profile', 1).then(function (profile) {
+    ok(profile.get('description') == description);
+    start();
+  });
+})
+
 
 
 module('FactoryGuyTestMixin (using mockjax) with DS.ActiveModelAdapter', {

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -596,7 +596,7 @@ var FactoryGuy = {
      * Most of the work of making the model from the json fixture is going on here.
      * @param modelType
      * @param fixture
-     * @returns {*}
+     * @returns {DS.Model} instance of DS.Model
      */
     makeModel: function (modelType, fixture) {
       var store = this,
@@ -952,10 +952,42 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(url, responseJson);
   },
+
+  /**
+     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.
+
+   ```js
+     // Pass in the parameters you would normally pass into FactoryGuy.make,
+     // like fixture name, number of fixtures to make, and optional traits,
+     // or fixture options
+     testHelper.handleFindOne('user', 'with_hats', {id: 1});
+
+     store.find('user', 1).then(function(user){
+
+     });
+   ```
+
+     @param {String} name  name of the fixture ( or model ) to find
+     @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);
+    var responseJson = {};
+    var json = record.toJSON({includeId: true});
+    responseJson[modelName.pluralize()] = json;
+    var url = this.buildURL(modelName, record.id);
+    this.stubEndpointForHttpRequest(url, responseJson);
+  },
+
   /**
    Handling ajax GET for finding all records for a type of model with query parameters.
 
-          First variation = pass in model instances
+
    ```js
 
      // Create model instances
@@ -969,9 +1001,11 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      })
    ```
 
-        Third variation - pass in nothing for last argument
+      By omitting the last argument (pass in no records), this simulates a findQuery
+      request that returns no records
+
    ```js
-   // This simulates a query that returns no results
+   // Simulate a query that returns no results
    testHelper.handleFindQuery('user', ['age']);
 
    store.findQuery('user', {age: 10000}}).then(function(userInstances){

metadata

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