ember-data-factory-guy 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 136ffab1eceb2a2640055a30a6699e816b9beb1a
-  data.tar.gz: f4c9876488f66fa89253fa20d7ada97906268785
+  metadata.gz: 473a275179e818f802dbabd583b165881041075d
+  data.tar.gz: fa6ee1183d3633585c1a550720b3c4c26a7edc69
 SHA512:
-  metadata.gz: b280fe560c1514aff86f6de6914472bbac12cbdf2aea24576783c49b9d4c992327fdb138eaa5f814671f29d5abcc1663d87ea43b5aacde5cabdb6c42c3ddf8af
-  data.tar.gz: d17f2a63800fc6e5deefec052b195e052f6f1385c0f0aba73dc6d293e271a352f595d13ddd84f4fb3a835e025e2c320131a351a3742a41fe76f3f5c74c8888fd
+  metadata.gz: edf890374037db93120303bca6e74f023514526c4b6f53c73f94bf835ef0cf8f907d7bd5666cde33e35f875106c2b497a69e9b9de0140bfcd327a5482ab26cd8
+  data.tar.gz: 991e511cd9dcd2a451fb2dcea9cdbf82ba0a76b58f0a291cf8cc3d26e6ad5d53c2a9ca0ce54975f14a4da9090ff3f76cd59b94fd201318714f384a2fe2a68a7e

data/README.md

@@ -1,4 +1,4 @@
-# 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)
+# Ember Data Factory Guy 
 
 ## Using as Gem
 
@@ -18,15 +18,17 @@ $ bundle install
 
 then:
 
-```javascript
-// require the 'ember_data_factory_guy' javascript file in your test helper
+require the 'ember_data_factory_guy' javascript file in your test helper
+
+```
 //= require ember_data_factory_guy
 ```
 
 ## Using as bower component
 
 Add as one of your dependencies in bower.json file:
-```json
+
+```json    
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
@@ -36,18 +38,35 @@ Add as one of your dependencies in bower.json file:
 
 then:
 ```
-$ bower install
+    $ bower install
 ```
 
-## How this works
+### How this works
+
+- Using DS.RestAdapter / DS.ActiveModelAdapter 
+  - Add record instances to the store
+  - 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, 
+which is usually going to be the RESTAdapter/ActiveModelAdapter.
+*In other words, it is NOT recommended to use the DS.FixtureAdapter.*  
 
-Add fixtures to the store using the:
+When you call: store.makeFixture('user'), you create model in the store and this method 
+returns this model instance 
 
-  * DS.RestAdapter
-  * DS.ActiveModelAdapter
-  * DS.FixtureAdapter
+*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*
 
-NOTE: The benefit of using FactoryGuy is that you can run your tests with the
+##### 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,
 which does not run any faster, and does not handle associations as elegantly
@@ -57,15 +76,18 @@ Error: Assertion Failed: You looked up the 'projects' relationship on '<User:emb
 
 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.  
 
-Let's say you have a few models like these:
 
-```javascript
+### Setup 
+
+In the following examples, assume the models look like this:
 
+```javascript
+  // standard models
   User = DS.Model.extend({
     name:     DS.attr('string'),
-    type:     DS.attr('string'),
+    style:    DS.attr('string'),
     projects: DS.hasMany('project'),
     hats: DS.hasMany('hat', {polymorphic: true})
   });
@@ -74,81 +96,65 @@ Let's say you have a few models like these:
     title:  DS.attr('string'),
     user:   DS.belongsTo('user')
   });
-
+  
+  // polymorphic models 
   Hat = DS.Model.extend({
     type: DS.attr('string'),
     user: DS.belongsTo('user')
   });
-
+  
   BigHat = Hat.extend();
   SmallHat = Hat.extend();
-
 ```
 
 
