ember-data-factory-guy 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08b067285d7aad700359cc0468ef56c4271acb13
-  data.tar.gz: 5e25e40fc8e23190e91e47b122c02af21e57fd97
+  metadata.gz: 7bc82d125a83024abd95b12c5f11892c76047002
+  data.tar.gz: e64f296ca9c2e7d82fa4d62d1e65356874ca6c5a
 SHA512:
-  metadata.gz: cf1b499ea9ce45d723aa60b966297b0136c3f617256b57f96aedaaac768b4f693acd9c5032cf7f8e4c0ab52c763c6ad47c6ca7c43ed1146e10149110181f96cc
-  data.tar.gz: fe67654d6644a3e6da62cd31015090deff2f970bfa5827d395c61273e9aac28bce3168db5cf66b6eb6528afd3270dccd1d7686885db6d40d6949938410aa7c6c
+  metadata.gz: c8e7451735f51c0511124daf19add6710e490f904e48e61eb44b22761585bd7d29e78eed73a3468a2caae46047bc8eb1f0b835cca3b07c79d87bf106647609ec
+  data.tar.gz: ba2d24705c6e111e00ae752a0a16dc04e94981ca2e742314f66dbe76a5c2dbdf5cb9946f2d0076e0b1ff820b1f137b473191a4ef43f91a95f3f3d6cd3c488018

data/README.md

@@ -10,7 +10,7 @@ of ember-data-factory-guy.
   - 0.6.4   -> ember-data-1.0.0-beta.8 and under
   - 0.7.1.1 -> ember-data-1.0.0-beta.10
   - 0.8.6   -> ember-data-1.0.0-beta.11
-  - 0.9.1   -> ember-data-1.0.0-beta.12
+  - 0.9.2   -> ember-data-1.0.0-beta.12
 
 **Support for fixture adapter is currently kinda broken.**
 
@@ -39,7 +39,7 @@ gem 'ember-data-factory-guy', group: test
 or for particular version:
 
 ```ruby
-gem 'ember-data-factory-guy', '0.9.1', group: test
+gem 'ember-data-factory-guy', '0.9.2', group: test
 ```
 
 then:
@@ -74,7 +74,7 @@ or for particular version:
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
-    "ember-data-factory-guy": "0.9.1"
+    "ember-data-factory-guy": "0.9.2"
   }
 ```
 
@@ -114,7 +114,8 @@ You do not have to use the DS.FixtureAdapter.  But if you do choose to use the F
 which does not run any faster, and does not handle associations as elegantly
 ( and in some cases not at all ), you may run into problems with accessing associations.
 
-Error: Assertion Failed: You looked up the 'projects' relationship on '<User:ember379:1>' but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.hasMany({ async: true })`)
+Error: Assertion Failed: You looked up the 'projects' relationship on '<User:ember379:1>'
+but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.hasMany({ async: true })`)
 
 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,
@@ -226,9 +227,10 @@ the store is looking up the correct model type name
  - 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 method. The following
-  // store lookup assumes you have a namespace for your Ember app named 'App'.
+  // 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
+  // method. The following store lookup assumes you have a namespace for your Ember
+  // app named 'App'.
   var store = App.__container__.lookup('store:main');
   FactoryGuy.setStore(store);
 
@@ -631,6 +633,9 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
 
 ##### 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
+
+*Passing in array of fixture json*
 
 ```javascript
      // First build json for the instances you want 'returned' in your query.
@@ -641,10 +646,35 @@ tests run as shown in the previous section (Using FactoryGuyTestMixin)**
      testHelper.handleFindQuery('user', ['name', 'age'], usersJson);
 
      store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
