ember-data-factory-guy 0.2.1 → 0.3.0

data/bower.json

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

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

@@ -66,10 +66,15 @@ ModelDefinition = function (model, config) {
     var modelAttributes = namedModels[name] || {};
     // merge default, modelAttributes and opts to get the rough fixture
     var fixture = $.extend({}, defaultAttributes, modelAttributes, opts);
-    // convert attributes that are functions to strings
+    // deal with attributes that are functions or objects
     for (attribute in fixture) {
-      if (typeof fixture[attribute] == 'function') {
+      if (Ember.typeOf(fixture[attribute]) == 'function') {
+        // function might be a sequence of a named association
         fixture[attribute] = fixture[attribute].call(this, fixture);
+      } else if (Ember.typeOf(fixture[attribute]) == 'object') {
+        // if it's an object it's for a model association, so build the json
+        // for the association and replace the attribute with that json
+        fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute])
       }
     }
     // set the id, unless it was already set in opts
@@ -175,8 +180,8 @@ FactoryGuy = {
 
    FactoryGuy.build('dude') or FactoryGuy.build('person')
 
-   @param model the model to define
-   @param config your model definition object
+   @param {String} model the model to define
+   @param {Object} config your model definition
    */
   define: function (model, config) {
     if (this.modelDefinitions[model]) {
@@ -215,29 +220,50 @@ FactoryGuy = {
   },
 
   /**
-    Given a name like 'person' or 'dude' determine what model this name
+   Used in model definitions to define a belongsTo association attribute.
+   For example:
+
+    ```
+     FactoryGuy.define('project', {
+       default: {
+         title: 'Project'
+       },
+       project_with_admin: {
+         // for named association, use this FactoryGuy.association helper method
+         user: FactoryGuy.association('admin')
+       }
+
+    ```
+
+   @param   {String} fixture name
+   @returns {Function} wrapper function that will build the association json
+   */
+  association: function (fixtureName, opts) {
+    return function () {
+      return FactoryGuy.build(fixtureName, 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.
 
    @param {String} name a fixture name could be model name like 'person'
           or a named person in model definition like 'dude'
-   @returns {String} model name associated with fixture name
+   @returns {String} model name associated with fixture name or undefined if not found
    */
-  lookupModelForName: function (name) {
-    for (model in this.modelDefinitions) {
-      var definition = this.modelDefinitions[model];
-      if (definition.matchesName(name)) {
-        return definition.model;
-      }
-    }
+  lookupModelForFixtureName: function (name) {
+    var definition = this.lookupDefinitionForFixtureName(name);
+    if (definition) { return definition.model; }
   },
 
   /**
 
    @param {String} name a fixture name could be model name like 'person'
           or a named person in model definition like 'dude'
-   @returns {ModelDefinition} definition associated with model
+   @returns {ModelDefinition} ModelDefinition associated with model or undefined if not found
    */
-  lookupDefinitionForName: function (name) {
+  lookupDefinitionForFixtureName: function (name) {
     for (model in this.modelDefinitions) {
       var definition = this.modelDefinitions[model];
       if (definition.matchesName(name)) {
@@ -253,12 +279,12 @@ FactoryGuy = {
    FactoryGuy.build('user') for User model
    FactoryGuy.build('bob') for User model with bob attributes
 
-   @param {String} name fixture name
-   @param {Object} opts options that will override default fixture values
+   @param {String} name Fixture name
+   @param {Object} opts Options that will override default fixture values
    @returns {Object} json fixture
    */
   build: function (name, opts) {
-    var definition = this.lookupDefinitionForName(name);
+    var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
@@ -277,7 +303,7 @@ FactoryGuy = {
    @returns {Array} list of fixtures
    */
   buildList: function (name, number, opts) {
-    var definition = this.lookupDefinitionForName(name);
+    var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
@@ -291,7 +317,6 @@ FactoryGuy = {
    Reset the id sequence for the models back to zero.
   */
   resetModels: function (store) {
-    var typeMaps = store.typeMaps;
     for (model in this.modelDefinitions) {
       var definition = this.modelDefinitions[model];
       definition.reset();
@@ -303,11 +328,6 @@ FactoryGuy = {
         store.unloadAll(modelType);
       } catch (e) {
       }
-//    } else {
-//      for (model in typeMaps) {
-//        store.unloadAll(typeMaps[model].type);
-//      }
-//    }
     }
   },
 
@@ -333,7 +353,6 @@ FactoryGuy = {
   clear: function (opts) {
     if (!opts) {
       this.modelDefinitions = {};
-      return;
     }
   }
 }
@@ -355,19 +374,25 @@ DS.Store.reopen({
    @returns {Object|DS.Model} json or record depending on the adapter type
    */
   makeFixture: function (name, options) {
-    var modelName = FactoryGuy.lookupModelForName(name);
+    var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var fixture = FactoryGuy.build(name, options);
     var modelType = this.modelFor(modelName);
 
     if (this.usingFixtureAdapter()) {
-      this.setBelongsToFixturesAdapter(modelType, modelName, fixture);
+      this.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
       return FactoryGuy.pushFixture(modelType, fixture);
     } else {
-      var self = this;
+      var store = this;
       var model;
       Em.run(function () {
-        model = self.push(modelName, fixture);
-        self.setBelongsToRESTAdapter(modelType, modelName, model);
+        store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType, fixture);
+        if (fixture.type) {
+          // assuming its polymorphic if there is a type attribute
+          // is this too bold an assumption?
+          modelName = fixture.type
+        }
+        model = store.push(modelName, fixture);
+        store.setAssociationsForRESTAdapter(modelType, modelName, model);
       });
       return model;
     }
@@ -390,18 +415,32 @@ DS.Store.reopen({
   },
 
   /**
-   Set the belongsTo association for FixtureAdapter,
-   with models that have a hasMany association.
+   Set the hasMany and belongsTo associations for FixtureAdapter.
 
-   For example if a user hasMany projects, then set the user.id
-   on each project that the user hasMany of, so that the project
-   now has the belongsTo user association setup.
+   For example, assuming a user hasMany projects, if you make a project,
+   then a user with that project in the users list of project, then this method
+   will go back and set the user.id on each project that the user hasMany of,
+   so that the project now has the belongsTo user association setup.
+   As in this scenario:
 
-   @param {String} modelType model type like App.User
+   ```js
+   var projectJson = store.makeFixture('project');
+   var userJson = store.makeFixture('user', {projects: [projectJson.id]});
+   ```
+
+   Or if you make a project with a user, then set this project in
+   the users list of 'projects' it hasMany of. As in this scenario:
+
+   ```js
+   var userJson = store.makeFixture('user');
+   var projectJson = store.makeFixture('project', {user: userJson.id});
+   ```
+
+   @param {DS.Model} modelType model type like User
    @param {String} modelName model name like 'user'
-   @param {Object} parentFixture parent to assign as belongTo
+   @param {Object} fixture to check for needed association assignments
    */
-  setBelongsToFixturesAdapter: function(modelType, modelName, fixture) {
+  setAssociationsForFixtureAdapter: function(modelType, modelName, fixture) {
     var self = this;
     var adapter = this.adapterFor('application');
     Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
@@ -418,7 +457,11 @@ DS.Store.reopen({
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = fixture[relationship.key];
         if (belongsToRecord) {
-          var hasManyName = self.findHasManyRelationshipName2(relationship.type, relationship.parentType);
+          if (typeof belongsToRecord == 'object') {
+            FactoryGuy.pushFixture(relationship.type, belongsToRecord);
+            fixture[relationship.key] = belongsToRecord.id;
+          }
+          var hasManyName = self.findHasManyRelationshipName(relationship.type, relationship.parentType);
           var belongsToFixtures = adapter.fixturesForType(relationship.type);
           var belongsTofixture = adapter.findFixtureById(belongsToFixtures, fixture[relationship.key]);
           if (!belongsTofixture[hasManyName]) {
@@ -431,21 +474,56 @@ DS.Store.reopen({
   },
 
   /**
-   For the REST type models:
+   Before pushing the fixture to the store, do some preprocessing.
+
+   If its a belongs to association, and the fixture has an object there,
+    then push that model to the store and set the id of that new model
+    as the attribute value in the fixture
 
-   Set the belongsTo association with a hasMany association
+   If it's a hasMany association, and its polymorphic, then convert the
+    attribute value to a polymorphic style
+
+   @param modelType
+   @param fixture
+   */
+  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 (typeof belongsToRecord == 'object') {
+          belongsToRecord = store.push(relationship.type, belongsToRecord);
+          fixture[relationship.key] = belongsToRecord;
+        }
+      }
+    })
+  },
 
-   Set this model in the parent hasMany array this model belongsTo
+  /**
+   For the REST type models:
 
    For example if a user hasMany projects, then set the user
    on each project that the user hasMany of, so that the project
-   now has the belongsTo user association setup
+   now has the belongsTo user association setup. As in this scenario:
+
+   ```js
+   var project = store.makeFixture('project');
+   var user = store.makeFixture('user', {projects: [project]});
+   ```
+
+   Or if you make a user, then a project with that user, then set the project
+   in the users list of 'projects' it hasMany of. As in this scenario:
+
+   ```js
+   var user = store.makeFixture('user');
+   var project = store.makeFixture('project', {user: user});
+   ```
 
    @param {DS.Model} modelType model type like 'User'
    @param {String} modelName model name like 'user'
-   @param {DS.Model} model
+   @param {DS.Model} model model to check for needed association assignments
    */
-  setBelongsToRESTAdapter: function (modelType, modelName, model) {
+  setAssociationsForRESTAdapter: function (modelType, modelName, model) {
     var self = this;
     Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
       if (relationship.kind == 'hasMany') {
@@ -458,31 +536,22 @@ DS.Store.reopen({
       if (relationship.kind == 'belongsTo') {
         var belongsToRecord = model.get(name);
         if (belongsToRecord) {
-          var hasManyName = self.findHasManyRelationshipName(belongsToRecord, model)
+          var hasManyName = self.findHasManyRelationshipName(
+            belongsToRecord.constructor,
+            model.constructor
+          )
           belongsToRecord.get(hasManyName).addObject(model);
         }
       }
     })
   },
 
-  findHasManyRelationshipName2: function (belongToModel, childModel) {
-    var relationshipName;
-    Ember.get(belongToModel, 'relationshipsByName').forEach(
-      function (name, relationship) {
-        if (relationship.kind == 'hasMany' &&
-          relationship.type == childModel) {
-          relationshipName = relationship.key;
-        }
-      }
-    )
-    return relationshipName;
-  },
-  findHasManyRelationshipName: function (belongToModel, childModel) {
+  findHasManyRelationshipName: function (belongToModelType, childModelType) {
     var relationshipName;
-    Ember.get(belongToModel.constructor, 'relationshipsByName').forEach(
+    Ember.get(belongToModelType, 'relationshipsByName').forEach(
       function (name, relationship) {
         if (relationship.kind == 'hasMany' &&
-          relationship.type == childModel.constructor) {
+          relationship.type == childModelType) {
           relationshipName = relationship.key;
         }
       }
@@ -558,7 +627,10 @@ DS.FixtureAdapter.reopen({
         relationShips.belongsTo.forEach(function (relationship) {
           var belongsToRecord = record.get(relationship);
           if (belongsToRecord) {
-            var hasManyName = store.findHasManyRelationshipName(belongsToRecord, record);
+            var hasManyName = store.findHasManyRelationshipName(
+              belongsToRecord.constructor,
+              record.constructor
+            );
             belongsToRecord.get(hasManyName).addObject(record);
           }
         })
@@ -639,7 +711,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
     @param {Object} opts fixture options
    */
   handleCreate: function (name, opts) {
-    var model = FactoryGuy.lookupModelForName(name);
+    var model = FactoryGuy.lookupModelForFixtureName(name);
     this.stubEndpointForHttpRequest(
       "/" + Em.String.pluralize(model),
       this.buildAjaxCreateResponse(name, opts),
@@ -655,7 +727,7 @@ FactoryGuyTestMixin = Em.Mixin.create({
 ¬  */
   buildAjaxCreateResponse: function (name, opts) {
     var fixture = FactoryGuy.build(name, opts);
-    var model = FactoryGuy.lookupModelForName(name);
+    var model = FactoryGuy.lookupModelForFixtureName(name);
     var hash = {};
     hash[model] = fixture;
     return hash;

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 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(sequenceName){var sequence=sequences[sequenceName];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts){var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,opts);for(attribute in fixture){if(typeof fixture[attribute]=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}}if(!fixture.id){fixture.id=modelId++}return fixture};this.buildList=function(name,number,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts))}return arr};this.reset=function(){modelId=1;for(name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(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;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(sequenceName){return function(){return this.generate(sequenceName)}},lookupModelForName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition.model}}},lookupDefinitionForName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(name,opts){var definition=this.lookupDefinitionForName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts)},buildList:function(name,number,opts){var definition=this.lookupDefinitionForName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,opts)},resetModels:function(store){var typeMaps=store.typeMaps;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={};return}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var modelName=FactoryGuy.lookupModelForName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.modelFor(modelName);if(this.usingFixtureAdapter()){this.setBelongsToFixturesAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var self=this;var model;Em.run(function(){model=self.push(modelName,fixture);self.setBelongsToRESTAdapter(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},setBelongsToFixturesAdapter: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){var hasManyName=self.findHasManyRelationshipName2(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)}}})},setBelongsToRESTAdapter: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){child.set(modelName,model)})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var hasManyName=self.findHasManyRelationshipName(belongsToRecord,model);belongsToRecord.get(hasManyName).addObject(model)}}})},findHasManyRelationshipName2:function(belongToModel,childModel){var relationshipName;Ember.get(belongToModel,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&relationship.type==childModel){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipName:function(belongToModel,childModel){var relationshipName;Ember.get(belongToModel.constructor,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&relationship.type==childModel.constructor){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(){var relationShips=Ember.get(type,"relationshipNames");if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){var belongsToRecord=record.get(relationship);if(belongsToRecord){var hasManyName=store.findHasManyRelationshipName(belongsToRecord,record);belongsToRecord.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},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)},handleCreate:function(name,opts){var model=FactoryGuy.lookupModelForName(name);this.stubEndpointForHttpRequest("/"+Em.String.pluralize(model),this.buildAjaxCreateResponse(name,opts),{type:"POST"})},buildAjaxCreateResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var model=FactoryGuy.lookupModelForName(name);var hash={};hash[model]=fixture;return hash},handleUpdate:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT"})},handleDelete:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE"})},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 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(sequenceName){var sequence=sequences[sequenceName];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts){var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,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,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts))}return arr};this.reset=function(){modelId=1;for(name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(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;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(sequenceName){return function(){return this.generate(sequenceName)}},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(name,opts){var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts)},buildList:function(name,number,opts){var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,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 modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.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}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.findHasManyRelationshipName(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(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){child.set(modelName,model)})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var hasManyName=self.findHasManyRelationshipName(belongsToRecord.constructor,model.constructor);belongsToRecord.get(hasManyName).addObject(model)}}})},findHasManyRelationshipName:function(belongToModelType,childModelType){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&relationship.type==childModelType){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(){var relationShips=Ember.get(type,"relationshipNames");if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){var belongsToRecord=record.get(relationship);if(belongsToRecord){var hasManyName=store.findHasManyRelationshipName(belongsToRecord.constructor,record.constructor);belongsToRecord.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},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)},handleCreate:function(name,opts){var model=FactoryGuy.lookupModelForFixtureName(name);this.stubEndpointForHttpRequest("/"+Em.String.pluralize(model),this.buildAjaxCreateResponse(name,opts),{type:"POST"})},buildAjaxCreateResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var model=FactoryGuy.lookupModelForFixtureName(name);var hash={};hash[model]=fixture;return hash},handleUpdate:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT"})},handleDelete:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE"})},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.2.1"
+  s.version     = "0.3.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.2.1",
+  "version": "0.3.0",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"

data/src/factory_guy.js

@@ -36,8 +36,8 @@ FactoryGuy = {
 
    FactoryGuy.build('dude') or FactoryGuy.build('person')
 
-   @param model the model to define
-   @param config your model definition object
+   @param {String} model the model to define
+   @param {Object} config your model definition
    */
   define: function (model, config) {
     if (this.modelDefinitions[model]) {
@@ -76,29 +76,50 @@ FactoryGuy = {
   },
 
   /**
-    Given a name like 'person' or 'dude' determine what model this name
+   Used in model definitions to define a belongsTo association attribute.
+   For example:
+
+    ```
+     FactoryGuy.define('project', {
+       default: {
+         title: 'Project'
+       },
+       project_with_admin: {
+         // for named association, use this FactoryGuy.association helper method
+         user: FactoryGuy.association('admin')
+       }
+
+    ```
+
+   @param   {String} fixture name
+   @returns {Function} wrapper function that will build the association json
+   */
+  association: function (fixtureName, opts) {
+    return function () {
+      return FactoryGuy.build(fixtureName, 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.
 
    @param {String} name a fixture name could be model name like 'person'
           or a named person in model definition like 'dude'
-   @returns {String} model name associated with fixture name
+   @returns {String} model name associated with fixture name or undefined if not found
    */
-  lookupModelForName: function (name) {
-    for (model in this.modelDefinitions) {
-      var definition = this.modelDefinitions[model];
-      if (definition.matchesName(name)) {
-        return definition.model;
-      }
-    }
+  lookupModelForFixtureName: function (name) {
+    var definition = this.lookupDefinitionForFixtureName(name);
+    if (definition) { return definition.model; }
   },
 
   /**
 
    @param {String} name a fixture name could be model name like 'person'
           or a named person in model definition like 'dude'
-   @returns {ModelDefinition} definition associated with model
+   @returns {ModelDefinition} ModelDefinition associated with model or undefined if not found
    */
-  lookupDefinitionForName: function (name) {
+  lookupDefinitionForFixtureName: function (name) {
     for (model in this.modelDefinitions) {
       var definition = this.modelDefinitions[model];
       if (definition.matchesName(name)) {
@@ -114,12 +135,12 @@ FactoryGuy = {
    FactoryGuy.build('user') for User model
    FactoryGuy.build('bob') for User model with bob attributes
 
-   @param {String} name fixture name
-   @param {Object} opts options that will override default fixture values
+   @param {String} name Fixture name
+   @param {Object} opts Options that will override default fixture values
    @returns {Object} json fixture
    */
   build: function (name, opts) {
-    var definition = this.lookupDefinitionForName(name);
+    var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
@@ -138,7 +159,7 @@ FactoryGuy = {
    @returns {Array} list of fixtures
    */
   buildList: function (name, number, opts) {
-    var definition = this.lookupDefinitionForName(name);
+    var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
@@ -152,7 +173,6 @@ FactoryGuy = {
    Reset the id sequence for the models back to zero.
   */
   resetModels: function (store) {
-    var typeMaps = store.typeMaps;
     for (model in this.modelDefinitions) {
       var definition = this.modelDefinitions[model];
       definition.reset();
@@ -164,11 +184,6 @@ FactoryGuy = {
         store.unloadAll(modelType);
       } catch (e) {
       }
-//    } else {
-//      for (model in typeMaps) {
-//        store.unloadAll(typeMaps[model].type);
-//      }
-//    }
     }
   },
 
@@ -194,7 +209,6 @@ FactoryGuy = {
   clear: function (opts) {
     if (!opts) {
       this.modelDefinitions = {};
-      return;
     }
   }
 }