-### Defining a Fixture Factory for a Model
+### 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' 
+    
+
+##### Standard models
 
 ```javascript
-  ////////////////////////////////////////////
-  // FactoryGuy definitions for models
 
   FactoryGuy.define('user', {
-    // sequences to be used in attributes definition
-    sequences: {
-      userName: function(num) {
-        return 'User' + num;
-      }
-   },
-
-   // default 'user' attributes
+    // Put default 'user' attributes in the default section
     default: {
-      type: 'normal',
-      // use the 'userName' sequence for this attribute
-      name: FactoryGuy.generate('userName')
+      style: 'normal',
+      name: 'Dude'
     },
-    //
-    // named 'user' type with custom attributes
-    //
+    // Create a named 'user' with custom attributes
     admin: {
-      type: 'superuser',
+      style: 'super',
       name: 'Admin'
     }
-    //
-    // using a function for an attribute that refers to other attributes
-    //
-    funny_user: {
-      type: function(f) { return 'funny '  + f.name }
-    }
   });
 
-  FactoryGuy.define('project', {
+```
+
+
+##### Polymorphic models
+
+It is better to define each polymorphic model in it's own typed definition:
+
+```
+  FactoryGuy.define('small_hat', {
     default: {
-      title: 'Project'
-    },
-    //
-    // declaring inline sequence
-    //
-    special_project: {
-      title: FactoryGuy.generate(function(num) { return 'Project #' + num})
-    },
-    //
-    // define built in belongTo models
-    //
-    project_with_user: {
-      // user model with default attributes
-      user: {}
-    },
-    project_with_dude: {
-      // user model with custom attributes
-      user: {name: 'Dude'}
-    },
-    project_with_admin: {
-      // for named association, use the FactoryGuy.belongsTo helper method
-      user: FactoryGuy.belongsTo('admin')
+      type: 'SmallHat'
     }
+  })
+  
+  FactoryGuy.define('big_hat', {
+    default: {
+      type: 'BigHat'
+    }
+  })
 
-  });
+```
 
+rather than doing this:
+
+```
   FactoryGuy.define('hat', {
     default: {},
     small_hat: {
@@ -160,178 +166,341 @@ Let's say you have a few models like these:
   })
 ```
 
+Since there are times that the latter can cause problems when 
+the store is looking up the correct model type name
+
+
+### Using Factories
+ - FactoryGuy.build
+   - Builds json  
+ - store.makeFixture
+   - Loads model instance into the store  
+ - Can override default attributes by passing in a hash
+ - Can add attributes with traits ( see traits section )  
+ 
+```javascript
+  
+  // 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   
+  var user = store.makeFixture('user');
+  user.toJSON() // => {id: 2, name: 'Dude', style: 'normal'}
+
+  var json = FactoryGuy.build('admin'); 
+  json // => {id: 3, name: 'Admin', style: 'super'}
+
+  var user = store.makeFixture('admin');
+  user.toJSON() // => {id: 4, name: 'Admin', style: 'super'}
+  
+```
+
+You can override the default attributes by passing in a hash 
+
+```javascript
+  
+  var json = FactoryGuy.build('user', {name: 'Fred'}); 
+  // json.name => 'Fred'
+  
+```
+
 
-### Building Json
+### Sequences
+
+- 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 
 
 ```javascript
-  //////////////////////////////////////////////////////////////////
-  //
-  // building json with FactoryGuy.build
-  //
 
-  FactoryGuy.build('user') // {id: 1, name: 'User1', type: 'normal'}
-  // note the sequence used in the name attribute
-  FactoryGuy.build('user') // {id: 2, name: 'User2', type: 'normal'}
-  FactoryGuy.build('user', {name: 'bob'}) // {id: 3, name: 'bob', type: 'normal'}
-  FactoryGuy.build('admin') // {id: 4, name: 'Admin', type: 'superuser'}
-  // note the type attribute was built from a function which depends on the name
-  // and the name is still a generated attribute from a sequence function
-  FactoryGuy.build('funny_user') // {id: 5, name: 'User3', type: 'funny User3'}
+  FactoryGuy.define('user', {
+    sequences: {
+      userName: function(num) {
+        return 'User' + num;
+      }
+    },
+
+    default: {
+      // use the 'userName' sequence for this attribute
+      name: FactoryGuy.generate('userName')
+    }
+  });
+
+  var json = FactoryGuy.build('user'); 
+  json.name // => 'User1'
+
+  var user = store.makeFixture('user');
+  user.get('name') // => 'User2'
+
+```
 
-  // basic project
-  FactoryGuy.build('project') // {id: 1, title: 'Project'}
+##### Declaring an inline sequence on attribute 
 