-        /// userInstances are created from the usersJson that you passed in
+        // userInstances returned are created from the usersJson that you passed in
      })
 ```
 
+*Passing in array of model instances*
+
+   ```js
+     // Create model instances
+     var users = FactoryGuy.makeList('user', 2, 'with_hats');
+
+     // Pass in the array of model instances as last argument
+     testHelper.handleFindQuery('user', ['name', 'age'], users);
+
+     store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
+        /// userInstances will be the same of the users that were passed in
+     })
+   ```
+
+*Passing in nothing for last argument*
+
+   ```js
+     // This simulates a query that returns no results
+     testHelper.handleFindQuery('user', ['age']);
+
+     store.findQuery('user', {age: 10000}}).then(function(userInstances){
+        /// userInstances will be empty
+     })
+   ```
+
 
 ##### handleCreate
   - options

data/bower.json

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

data/dist/amd/factory-guy.js

@@ -467,7 +467,9 @@ var FactoryGuy = {
 
     if (store.usingFixtureAdapter()) {
       store.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
-      return this.pushFixture(modelType, fixture);
+      fixture = FactoryGuy.pushFixture(modelType, fixture);
+      store.loadModelForFixtureAdapter(modelType, fixture);
+      return fixture;
     } else {
       return store.makeModel(modelType, fixture);
     }
@@ -648,9 +650,11 @@ var FactoryGuy = {
     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') {
-          var hasManyRelation = fixture[relationship.key];
+          hasManyRelation = fixture[relationship.key];
           if (hasManyRelation) {
             $.each(fixture[relationship.key], function (index, object) {
               // used to require that the relationship was set by id,
@@ -658,17 +662,19 @@ var FactoryGuy = {
               // normalize that back to the id
               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 fixture = adapter.findFixtureById(hasManyfixtures, id);
-              fixture[modelName] = fixture.id;
+              var hasManyFixture = adapter.findFixtureById(hasManyfixtures, id);
+              hasManyFixture[modelName] = fixture.id;
+              self.loadModelForFixtureAdapter(relationship.type, hasManyFixture);
             });
           }
         }
         if (relationship.kind == 'belongsTo') {
-          var belongsToRecord = fixture[relationship.key];
+          belongsToRecord = fixture[relationship.key];
           if (belongsToRecord) {
             if (typeof belongsToRecord == 'object') {
               FactoryGuy.pushFixture(relationship.type, belongsToRecord);
@@ -681,10 +687,29 @@ var FactoryGuy = {
               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);
+          //replace relationships back to ids instead of built ember objects
+          Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
+            if(fixture[relationship.key]) {
+              fixture[relationship.key] = dup[relationship.key];
+            }
+          });
+        });
+      }
+    },
+
     /**
      Before pushing the fixture to the store, do some preprocessing. Descend into the tree
      of object data, and convert child objects to record instances recursively.
@@ -793,9 +818,32 @@ var FactoryGuy = {
      @param {Object} payload
      */
     pushPayload: function (type, payload) {
+      var typeName, model;
+
       if (this.usingFixtureAdapter()) {
-        var model = this.modelFor(type);
-        FactoryGuy.pushFixture(model, payload);
+        if (Ember.typeOf(type) === 'string' && Ember.isPresent(payload) && Ember.isPresent(payload.id)){
+          //pushPayload('user', {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') {
+          //pushPayload({users: {id:..}}) OR pushPayload('user', {users: {id:..}})
+          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);
       }
@@ -882,6 +930,17 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      Handling ajax GET for finding all records for a type of model.
      You can mock failed find by passing in success argument as false.
 
+   ```js
+     // Pass in the parameters you would normally pass into FactoryGuy.makeList,
+     // like fixture name, number of fixtures to make, and optional traits,
+     // or fixture options
+     testHelper.handleFindMany('user', 2, 'with_hats');
+
+     store.find('user').then(function(users){
+
+     });
+   ```
+
      @param {String} name  name of the fixture ( or model ) to find
      @param {Number} number  number of fixtures to create
      @param {String} trait  optional traits (one or more)
@@ -889,39 +948,54 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    */
   handleFindMany: function () {
     // make the records and load them in the store
-    FactoryGuy.makeList.apply(FactoryGuy, arguments);
+    var records = FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = {};
-    responseJson[modelName] = [];
+    var json = records.map(function(record) {return record.toJSON({includeId: true})});
+    responseJson[modelName.pluralize()] = json;
     var url = this.buildURL(modelName);
-    // mock the ajax call, but return nothing, since the records will be
-    // retrieved from the store where they were just loaded above
     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
-     // 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);
+     // Create model instances
+     var users = FactoryGuy.makeList('user', 2, 'with_hats');
+
+     // Pass in the array of model instances as last argument
+     testHelper.handleFindQuery('user', ['name', 'age'], users);
 
      store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
-        /// userInstances were created from the usersJson that you passed in
+        /// userInstances will be the same of the users that were passed in
      })
    ```
 
-   The model instances will be created from the json you have passed in.
+        Third variation - pass in nothing for last argument
+   ```js
+   // This simulates a query that returns no results
+   testHelper.handleFindQuery('user', ['age']);
+
+   store.findQuery('user', {age: 10000}}).then(function(userInstances){
+        /// userInstances will be empty
+     })
+   ```
 
    @param {String} modelName  name of the mode like 'user' for User model type
    @param {String} searchParams  the parameters that will be queried
-   @param {Object} json   fixture json used to build the resulting modelType instances
+   @param {Array}  array of DS.Model records to be 'returned' by query
    */
-  handleFindQuery: function (modelName, searchParams, json) {
+  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);

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

