ember-data-factory-guy 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49287f23a8f4b826b7baf71eef5742921013414
-  data.tar.gz: 535da4db233369f9040ba0ac8d7d77077323c358
+  metadata.gz: 21456baccb82088ae063f86ee70e3582848c760a
+  data.tar.gz: 82e3178d129e0d7bb44e9a6c778cdf240a3b3f1b
 SHA512:
-  metadata.gz: aaaa95a6d8d3814dfafe3f571667ccc381ad3582598e7b3f3400dce1ba68a61e28288c090e724e0e5a9b577825408e45637c8d01b94f2baece459f170f2c7690
-  data.tar.gz: 269260acf8c9ea30ab715cedf8e185b583110da7f2922016338e9a28e9a612d190cd6a21714cc0b5c4dbcf06aeb3d80a0be26cdf0774f84d868ed680c3b1d316
+  metadata.gz: 37c4c45d592490dd3f80068cf75c8838d0bc2599164805b172331760827564d5e74246a129651c9c5e80357a01b1746ab923157e64c7ab65aeee55bc3ab33673
+  data.tar.gz: 295339f7367bbd5e604f3ec8dd18419658c97a8d4471dea0658bfda7a5b883b5c31e09cade02d5adf32efacbc8f282421eedba56fe8351e66cb8cd4f944ede37

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2014 Daniel Sudol and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -106,13 +106,16 @@ Let's say you have a few models like these:
       // use the 'userName' sequence for this attribute
       name: FactoryGuy.generate('userName')
     },
-
+    //
     // named 'user' type with custom attributes
+    //
     admin: {
       type: 'superuser',
       name: 'Admin'
     }
+    //
     // using a function for an attribute that refers to other attributes
+    //
     funny_user: {
       type: function(f) { return 'funny '  + f.name }
     }
@@ -140,9 +143,10 @@ Let's say you have a few models like these:
       user: {name: 'Dude'}
     },
     project_with_admin: {
-      // for named association, use this FactoryGuy.association helper method
-      user: FactoryGuy.association('admin')
+      // for named association, use the FactoryGuy.belongsTo helper method
+      user: FactoryGuy.belongsTo('admin')
     }