-  // note the inline sequence used in the title attribute
-  FactoryGuy.build('special_project') // {id: 2, title: 'Project #1'}
+```javascript
+
+  FactoryGuy.define('project', {
+    special_project: {
+      title: FactoryGuy.generate(function(num) { return 'Project #' + num})
+    },
+  });
 
-  // project with a user
-  FactoryGuy.build('project_with_user') // {id: 3, title: 'Project', user: {id:6, name: 'User4', type: 'normal'}
-  // project with user that has custom attributes
-  FactoryGuy.build('project_with_dude') // {id: 4, title: 'Project', user: {id:7, name: 'Dude', type: 'normal'}
-  // project with user that has a named user
-  FactoryGuy.build('project_with_admin') // {id: 3, title: 'Project', user: {id:8, name: 'Admin', type: 'superuser'}
+  var json = FactoryGuy.build('special_project'); 
+  json.title // => 'Project 1'
 
-  //////////////////////////////////////////////////////////////////
-  //
-  // building json with FactoryGuy.buildList
-  //
+  var project = store.makeFixture('special_project');
+  project.get('title') // => 'Project 2'
 
-  FactoryGuy.buildList('user', 2) // [ {id: 1, name: 'User1', type: 'normal'}, {id: 2, name: 'User2', type: 'normal'} ]
 ```
 
+### Inline Functions
+
+- Declare a function for an attribute 
+  - Can reference other attributes
+
+```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. 
+     
+    funny_user: {
+      style: function(f) { return 'funny '  + f.name }
+    }
+  });
+
+  var json = FactoryGuy.build('funny_user');
+  json.name = 'User1'
+  json.style = 'funny User1'
+  
+  var user = store.makeFixture('funny_user');
+  user.get('name') // => 'User2'
+  user.get('style') // => 'funny User2'
 
-###Adding records to store
+```
 
-#####DS.ActiveModelAdapter/DS.RestAdapter
+*Note the style attribute was built from a function which depends on the name
+ and the name is a generated attribute from a sequence function*
 
-###### The Basics
 
-store.makeFixture => creates model in the store and returns model instance
-*NOTE* since you are getting a model instances, you can synchronously
-start asking for data from the model, and its associations
+### Traits
 
+- 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
-var user = store.makeFixture('user'); // user.toJSON() = {id: 1, name: 'User1', type: 'normal'}
-// note that the user name is a sequence
-var user = store.makeFixture('user'); // user.toJSON() = {id: 2, name: 'User2', type: 'normal'}
-var user = store.makeFixture('funny_user'); // user.toJSON() = {id: 3, name: 'User3', type: 'funny User3'}
-var user = store.makeFixture('user', {name: 'bob'}); // user.toJSON() = {id: 4, name: 'bob', type: 'normal'}
-var user = store.makeFixture('admin'); // user.toJSON() = {id: 5, name: 'Admin', type: 'superuser'}
-var user = store.makeFixture('admin', {name: 'Fred'}); // user.toJSON() = {id: 6, name: 'Fred', type: 'superuser'}
+
+  FactoryGuy.define('user', {
+    traits: {
+      big: { name: 'Big Guy' }
+      friendly: { style: 'Friendly' }
+    }
+  });
+  
+  var json = FactoryGuy.build('user', 'big', 'friendly'); 
+  json.name // => 'Big Guy'
+  json.style // => 'Friendly'
+
+  var user = store.makeFixture('user', 'big', 'friendly');
+  user.get('name') // => 'Big Guy'
+  user.get('style') // => 'Friendly'
+
 ```
 
-###### Associations
+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
 
-``` javascript
-// setting models on the hasMany association
-var project = store.makeFixture('project');
-var user = store.makeFixture('user', {projects: [project]});
-//  OR
-// setting a model on the belongsTo association
-var user = store.makeFixture('user');
-var project = store.makeFixture('project', {user: user});
+  var user = store.makeFixture('user', 'big', 'friendly', {name: 'Dave'});
+  user.get('name') // => 'Dave'
+  user.get('style') // => 'Friendly'
 
-// will get you the same results, since FactoryGuy makes sure the associations
-// are created in both directions
-// user.get('projects.length') == 1;
-// user.get('projects.firstObject.user') == user;
 ```
 
-###### Polymorphic hasMany associations
 
+### Associations
+
+- Can setup belongsTo or hasMany associations in factory definitions
+    - As inline attribute definition
+    - With traits
+- Can setup belongsTo or hasMany associations manually
+- The inverse association is being set up for you
+
+##### Setup belongsTo associations in Factory Definition
+ 
 ```javascript