@@ -462,7 +462,9 @@ var FactoryGuy = {
 
     if (store.usingFixtureAdapter()) {
       store.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
-      return this.pushFixture(modelType, fixture);
+      fixture = FactoryGuy.pushFixture(modelType, fixture);
+      store.loadModelForFixtureAdapter(modelType, fixture);
+      return fixture;
     } else {
       return store.makeModel(modelType, fixture);
     }
@@ -594,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,
@@ -643,9 +645,11 @@ var FactoryGuy = {
     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') {
-          var hasManyRelation = fixture[relationship.key];
+          hasManyRelation = fixture[relationship.key];
           if (hasManyRelation) {
             $.each(fixture[relationship.key], function (index, object) {
               // used to require that the relationship was set by id,
@@ -653,17 +657,19 @@ var FactoryGuy = {
               // normalize that back to the id
               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 fixture = adapter.findFixtureById(hasManyfixtures, id);
-              fixture[modelName] = fixture.id;
+              var hasManyFixture = adapter.findFixtureById(hasManyfixtures, id);
+              hasManyFixture[modelName] = fixture.id;
+              self.loadModelForFixtureAdapter(relationship.type, hasManyFixture);
             });
           }
         }
         if (relationship.kind == 'belongsTo') {
-          var belongsToRecord = fixture[relationship.key];
+          belongsToRecord = fixture[relationship.key];
           if (belongsToRecord) {
             if (typeof belongsToRecord == 'object') {
               FactoryGuy.pushFixture(relationship.type, belongsToRecord);
@@ -676,10 +682,29 @@ var FactoryGuy = {
               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);
+          //replace relationships back to ids instead of built ember objects
+          Ember.get(modelType, 'relationshipsByName').forEach(function (relationship, name) {
+            if(fixture[relationship.key]) {
+              fixture[relationship.key] = dup[relationship.key];
+            }
+          });
+        });
+      }
+    },
+
     /**
      Before pushing the fixture to the store, do some preprocessing. Descend into the tree
      of object data, and convert child objects to record instances recursively.
@@ -788,9 +813,32 @@ var FactoryGuy = {
      @param {Object} payload
      */
     pushPayload: function (type, payload) {
+      var typeName, model;
+
       if (this.usingFixtureAdapter()) {
-        var model = this.modelFor(type);
-        FactoryGuy.pushFixture(model, payload);
+        if (Ember.typeOf(type) === 'string' && Ember.isPresent(payload) && Ember.isPresent(payload.id)){
+          //pushPayload('user', {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') {
+          //pushPayload({users: {id:..}}) OR pushPayload('user', {users: {id:..}})
+          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);
       }
@@ -877,6 +925,17 @@ var FactoryGuyTestMixin = Em.Mixin.create({
      Handling ajax GET for finding all records for a type of model.
      You can mock failed find by passing in success argument as false.
 
+   ```js
+     // Pass in the parameters you would normally pass into FactoryGuy.makeList,
+     // like fixture name, number of fixtures to make, and optional traits,
+     // or fixture options
+     testHelper.handleFindMany('user', 2, 'with_hats');
+
+     store.find('user').then(function(users){
+
+     });
+   ```
+
      @param {String} name  name of the fixture ( or model ) to find
      @param {Number} number  number of fixtures to create
      @param {String} trait  optional traits (one or more)
@@ -884,39 +943,54 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    */
   handleFindMany: function () {
     // make the records and load them in the store
-    FactoryGuy.makeList.apply(FactoryGuy, arguments);
+    var records = FactoryGuy.makeList.apply(FactoryGuy, arguments);
     var name = arguments[0];
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = {};
-    responseJson[modelName] = [];
+    var json = records.map(function(record) {return record.toJSON({includeId: true})});
+    responseJson[modelName.pluralize()] = json;
     var url = this.buildURL(modelName);
-    // mock the ajax call, but return nothing, since the records will be
-    // retrieved from the store where they were just loaded above
     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
-     // 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);
+     // Create model instances
+     var users = FactoryGuy.makeList('user', 2, 'with_hats');
+
+     // Pass in the array of model instances as last argument
+     testHelper.handleFindQuery('user', ['name', 'age'], users);
 
      store.findQuery('user', {name:'Bob', age: 10}}).then(function(userInstances){
-        /// userInstances were created from the usersJson that you passed in
+        /// userInstances will be the same of the users that were passed in
      })
    ```
 
-   The model instances will be created from the json you have passed in.
+        Third variation - pass in nothing for last argument
+   ```js
+   // This simulates a query that returns no results
+   testHelper.handleFindQuery('user', ['age']);
+
+   store.findQuery('user', {age: 10000}}).then(function(userInstances){
+        /// userInstances will be empty
+     })
+   ```
 
    @param {String} modelName  name of the mode like 'user' for User model type
    @param {String} searchParams  the parameters that will be queried
-   @param {Object} json   fixture json used to build the resulting modelType instances
+   @param {Array}  array of DS.Model records to be 'returned' by query
    */
-  handleFindQuery: function (modelName, searchParams, json) {
+  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);