+
   });
 
   FactoryGuy.define('hat', {

data/bower.json

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

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

@@ -70,7 +70,7 @@ ModelDefinition = function (model, config) {
 
    @param {String} name fixture name
    @param {Object} opts attributes to override
-   @param {String} traits array of traits
+   @param {String} traitArgs array of traits
    @returns {Object} json
    */
   this.build = function (name, opts, traitArgs) {
@@ -260,23 +260,70 @@ FactoryGuy = {
        default: {
          title: 'Project'
        },
+
+       // setup named project with built in associated user
        project_with_admin: {
-         // for named association, use this FactoryGuy.association helper method
-         user: FactoryGuy.association('admin')
+         user: FactoryGuy.belongsTo('admin')
        }
 
+       // or use as a trait
+       traits: {
+         with_admin: {
+           user: FactoryGuy.belongsTo('admin')
+         }
+       }
+     })
     ```
 
    @param   {String} fixtureName fixture name
    @param   {Object} opts options
    @returns {Function} wrapper function that will build the association json
    */
-  association: function (fixtureName, opts) {
+  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);
+  },
+
+  /**
+   Used in model definitions to define a hasMany association attribute.
+   For example:
+
+   ```
+   FactoryGuy.define('user', {
+     default: {
+       name: 'Bob'
+     },
+
+     // define the named user type that will have projects
+     user_with_projects: { FactoryGuy.hasMany('project', 2) }
+
+     // or use as a trait
+     traits: {
+       with_projects: {
+         projects: FactoryGuy.hasMany('project', 2)
+       }
+     }
+   })
+
+    ```
+
+   @param   {String} fixtureName fixture name
+   @param   {Number} number of hasMany association items to build
+   @param   {Object} opts options
+   @returns {Function} wrapper function that will build the association json
+   */
+  hasMany: function (fixtureName, number, opts) {
+    return function () {
+      return FactoryGuy.buildList(fixtureName, number, opts);
+    }
+  },
+
   /**
     Given a fixture name like 'person' or 'dude' determine what model this name
     refers to. In this case it's 'person' for each one.
@@ -543,9 +590,6 @@ DS.Store.reopen({
     then push that model to the store and set the id of that new model
     as the attribute value in the fixture
 
-   If it's a hasMany association, and its polymorphic, then convert the
-    attribute value to a polymorphic style
-
    @param modelType
    @param fixture
    */
@@ -559,6 +603,19 @@ DS.Store.reopen({
           fixture[relationship.key] = belongsToRecord;
         }
       }
+      if (relationship.kind == 'hasMany') {
+        var hasManyRecords = fixture[relationship.key];
+        // if the records are objects and not instances they need to be converted to
+        // instances
+        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;
+        }
+      }
     })
   },
 
@@ -895,6 +952,17 @@ FactoryGuyTestMixin = Em.Mixin.create({
     }
   },
 
+  /**
+   Build url for the mockjax call. Proxy to the adapters buildURL method.
+
+   @param {String} type model type name like 'user' for User model
+   @param {String} id
+   @return {String} url
+   */
+  buildURL: function (type, id) {
+    return this.getStore().adapterFor('application').buildURL(type, id);
+  },
+
   /**
    Handling ajax GET ( find record ) for a model. You can mock
    failed find by passing in status of 500.
@@ -907,7 +975,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = this.buildAjaxHttpResponse(name, opts);
     var id = responseJson[modelName].id
-    var url = "/" + Em.String.pluralize(modelName) + "/" + id;
+    var url = this.buildURL(modelName, id);
     this.stubEndpointForHttpRequest(
       url,
       responseJson,
@@ -927,7 +995,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
   handleCreate: function (name, opts, status) {
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = this.buildAjaxHttpResponse(name, opts);
-    var url = "/" + Em.String.pluralize(modelName);
+    var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(
       url,
       responseJson,
@@ -940,13 +1008,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in status of 500.
 
-   @param {String} root modelType like 'user' for User
+   @param {String} type model type like 'user' for User model
    @param {String} id id of record to update
    @param {Integer} status Optional HTTP status response code
    */
-  handleUpdate: function (root, id, status) {
+  handleUpdate: function (type, id, status) {
     this.stubEndpointForHttpRequest(
-        "/" + Em.String.pluralize(root) + "/" + id,
+      this.buildURL(type, id),
       {},
       {type: 'PUT', status: (status || 200)}
     )
@@ -956,13 +1024,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax DELETE ( delete record ) for a model type. You can mock
    failed delete by passing in status of 500.
 
-   @param {String} root modelType like 'user' for User
+   @param {String} type model type like 'user' for User model
    @param {String} id id of record to update
    @param {Integer} status Optional HTTP status response code
    */
-  handleDelete: function (root, id, status) {
+  handleDelete: function (type, id, status) {
     this.stubEndpointForHttpRequest(
-        "/" + Em.String.pluralize(root) + "/" + id,
+      this.buildURL(type, id),
       {},
       {type: 'DELETE', status: (status || 200)}
     )

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)}}},association:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,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}}})},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);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}}},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url="/"+Em.String.pluralize(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="/"+Em.String.pluralize(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT",status:status||200})},handleDelete:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+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)}},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())}});

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.5.1"
+  s.version     = "0.6.0"
   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.5.1",
+  "version": "0.6.0",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/factory_guy.js

@@ -90,23 +90,70 @@ FactoryGuy = {
        default: {
          title: 'Project'
        },
+
+       // setup named project with built in associated user
        project_with_admin: {
-         // for named association, use this FactoryGuy.association helper method
-         user: FactoryGuy.association('admin')
+         user: FactoryGuy.belongsTo('admin')
        }
 
+       // or use as a trait
+       traits: {
+         with_admin: {
+           user: FactoryGuy.belongsTo('admin')
+         }
+       }
+     })
     ```
 
    @param   {String} fixtureName fixture name
    @param   {Object} opts options
    @returns {Function} wrapper function that will build the association json
    */
-  association: function (fixtureName, opts) {
+  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);
+  },
+
+  /**
+   Used in model definitions to define a hasMany association attribute.
+   For example:
+
+   ```
+   FactoryGuy.define('user', {
+     default: {
+       name: 'Bob'
+     },
+
+     // define the named user type that will have projects
+     user_with_projects: { FactoryGuy.hasMany('project', 2) }
+
+     // or use as a trait
+     traits: {
+       with_projects: {
+         projects: FactoryGuy.hasMany('project', 2)
+       }
+     }
+   })
+
+    ```
+
+   @param   {String} fixtureName fixture name
+   @param   {Number} number of hasMany association items to build
+   @param   {Object} opts options
+   @returns {Function} wrapper function that will build the association json
+   */
+  hasMany: function (fixtureName, number, opts) {
+    return function () {
+      return FactoryGuy.buildList(fixtureName, number, opts);
+    }
+  },
+
   /**
     Given a fixture name like 'person' or 'dude' determine what model this name
     refers to. In this case it's 'person' for each one.

data/src/factory_guy_test_mixin.js

@@ -112,6 +112,17 @@ FactoryGuyTestMixin = Em.Mixin.create({
     }
   },
 
+  /**
+   Build url for the mockjax call. Proxy to the adapters buildURL method.
+
+   @param {String} type model type name like 'user' for User model
+   @param {String} id
+   @return {String} url
+   */
+  buildURL: function (type, id) {
+    return this.getStore().adapterFor('application').buildURL(type, id);
+  },
+
   /**
    Handling ajax GET ( find record ) for a model. You can mock
    failed find by passing in status of 500.
@@ -124,7 +135,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = this.buildAjaxHttpResponse(name, opts);
     var id = responseJson[modelName].id
-    var url = "/" + Em.String.pluralize(modelName) + "/" + id;
+    var url = this.buildURL(modelName, id);
     this.stubEndpointForHttpRequest(
       url,
       responseJson,
@@ -144,7 +155,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
   handleCreate: function (name, opts, status) {
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = this.buildAjaxHttpResponse(name, opts);
-    var url = "/" + Em.String.pluralize(modelName);
+    var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(
       url,
       responseJson,
@@ -157,13 +168,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in status of 500.
 
-   @param {String} root modelType like 'user' for User
+   @param {String} type model type like 'user' for User model
    @param {String} id id of record to update
    @param {Integer} status Optional HTTP status response code
    */
-  handleUpdate: function (root, id, status) {
+  handleUpdate: function (type, id, status) {
     this.stubEndpointForHttpRequest(
-        "/" + Em.String.pluralize(root) + "/" + id,
+      this.buildURL(type, id),
       {},
       {type: 'PUT', status: (status || 200)}
     )
@@ -173,13 +184,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax DELETE ( delete record ) for a model type. You can mock
    failed delete by passing in status of 500.
 
-   @param {String} root modelType like 'user' for User
+   @param {String} type model type like 'user' for User model
    @param {String} id id of record to update
    @param {Integer} status Optional HTTP status response code
    */
-  handleDelete: function (root, id, status) {
+  handleDelete: function (type, id, status) {
     this.stubEndpointForHttpRequest(
-        "/" + Em.String.pluralize(root) + "/" + id,
+      this.buildURL(type, id),
       {},
       {type: 'DELETE', status: (status || 200)}
     )

data/src/model_definition.js

@@ -54,7 +54,7 @@ ModelDefinition = function (model, config) {
 
    @param {String} name fixture name
    @param {Object} opts attributes to override
-   @param {String} traits array of traits
+   @param {String} traitArgs array of traits
    @returns {Object} json
    */
   this.build = function (name, opts, traitArgs) {

data/src/store.js

@@ -125,9 +125,6 @@ DS.Store.reopen({
     then push that model to the store and set the id of that new model
     as the attribute value in the fixture
 
-   If it's a hasMany association, and its polymorphic, then convert the
-    attribute value to a polymorphic style
-
    @param modelType
    @param fixture
    */
@@ -141,6 +138,19 @@ DS.Store.reopen({
           fixture[relationship.key] = belongsToRecord;
         }
       }
+      if (relationship.kind == 'hasMany') {
+        var hasManyRecords = fixture[relationship.key];
+        // if the records are objects and not instances they need to be converted to
+        // instances
+        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;
+        }
+      }
     })
   },
 

data/tests/factory_guy_test.js

@@ -88,15 +88,28 @@ test("Referring to other attributes in attribute definition", function() {
 });
 
 
-test("Using associations in attribute definition", function() {
+test("Using belongsTo associations in attribute definition", function() {
   var json = FactoryGuy.build('project_with_user');
-  deepEqual(json, {id: 1, title: 'Project1', user: {id: 1, name: 'User1'}}, 'creates default user for "user" belongsTo attribute');
+  deepEqual(json, {id: 1, title: 'Project1', user: {id: 1, name: 'User1'}}, 'creates default association');
 
   var json = FactoryGuy.build('project_with_dude');
-  deepEqual(json, {id: 2, title: 'Project2', user: {id: 2, name: 'Dude'}}, 'creates user with optional attributes for "user" belongsTo attribute');
+  deepEqual(json, {id: 2, title: 'Project2', user: {id: 2, name: 'Dude'}}, 'creates association with optional attributes');
 
   var json = FactoryGuy.build('project_with_admin');
-  deepEqual(json, {id: 3, title: 'Project3', user: {id: 3, name: 'Admin'}}, 'creates named user for "user" belongsTo attribute');
+  deepEqual(json, {id: 3, title: 'Project3', user: {id: 3, name: 'Admin'}}, 'creates association using named attribute');
+
+  var json = FactoryGuy.build('project_with_parent');
+  deepEqual(json, {id: 5, title: 'Project4', parent: {id: 4, title: 'Project5'}}, 'belongsTo association name differs from model name');
+});
+
+
+test("Using hasMany associations in attribute definition", function() {
+  var json = FactoryGuy.build('user_with_projects');
+  deepEqual(json, {
+    id: 1,
+    name: 'User1',
+    projects: [{id: 1, title: 'Project1'},{id: 2, title: 'Project2'}]
+  }, 'creates list of hasMany association items');
 });
 
 
@@ -121,6 +134,13 @@ test("#build with traits", function() {
 
   var json = FactoryGuy.build('project', 'with_title_sequence');
   deepEqual(json, {id: 7, title: 'Project3'}, 'trait with attribute using sequence');
+
+  var json = FactoryGuy.build('user', 'with_projects');
+  deepEqual(json, {
+    id: 6,
+    name: 'User1',
+    projects: [{id: 8, title: 'Project4'},{id: 9, title: 'Project5'}]
+  }, 'trait with hasMany association');
 });
 
 

data/tests/factory_guy_test_mixin_test.js

@@ -0,0 +1,32 @@
+var testHelper, store;
+
+module('FactoryGuyTestMixin with DS.RESTAdapter', {
+  setup: function () {
+    testHelper = TestHelper.setup(DS.RESTAdapter);
+    store = testHelper.getStore();
+  },
+  teardown: function () {
+    DS.RESTAdapter.reopen({
+      namespace: '',
+      host: ''
+    })
+    Em.run(function () {
+      testHelper.teardown();
+    });
+  }
+});
+
+
+test("#buildURL without namespace", function () {
+  equal(testHelper.buildURL('project'), '/projects', 'has no namespace by default');
+})
+
+test("#buildURL with namespace and host", function () {
+  DS.RESTAdapter.reopen({
+    host: 'https://dude.com',
+    namespace: 'api/v1'
+  })
+
+  equal(testHelper.buildURL('project'), 'https://dude.com/api/v1/projects');
+})
+

data/tests/fixture_adapter_factory_test.js

@@ -1,17 +1,19 @@
 var testHelper, store;
 
 module('FactoryGuy with DS.FixtureAdapter', {
-  setup: function() {
+  setup: function () {
     testHelper = TestHelper.setup(DS.FixtureAdapter);
     store = testHelper.getStore();
   },
-  teardown: function() {
-    Em.run(function() { testHelper.teardown(); });
+  teardown: function () {
+    Em.run(function () {
+      testHelper.teardown();
+    });
   }
 });
 
 
-test("#pushFixture adds fixture to Fixture array on model", function() {
+test("#pushFixture adds fixture to Fixture array on model", function () {
   var fixtureJson = FactoryGuy.build('user');
   FactoryGuy.pushFixture(User, fixtureJson);
   equal(User.FIXTURES.length, 1);
@@ -22,18 +24,18 @@ test("#pushFixture adds fixture to Fixture array on model", function() {
 });
 
 
-asyncTest("can change fixture attributes after creation", function() {
+asyncTest("can change fixture attributes after creation", function () {
   var user = store.makeFixture('user');
   user.name = "new name";
 
-  store.find('user', 1).then( function(user) {
+  store.find('user', 1).then(function (user) {
     equal(user.get('name'), "new name", "changes local attributes");
     start();
   });
 });
 
 
-test("#resetModels clears the store of models, clears the FIXTURES arrays for each model and resets the model definition", function() {
+test("#resetModels clears the store of models, clears the FIXTURES arrays for each model and resets the model definition", function () {
   var project = store.makeFixture('project');
   var user = store.makeFixture('user', {projects: [project.id]});
 
@@ -59,32 +61,34 @@ test("#resetModels clears the store of models, clears the FIXTURES arrays for ea
 
 
 module('DS.Store with DS.FixtureAdapter', {
-  setup: function() {
+  setup: function () {
     testHelper = TestHelper.setup(DS.FixtureAdapter);
     store = testHelper.getStore();
   },
-  teardown: function() {
-    Em.run(function() { testHelper.teardown(); });
+  teardown: function () {
+    Em.run(function () {
+      testHelper.teardown();
+    });
   }
 });
 
 
-test("#makeFixture builds and pushes fixture into the models FIXTURE array", function() {
+test("#makeFixture builds and pushes fixture into the models FIXTURE array", function () {
   var json = store.makeFixture('user');
   equal(User.FIXTURES.length, 1);
   equal(User.FIXTURES[0], json);
 });
 
 
-asyncTest("#makeFixture sets belongsTo on hasMany associations", function() {
+asyncTest("#makeFixture sets belongsTo on hasMany associations", function () {
   var p1 = store.makeFixture('project');
   // second project not added on purpose to make sure only one is
   // assigned in hasMany
   store.makeFixture('project');
   var user = store.makeFixture('user', {projects: [p1.id]})
 
-  store.find('user', 1).then( function(user) {
-    user.get('projects').then( function(projects) {
+  store.find('user', 1).then(function (user) {
+    user.get('projects').then(function (projects) {
       equal(projects.get('length'), 1, "adds hasMany records");
       equal(projects.get('firstObject.user.id'), user.id, "sets belongsTo record");
       start();
@@ -93,12 +97,12 @@ asyncTest("#makeFixture sets belongsTo on hasMany associations", function() {
 })
 
 
-asyncTest("#makeFixture adds record to hasMany association array for which it belongsTo", function() {
+asyncTest("#makeFixture adds record to hasMany association array for which it belongsTo", function () {
   var userJson = store.makeFixture('user');
   var projectJson = store.makeFixture('project', {user: userJson.id});
 
-  store.find('user', userJson.id).then( function(user) {
-    user.get('projects').then( function(projects) {
+  store.find('user', userJson.id).then(function (user) {
+    user.get('projects').then(function (projects) {
       equal(projects.get('length'), 1, "adds hasMany records");
       equal(projects.get('firstObject.user.id'), user.id, "sets belongsTo record");
       start();
@@ -106,12 +110,12 @@ asyncTest("#makeFixture adds record to hasMany association array for which it be
   })
 })
 
-asyncTest("#makeFixture handles default belongsTo associations in fixture", function() {
+asyncTest("#makeFixture handles default belongsTo associations in fixture", function () {
   var projectWithUser = store.makeFixture('project_with_user');
   equal(User.FIXTURES.length, 1);
 
-  store.find('user', 1).then( function(user) {
-    user.get('projects').then( function(projects) {
+  store.find('user', 1).then(function (user) {
+    user.get('projects').then(function (projects) {
       equal(projects.get('length'), 1, "adds hasMany records");
       equal(projects.get('firstObject.user.id'), 1, "sets belongsTo record");
       start();
@@ -130,17 +134,17 @@ asyncTest("#makeFixture handles default belongsTo associations in fixture", func
 })
 
 
-asyncTest("#createRecord adds belongsTo association to records it hasMany of", function() {
+asyncTest("#createRecord adds belongsTo association to records it hasMany of", function () {
   var user = store.makeFixture('user');
 
-  store.find('user', user.id).then(function(user) {
+  store.find('user', user.id).then(function (user) {
 
-    var projectJson = {title:'project', user: user};
+    var projectJson = {title: 'project', user: user};
 
     store.createRecord('project', projectJson).save()
-      .then( function(project) {
+      .then(function (project) {
         return Ember.RSVP.all([project.get('user'), user.get('projects')]);
-      }).then( function(promises) {
+      }).then(function (promises) {
         var projectUser = promises[0], projects = promises[1];
         equal(projectUser.get('id'), user.get('id'));
         equal(projects.get('length'), 1);
@@ -149,36 +153,36 @@ asyncTest("#createRecord adds belongsTo association to records it hasMany of", f
   })
 })
 
-asyncTest("#createRecord can work for one-to-none associations", function() {
+asyncTest("#createRecord can work for one-to-none associations", function () {
   var user = store.makeFixture('user');
 
-  store.find('user', user.id).then(function(user) {
+  store.find('user', user.id).then(function (user) {
 
-    var smallCompanyJson = {name:'small company', owner: user};
+    var smallCompanyJson = {name: 'small company', owner: user};
 
     store.createRecord('small_company', smallCompanyJson).save()
-      .then( function(smallCompany) {
+      .then(function (smallCompany) {
         return smallCompany.get('owner');
-      }).then( function(owner) {
+      }).then(function (owner) {
         equal(owner.get('id'), user.get('id'));
         start();
       });
   })
 })
 
-asyncTest("#createRecord adds hasMany association to records it hasMany of ", 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) {
+  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 propertyJson = {name:'beach front property'};
+    var propertyJson = {name: 'beach front property'};
 
     property = store.createRecord('property', propertyJson);
-    property.get('owners').then(function(owners){
+    property.get('owners').then(function (owners) {
       owners.addObjects(users);
-    }).then( function() {
+    }).then(function () {
       return property.get('owners');
-    }).then( function(users) {
+    }).then(function (users) {
       equal(users.get('length'), usersJson.length);
       start();
     });

data/tests/index.html

@@ -30,6 +30,7 @@
 <script src='rest_adapter_factory_test.js'></script>
 <script src='store_test.js'></script>
 <script src='factory_guy_test.js'></script>
+<script src='factory_guy_test_mixin_test.js'></script>
 <div id='qunit-fixture'>
 
     <!-- any HTML you want to be present in each test (will be reset for each test) -->

data/tests/rest_adapter_factory_test.js

@@ -195,6 +195,21 @@ test("belongsTo associations defined as attributes in fixture", function() {
 });
 
 
+test("hasMany associations defined as attributes in fixture", function() {
+  var user = store.makeFixture('user_with_projects');
+  equal(user.get('projects.length'), 2)
+  equal(user.get('projects.firstObject.user'), user)
+  equal(user.get('projects.lastObject.user'), user)
+})
+
+test("hasMany associations defined with traits", function() {
+  var user = store.makeFixture('user', 'with_projects');
+  equal(user.get('projects.length'), 2)
+  equal(user.get('projects.firstObject.user'), user)
+  equal(user.get('projects.lastObject.user'), user)
+})
+
+
 module('DS.Store#makeList with DS.RESTAdapter', {
   setup: function() {
     testHelper = TestHelper.setup(DS.RESTAdapter);

data/tests/support/factories/company_factory.js

@@ -1,4 +1,4 @@
-FactoryGuy.define('company', {
+FactoryGuy.define("company", {
   default: {
     name: 'Silly corp'
   }

data/tests/support/factories/project_factory.js

@@ -1,4 +1,4 @@
-FactoryGuy.define('project', {
+FactoryGuy.define("project", {
   sequences: {
     title: function(num) {return 'Project' + num}
   },
@@ -7,7 +7,7 @@ FactoryGuy.define('project', {
     with_title_sequence: { title: FactoryGuy.generate('title') },
     with_user: { user: {} },
     with_dude: { user: {name: 'Dude'} },
-    with_admin: { user: FactoryGuy.association('admin') }
+    with_admin: { user: FactoryGuy.belongsTo('admin') }
   },
   default: {
     title: FactoryGuy.generate('title')
@@ -22,6 +22,11 @@ FactoryGuy.define('project', {
   },
   project_with_admin: {
     // for named association, use this FactoryGuy.association helper method
-    user: FactoryGuy.association('admin')
+    user: FactoryGuy.belongsTo('admin')
+  },
+  project_with_parent: {
+    // refer to belongsTo association where the name of the association
+    // differs from the model name
+    parent: FactoryGuy.belongsTo('project')
   }
 });

data/tests/support/factories/user_factory.js

@@ -6,5 +6,13 @@ FactoryGuy.define('user', {
   // named 'user' type with custom attributes
   admin: {
     name: 'Admin'
+  },
+  user_with_projects: {
+    projects: FactoryGuy.hasMany('project', 2)
+  },
+  traits: {
+    with_projects: {
+      projects: FactoryGuy.hasMany('project', 2)
+    }
   }
 });

data/tests/test_setup.js

@@ -1,4 +1,4 @@
-FactoryGuy.define('company', {
+FactoryGuy.define("company", {
   default: {
     name: 'Silly corp'
   }
@@ -25,7 +25,7 @@ FactoryGuy.define('profile', {
     description: 'Text goes here'
   }
 })
-FactoryGuy.define('project', {
+FactoryGuy.define("project", {
   sequences: {
     title: function(num) {return 'Project' + num}
   },
@@ -34,7 +34,7 @@ FactoryGuy.define('project', {
     with_title_sequence: { title: FactoryGuy.generate('title') },
     with_user: { user: {} },
     with_dude: { user: {name: 'Dude'} },
-    with_admin: { user: FactoryGuy.association('admin') }
+    with_admin: { user: FactoryGuy.belongsTo('admin') }
   },
   default: {
     title: FactoryGuy.generate('title')
@@ -49,7 +49,12 @@ FactoryGuy.define('project', {
   },
   project_with_admin: {
     // for named association, use this FactoryGuy.association helper method
-    user: FactoryGuy.association('admin')
+    user: FactoryGuy.belongsTo('admin')
+  },
+  project_with_parent: {
+    // refer to belongsTo association where the name of the association
+    // differs from the model name
+    parent: FactoryGuy.belongsTo('project')
   }
 });
 FactoryGuy.define('property', {
@@ -65,6 +70,14 @@ FactoryGuy.define('user', {
   // named 'user' type with custom attributes
   admin: {
     name: 'Admin'
+  },
+  user_with_projects: {
+    projects: FactoryGuy.hasMany('project', 2)
+  },
+  traits: {
+    with_projects: {
+      projects: FactoryGuy.hasMany('project', 2)
+    }
   }
 });
 Company = DS.Model.extend({
@@ -112,16 +125,16 @@ Project = DS.Model.extend({
 });
 
 Property = DS.Model.extend({
-  name:     DS.attr('string'),
-  company:  DS.belongsTo('company', {async: true}),
+  name:    DS.attr('string'),
+  company: DS.belongsTo('company', {async: true}),
   owners:  DS.hasMany('user', {async: true, inverse: 'properties'})
 });
 User = DS.Model.extend({
-  name:     DS.attr('string'),
-  company:  DS.belongsTo('company', {async: true, inverse: 'users'}),
-  properties:  DS.hasMany('property', {async: true, inverse: 'owners'}),
+  name:       DS.attr('string'),
+  company:    DS.belongsTo('company', {async: true, inverse: 'users'}),
+  properties: DS.hasMany('property', {async: true, inverse: 'owners'}),
   projects:   DS.hasMany('project'),
-  hats:     DS.hasMany('hat', {polymorphic: true})
+  hats:       DS.hasMany('hat', {polymorphic: true})
 });
 
 

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -70,7 +70,7 @@ ModelDefinition = function (model, config) {
 
    @param {String} name fixture name
    @param {Object} opts attributes to override
-   @param {String} traits array of traits
+   @param {String} traitArgs array of traits
    @returns {Object} json
    */
   this.build = function (name, opts, traitArgs) {
@@ -135,11 +135,6 @@ ModelDefinition = function (model, config) {
     if (!object) {
       return
     }
-//    for (trait in object) {
-//      var trait = object[trait];
-//      if (Ember.typeOf(trait) == 'function') {}
-//      object[trait] = new Trait(trait);
-//    }
     traits = object;
   }
 
@@ -265,23 +260,65 @@ FactoryGuy = {
        default: {
          title: 'Project'
        },
+
+       // setup named project with built in associated user
        project_with_admin: {
-         // for named association, use this FactoryGuy.association helper method
-         user: FactoryGuy.association('admin')
+         user: FactoryGuy.belongsTo('admin')
        }
 
+       // or use as a trait
+       traits: {
+         with_admin: {
+           user: FactoryGuy.belongsTo('admin')
+         }
+       }
+     })
     ```
 
    @param   {String} fixtureName fixture name
    @param   {Object} opts options
    @returns {Function} wrapper function that will build the association json
    */
-  association: function (fixtureName, opts) {
+  belongsTo: function (fixtureName, opts) {
     return function () {
       return FactoryGuy.build(fixtureName, opts);
     }
   },
 
+  /**
+   Used in model definitions to define a hasMany association attribute.
+   For example:
+
+   ```
+   FactoryGuy.define('user', {
+     default: {
+       name: 'Bob'
+     },
+
+     // define the named user type that will have projects
+     user_with_projects: { FactoryGuy.hasMany('project', 2) }
+
+     // or use as a trait
+     traits: {
+       with_projects: {
+         projects: FactoryGuy.hasMany('project', 2)
+       }
+     }
+   })
+
+    ```
+
+   @param   {String} fixtureName fixture name
+   @param   {Number} number of hasMany association items to build
+   @param   {Object} opts options
+   @returns {Function} wrapper function that will build the association json
+   */
+  hasMany: function (fixtureName, number, opts) {
+    return function () {
+      return FactoryGuy.buildList(fixtureName, number, opts);
+    }
+  },
+
   /**
     Given a fixture name like 'person' or 'dude' determine what model this name
     refers to. In this case it's 'person' for each one.
@@ -548,9 +585,6 @@ DS.Store.reopen({
     then push that model to the store and set the id of that new model
     as the attribute value in the fixture
 
-   If it's a hasMany association, and its polymorphic, then convert the
-    attribute value to a polymorphic style
-
    @param modelType
    @param fixture
    */
@@ -564,6 +598,19 @@ DS.Store.reopen({
           fixture[relationship.key] = belongsToRecord;
         }
       }
+      if (relationship.kind == 'hasMany') {
+        var hasManyRecords = fixture[relationship.key];
+        // if the records are objects and not instances they need to be converted to
+        // instances
+        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;
+        }
+      }
     })
   },
 
@@ -900,6 +947,17 @@ FactoryGuyTestMixin = Em.Mixin.create({
     }
   },
 
+  /**
+   Build url for the mockjax call. Proxy to the adapters buildURL method.
+
+   @param {String} type model type name like 'user' for User model
+   @param {String} id
+   @return {String} url
+   */
+  buildURL: function (type, id) {
+    return this.getStore().adapterFor('application').buildURL(type, id);
+  },
+
   /**
    Handling ajax GET ( find record ) for a model. You can mock
    failed find by passing in status of 500.
@@ -912,7 +970,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = this.buildAjaxHttpResponse(name, opts);
     var id = responseJson[modelName].id
-    var url = "/" + Em.String.pluralize(modelName) + "/" + id;
+    var url = this.buildURL(modelName, id);
     this.stubEndpointForHttpRequest(
       url,
       responseJson,
@@ -932,7 +990,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
   handleCreate: function (name, opts, status) {
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = this.buildAjaxHttpResponse(name, opts);
-    var url = "/" + Em.String.pluralize(modelName);
+    var url = this.buildURL(modelName);
     this.stubEndpointForHttpRequest(
       url,
       responseJson,
@@ -945,13 +1003,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in status of 500.
 
-   @param {String} root modelType like 'user' for User
+   @param {String} type model type like 'user' for User model
    @param {String} id id of record to update
    @param {Integer} status Optional HTTP status response code
    */
-  handleUpdate: function (root, id, status) {
+  handleUpdate: function (type, id, status) {
     this.stubEndpointForHttpRequest(
-        "/" + Em.String.pluralize(root) + "/" + id,
+      this.buildURL(type, id),
       {},
       {type: 'PUT', status: (status || 200)}
     )
@@ -961,13 +1019,13 @@ FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax DELETE ( delete record ) for a model type. You can mock
    failed delete by passing in status of 500.
 
-   @param {String} root modelType like 'user' for User
+   @param {String} type model type like 'user' for User model
    @param {String} id id of record to update
    @param {Integer} status Optional HTTP status response code
    */
-  handleDelete: function (root, id, status) {
+  handleDelete: function (type, id, status) {
     this.stubEndpointForHttpRequest(
-        "/" + Em.String.pluralize(root) + "/" + id,
+      this.buildURL(type, id),
       {},
       {type: 'DELETE', status: (status || 200)}
     )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email:
@@ -22,6 +22,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gruntfile.js
+- LICENSE
 - README.md
 - bower.json
 - dist/ember-data-factory-guy.js
@@ -38,6 +39,7 @@ files:
 - src/store.js
 - tests/active_model_adapter_factory_test.js
 - tests/factory_guy_test.js
+- tests/factory_guy_test_mixin_test.js
 - tests/fixture_adapter_factory_test.js
 - tests/index.html
 - tests/rest_adapter_factory_test.js