-// setting polymorphic models on the (polymorphic) hasMany association
-var sh = store.makeFixture('big_hat');
-var bh = store.makeFixture('small_hat');
-var user = store.makeFixture('user', {hats: [sh, bh]})
-// user.get('hats.length') == 2;
-// (user.get('hats.firstObject') instanceof BigHat) == true
-// (user.get('hats.lastObject') instanceof SmallHat) == true
+  // 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
+  // 'Defining Factories' section
+  FactoryGuy.define('project', {
 
-// OR
+    project_with_user: {
+      // create user model with default attributes
+      user: {}
+    },
+    project_with_dude: {
+      // create user model with custom attributes
+      user: {name: 'Bob'}
+    },
+    project_with_admin: {
+      // create a named user model with the FactoryGuy.belongsTo helper method
+      user: FactoryGuy.belongsTo('admin')
+    }
+  });
+  
+  var json = FactoryGuy.build('project_with_user'); 
+  json.user // => {id:1, name: 'Dude', style: 'normal'}
 
-// setting belongTo association on polymorphic model
-var user = store.makeFixture('user');
-store.makeFixture('big_hat', {user: user});
-store.makeFixture('small_hat', {user: user});
+  var json = FactoryGuy.build('project_with_dude'); 
+  json.user // => {id:1, name: 'Dude', style: 'normal'}
 
-// will get you the same results, since FactoryGuy makes sure the associations
-// are created in both directions, even for polymorphic associations.
-// user.get('hats.length') == 2;
-// (user.get('hats.firstObject') instanceof BigHat) == true
-// (user.get('hats.lastObject') instanceof SmallHat) == true
+  var project = store.makeFixture('project_with_admin');
+  project.get('user.name') // => 'Admin'
+  project.get('user.style') // => 'super'
 
 ```
 
-###### Create lists
+*You could also accomplish the above with traits:*
 
 ```javascript
-var users = store.makeList('user', 3);
+  
+  FactoryGuy.define('project', {
+    traits: {
+      with_user: { user: {} },
+      with_admin: { user: FactoryGuy.belongsTo('admin') }
+    }
+  });
+  
+  var user = store.makeFixture('project', 'with_user');
+  project.get('user').toJSON() // => {id:1, name: 'Dude', style: 'normal'}
+  
 ```
 
-#####DS.Fixture adapter
 
-store.makeFixture => creates model in the store and returns json
+##### Setup belongsTo associations manually
 
-Technically when you call store.makeFixture 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.
+```javascript
+  var user = store.makeFixture('user');
+  var project = store.makeFixture('project', {user: user});
+    
+  project.get('user').toJSON() // => {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 
+( for both manual and factory defined belongsTo associations ) as well*
 
 ```javascript
+  user.get('projects.length') // => 1
+```
 
-store.makeFixture('user'); // user.FIXTURES = [{id: 1, name: 'User1', type: 'normal'}]
-store.makeFixture('user', {name: 'bob'}); //  user.FIXTURES = [{id: 2, name: 'bob', type: 'normal'}]
-store.makeFixture('admin'); //  user.FIXTURES = [{id: 3, name: 'Admin', type: 'superuser'}]
-store.makeFixture('admin', {name: 'Fred'}); //  user.FIXTURES = [{id: 4, name: 'Fred', type: 'superuser'}]
 
 
-// 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 )
-var userJson = store.makeFixture('user');
-store.find('user', userJson.id).then(function(user) {
-   user.toJSON() ( pretty much equals ) userJson;
-});
+##### Setup hasMany associations in Factory Definition
 
-// and to setup associations ...
-var projectJson = store.makeFixture('project');
-var userJson = store.makeFixture('user', {projects: [projectJson.id]});
-// OR
-var userJson = store.makeFixture('user');
-var projectJson = store.makeFixture('project', {user: userJson.id});
+``` javascript
+  FactoryGuy.define('user', {
+    user_with_projects: { FactoryGuy.hasMany('project', 2) }
+  });
+  
+  var user = store.makeFixture('user_with_projects');
+  user.get('projects.length') // => 2
+  
+```
 
-// 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
-// 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.
-store.find('user', 1).then(function(user) {
-  user.toJSON() (pretty much equals) userJson;
-  user.get('projects').then(function(projects) {
-    projects.length == 1;
+*You could also accomplish the above with traits:*
+
+```javascript
+  
+  FactoryGuy.define('project', {
+    traits: {
+      with_projects: {
+        projects: FactoryGuy.hasMany('project', 2)
+      }
+    }
   });
-});
+  
+  var user = store.makeFixture('user', 'with_projects');
+  user.get('projects.length') // => 2
+  
+```
+
+##### Setup hasMany associations manually
 
-// and for lists
-store.makeList('user', 2, {projects: [project.id]});
+```javascript
+  var project1 = store.makeFixture('project');
+  var project2 = store.makeFixture('project');
+  var user = store.makeFixture('user', {projects: [project1,project2]});
+  user.get('projects.length') // => 2
+  
+  // or  
+  var projects = store.makeList('project', 2);
+  var user = store.makeFixture('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 
+( for both manual and factory defined hasMany associations ) as well*
+   
+```javascript
+  projects.get('firstObject.user')  // => user
 ```
 
-###Testing models, controllers, views
 
+#### Building many models at once
 
-This section assumes you are testing the ( controllers and views ) in isolation.
+- FactoryGuy.buildList
+    - Builds an array of one or more json objects
+- store.makeList
+    - Loads one or more instances into store
 
-The code bundled in dist/ember-data-factory-guy.js includes a mixin named FactoryGuyTestMixin which
-can be used in your tests to make it easier to access the store and make fixtures.
+
+##### Building json array 
 
 ```javascript
+  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'}
 
-// Let's say you have a helper for your tests named TestHelper declared in a file.
+```
 
-TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin);
+##### Building model instances
+
+```javascript
+  var users = store.makeList('user', 2) 
+  users.get('length') // => 2 
+  users[0].toJSON() // => {id: 3, name: 'User3', style: 'normal'}
+  users[1].toJSON() // => {id: 4, name: 'User4', style: 'normal'}
+
+```
+
+
+###Testing models, controllers, views 
+
+- Testing the models, controllers and views in isolation
+- Use FactoryGuyTestMixin to help with testing
 
 
+##### Using FactoryGuyTestMixin
+
+- Using FactoryGuyTestMixin helper methods:
+  - make
+  - teardown
+  
+```javascript
+
+// Create a helper class using FactoryGuyTestMixin.
+TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin);
+
 // Then in your tests you can use it like so:
 
 var testHelper, store;
@@ -350,16 +519,6 @@ module('User Model', {
 // to be even more concise in tests you could add this method to your tests
 var make = function(name, opts) { return testHelper.make(name, opts); }
 
-
-test("make a user using fixture adapter", function() {
-  // useFixtureAdapter method is built into FactoryGuyTestMixin, and usually
-  // this would be called in the setup function
-  testHelper.useFixtureAdapter();
-  var json = make('user');
-  equal(User.FIXTURES.length, 1);
-  equal(User.FIXTURES[0], json);
-});
-
 // assuming your default adapter is ActiveModelAdapter or RESTAdapter
 test("make a user using your applications default adapter", function() {
   var user = make('user');
@@ -373,6 +532,16 @@ test("make a user using your applications default adapter", function() {
 
 ###Integration Tests
 
+
+##### Using FactoryGuyTestMixin
+
+- Uses mockjax
+- Has helper methods
+  - handleFind
+  - handleCreate
+  - 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.
 
@@ -453,3 +622,48 @@ test("Creates new project", function() {
 ```
 
 
+### Using DS.Fixture adapter
+
+- Not recommended
+- store.makeFixture ... creates model in the store and returns json
+
+Technically when you call store.makeFixture 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.
+
+```javascript
+
+
+store.makeFixture('user'); // user.FIXTURES = [{id: 1, name: 'User1', style: 'normal'}]
+store.makeFixture('user', {name: 'bob'}); //  user.FIXTURES = [{id: 2, name: 'bob', style: 'normal'}]
+store.makeFixture('admin'); //  user.FIXTURES = [{id: 3, name: 'Admin', style: 'super'}]
+store.makeFixture('admin', {name: 'Fred'}); //  user.FIXTURES = [{id: 4, name: 'Fred', style: 'super'}]
+
+
+// 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 )
+var userJson = store.makeFixture('user');
+store.find('user', userJson.id).then(function(user) {
+   user.toJSON() ( pretty much equals ) userJson;
+});
+
+// and to setup associations ...
+var projectJson = store.makeFixture('project');
+var userJson = store.makeFixture('user', {projects: [projectJson.id]});
+// OR
+var userJson = store.makeFixture('user');
+var projectJson = store.makeFixture('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
+// 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.
+store.find('user', 1).then(function(user) {
+  user.toJSON() (pretty much equals) userJson;
+  user.get('projects').then(function(projects) {
+    projects.length == 1;
+  });
+});

data/bower.json

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

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

@@ -438,6 +438,7 @@ FactoryGuy = {
     }
   },
 
+
   /**
    Push fixture to model's FIXTURES array.
    Used when store's adapter is a DS.FixtureAdapter.
@@ -821,11 +822,13 @@ DS.FixtureAdapter.reopen({
               if (belongsToRecord && belongsToRecord.get('length') > 0) {
                 var hasManyName = store.findRelationshipName(
                   'hasMany',
-                  belongsToRecord.constructor,
+                  belongsToRecord.get('firstObject').constructor,
                   record
                 );
                 belongsToRecord.forEach(function (child){
-                  child.get(hasManyName).addObject(record)
+                  Em.RSVP.resolve(child.get(hasManyName)).then( function(value) {
+                    value.addObjects(record);
+                  });
                 });
               }
             });

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

@@ -1 +1 @@
-Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};function MissingSequenceError(message){this.toString=function(){return message}}ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.merge=function(config){};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(attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}if(!fixture.id){fixture.id=modelId++}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(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)};FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},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)}},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(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},resetModels:function(store){for(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){}}},pushFixture:function(modelClass,fixture){if(!modelClass["FIXTURES"]){modelClass["FIXTURES"]=[]}modelClass["FIXTURES"].push(fixture);return fixture},clear:function(opts){if(!opts){this.modelDefinitions={}}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var store=this;var modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=store.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var store=this;var model;Em.run(function(){store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore();modelType=store.modelFor(modelName)}model=store.push(modelName,fixture);store.setAssociationsForRESTAdapter(modelType,modelName,model)});return model}},makeList:function(name,number,options){var arr=[];for(var i=0;i<number;i++){arr.push(this.makeFixture(name,options))}return arr},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){if(fixture[relationship.key]){fixture[relationship.key].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(relationship.type);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=fixture.id})}}if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(belongsToRecord){if(typeof belongsToRecord=="object"){FactoryGuy.pushFixture(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord.id}var hasManyName=self.findHasManyRelationshipNameForFixtureAdapter(relationship.type,relationship.parentType);var belongsToFixtures=adapter.fixturesForType(relationship.type);var belongsTofixture=adapter.findFixtureById(belongsToFixtures,fixture[relationship.key]);if(!belongsTofixture[hasManyName]){belongsTofixture[hasManyName]=[]}belongsTofixture[hasManyName].push(fixture.id)}}})},findEmbeddedBelongsToAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"&&Ember.typeOf(hasManyRecords[0])=="object"){var records=Em.A();hasManyRecords.forEach(function(record){var record=store.push(relationship.type,record);records.push(record)});fixture[relationship.key]=records}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);var hasManyName=self.findRelationshipName("hasMany",child.constructor,model);var inverseName=relationship.options&&relationship.options.inverse;if(belongsToName){child.set(belongsToName||inverseName,model)}else if(hasManyName){relation=child.get(hasManyName||inverseName)||[];relation.pushObject(model)}})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var setAssociations=function(){var hasManyName=self.findRelationshipName("hasMany",belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model);return}var oneToOneName=self.findRelationshipName("belongsTo",belongsToRecord.constructor,model);if(oneToOneName&&!(belongsToRecord.constructor==model.constructor)){belongsToRecord.set(oneToOneName,model)}};if(belongsToRecord.then){belongsToRecord.then(function(record){belongsToRecord=record;setAssociations()})}else{setAssociations()}}}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){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(name,relationship){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}});DS.FixtureAdapter.reopen({createRecord:function(store,type,record){var promise=this._super(store,type,record);promise.then(function(){Em.RSVP.Promise.resolve(Ember.get(type,"relationshipNames")).then(function(relationShips){if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);if(hasManyName){Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then(function(relationship){relationship.addObject(record)})}}})})}if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord&&belongsToRecord.get("length")>0){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);belongsToRecord.forEach(function(child){child.get(hasManyName).addObject(record)})}})})}})});return promise}});FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var type=store.modelFor(type);var serializer=store.serializerFor(type.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},buildAjaxHttpResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var modelName=FactoryGuy.lookupModelForFixtureName(name);if(this.usingActiveModelSerializer(modelName)){this.toSnakeCase(fixture)}var hash={};hash[modelName]=fixture;return hash},toSnakeCase:function(fixture){for(key in fixture){if(key!=Em.String.decamelize(key)){var value=fixture[key];delete fixture[key];fixture[Em.String.decamelize(key)]=value}}},buildURL:function(type,id){return this.getStore().adapterFor("application").buildURL(type,id)},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url=this.buildURL(modelName,id);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200});return responseJson},handleCreate:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:status||200})},handleDelete:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:status||200})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});
+Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};function MissingSequenceError(message){this.toString=function(){return message}}ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.merge=function(config){};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(attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}if(!fixture.id){fixture.id=modelId++}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(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)};FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},generate:function(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){console.log("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},resetModels:function(store){for(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){}}},pushFixture:function(modelClass,fixture){if(!modelClass["FIXTURES"]){modelClass["FIXTURES"]=[]}modelClass["FIXTURES"].push(fixture);return fixture},clear:function(opts){if(!opts){this.modelDefinitions={}}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var store=this;var modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=store.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var store=this;var model;Em.run(function(){store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore();modelType=store.modelFor(modelName)}model=store.push(modelName,fixture);store.setAssociationsForRESTAdapter(modelType,modelName,model)});return model}},makeList:function(name,number,options){var arr=[];for(var i=0;i<number;i++){arr.push(this.makeFixture(name,options))}return arr},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){if(fixture[relationship.key]){fixture[relationship.key].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(relationship.type);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=fixture.id})}}if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(belongsToRecord){if(typeof belongsToRecord=="object"){FactoryGuy.pushFixture(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord.id}var hasManyName=self.findHasManyRelationshipNameForFixtureAdapter(relationship.type,relationship.parentType);var belongsToFixtures=adapter.fixturesForType(relationship.type);var belongsTofixture=adapter.findFixtureById(belongsToFixtures,fixture[relationship.key]);if(!belongsTofixture[hasManyName]){belongsTofixture[hasManyName]=[]}belongsTofixture[hasManyName].push(fixture.id)}}})},findEmbeddedBelongsToAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"&&Ember.typeOf(hasManyRecords[0])=="object"){var records=Em.A();hasManyRecords.forEach(function(record){var record=store.push(relationship.type,record);records.push(record)});fixture[relationship.key]=records}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);var hasManyName=self.findRelationshipName("hasMany",child.constructor,model);var inverseName=relationship.options&&relationship.options.inverse;if(belongsToName){child.set(belongsToName||inverseName,model)}else if(hasManyName){relation=child.get(hasManyName||inverseName)||[];relation.pushObject(model)}})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var setAssociations=function(){var hasManyName=self.findRelationshipName("hasMany",belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model);return}var oneToOneName=self.findRelationshipName("belongsTo",belongsToRecord.constructor,model);if(oneToOneName&&!(belongsToRecord.constructor==model.constructor)){belongsToRecord.set(oneToOneName,model)}};if(belongsToRecord.then){belongsToRecord.then(function(record){belongsToRecord=record;setAssociations()})}else{setAssociations()}}}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){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(name,relationship){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}});DS.FixtureAdapter.reopen({createRecord:function(store,type,record){var promise=this._super(store,type,record);promise.then(function(){Em.RSVP.Promise.resolve(Ember.get(type,"relationshipNames")).then(function(relationShips){if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);if(hasManyName){Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then(function(relationship){relationship.addObject(record)})}}})})}if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord&&belongsToRecord.get("length")>0){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.get("firstObject").constructor,record);belongsToRecord.forEach(function(child){Em.RSVP.resolve(child.get(hasManyName)).then(function(value){value.addObjects(record)})})}})})}})});return promise}});FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var type=store.modelFor(type);var serializer=store.serializerFor(type.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},buildAjaxHttpResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var modelName=FactoryGuy.lookupModelForFixtureName(name);if(this.usingActiveModelSerializer(modelName)){this.toSnakeCase(fixture)}var hash={};hash[modelName]=fixture;return hash},toSnakeCase:function(fixture){for(key in fixture){if(key!=Em.String.decamelize(key)){var value=fixture[key];delete fixture[key];fixture[Em.String.decamelize(key)]=value}}},buildURL:function(type,id){return this.getStore().adapterFor("application").buildURL(type,id)},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url=this.buildURL(modelName,id);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200});return responseJson},handleCreate:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:status||200})},handleDelete:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:status||200})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});

data/ember-data-factory-guy.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "ember-data-factory-guy"
-  s.version     = "0.6.1"
+  s.version     = "0.6.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Sudol", "Alex Opak"]
   s.email       = ["dansudol@yahoo.com", "opak.alexandr@gmail.com"]

data/package.json

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

data/src/factory_guy.js

@@ -268,6 +268,7 @@ FactoryGuy = {
     }
   },
 
+
   /**
    Push fixture to model's FIXTURES array.
    Used when store's adapter is a DS.FixtureAdapter.

data/src/store.js

@@ -356,11 +356,13 @@ DS.FixtureAdapter.reopen({
               if (belongsToRecord && belongsToRecord.get('length') > 0) {
                 var hasManyName = store.findRelationshipName(
                   'hasMany',
-                  belongsToRecord.constructor,
+                  belongsToRecord.get('firstObject').constructor,
                   record
                 );
                 belongsToRecord.forEach(function (child){
-                  child.get(hasManyName).addObject(record)
+                  Em.RSVP.resolve(child.get(hasManyName)).then( function(value) {
+                    value.addObjects(record);
+                  });
                 });
               }
             });

data/tests/active_model_adapter_factory_test.js

@@ -6,7 +6,7 @@ module('FactoryGuy with ActiveModelAdapter', {
     store = testHelper.getStore();
   },
   teardown: function() {
-    Em.run(function() { testHelper.teardown(); });
+    testHelper.teardown();
   }
 });
 

data/tests/factory_guy_test.js

@@ -11,7 +11,9 @@ module('FactoryGuy', {
     store = testHelper.getStore();
   },
   teardown: function() {
-    Em.run(function() { testHelper.teardown(); });
+    Em.run(function() {
+      testHelper.teardown();
+    });
   }
 });
 

data/tests/fixture_adapter_factory_test.js

@@ -173,14 +173,18 @@ asyncTest("#createRecord can work for one-to-none associations", function () {
 asyncTest("#createRecord adds hasMany association to records it hasMany of ", function () {
   var usersJson = store.makeList('user', 3);
 
-  Em.RSVP.all([store.find('user', usersJson[0].id), store.find('user', usersJson[1].id), store.find('user', usersJson[2].id)]).then(function (users) {
+  var user1Promise = store.find('user', usersJson[0].id)
+  var user2Promise = store.find('user', usersJson[1].id)
+  var user3Promise = store.find('user', usersJson[2].id)
+  Em.RSVP.all([user1Promise, user2Promise, user3Promise]).then(function (users) {
 
     var propertyJson = {name: 'beach front property'};
 
-    property = store.createRecord('property', propertyJson);
+    var property = store.createRecord('property', propertyJson);
     property.get('owners').then(function (owners) {
       owners.addObjects(users);
-    }).then(function () {
+      return property.save();
+    }).then(function (property) {
       return property.get('owners');
     }).then(function (users) {
       equal(users.get('length'), usersJson.length);

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -285,6 +285,11 @@ FactoryGuy = {
     }
   },
 
+  association: function(fixtureName, opts) {
+    console.log('DEPRECATION Warning: use FactoryGuy.belongsTo instead')
+    return this.belongsTo(fixtureName, opts);
+  },
+
   /**
    Used in model definitions to define a hasMany association attribute.
    For example:
@@ -433,6 +438,7 @@ FactoryGuy = {
     }
   },
 
+
   /**
    Push fixture to model's FIXTURES array.
    Used when store's adapter is a DS.FixtureAdapter.
@@ -816,11 +822,13 @@ DS.FixtureAdapter.reopen({
               if (belongsToRecord && belongsToRecord.get('length') > 0) {
                 var hasManyName = store.findRelationshipName(
                   'hasMany',
-                  belongsToRecord.constructor,
+                  belongsToRecord.get('firstObject').constructor,
                   record
                 );
                 belongsToRecord.forEach(function (child){
-                  child.get(hasManyName).addObject(record)
+                  Em.RSVP.resolve(child.get(hasManyName)).then( function(value) {
+                    value.addObjects(record);
+                  });
                 });
               }
             });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email: