ember-data-factory-guy 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09788527ae84d7fb5ef320507d63cacd910bcac
-  data.tar.gz: 27ae38d9ed11164ffda505e36f4e100206e8dffe
+  metadata.gz: b03aa99469ce10e4dd64863b8d36b5daba14be94
+  data.tar.gz: 7e9e167093d1792f6a146a51e35affc3667ded9a
 SHA512:
-  metadata.gz: dbbd749c14a719d71894f95c88903bcb8fae8572cdf840b382f04b3a985df2bc29b3da92c13f0d93fb371b0f727f797772f6af58d971893cb3de1534793b6327
-  data.tar.gz: db6f305ca1ece6733c64ef3880a5e76e44c9c44a29b9f5f922079b6772dcbfbf33af530e518fd4655cb0f2b76b92e39ea56f44772b6cccf5ed8001477ce6fbef
+  metadata.gz: 9d3b281787780405eb930f2ad26405e7d05fbcced53622efb915a8f6a109dd40d713eb8d7586ecb1bdc947daeb30df95874cf53d05beb58765456db941a612f4
+  data.tar.gz: 3f239d6ac31b065f73be62f22a264288250dfe66efd942195183551876b7951072f4dc6ec1eeb8ce883332a871220e9d5748a65b62192432d51f59344a11cc11

data/README.md

@@ -606,47 +606,43 @@ and this is already bundled for you when you use the ember-data-factory-guy libr
 ```
 
 ##### handleCreate
-  - naive handling of createRecord
-  - real life handling createRecord
-  
-###### Naive handling of createRecord
-*success case is the default*
 
+*success case is the default*
+  
+*Realistically, you will have code in a view action or controller action that will
+ create the record, and setup any associations. 
+ Therefore, all you need to pass in to handleCreate are the attributes on the model
+ that are being tested ( excluding associations .. you don't need those)*
+ 
 ```javascript
-  // set up the profile you want to create here 
-  testHelper.handleCreate('profile', 'with_company', {description: "Moo"})
   
-  // don't put options or traits here just put 'profile', since the above handle create 
-  // is tailoring the profile for you 
-  store.createRecord('profile').save().then(function(profile) {
-    profile.toJSON() //=> {id:1, description: "Moo", company: "1"}
-  });
+  // most actions that create a record look something like this:
+  action: {
+    addProject: function (user) {
+      var name = this.$('.add-project input').val();
+      var store = this.get('controller.store');
+      store.createRecord('project', {name: name, user: user}).save();
+    }
+  }
 
 ```
 
-*mocking a failed create*
-
-```javascript
-  // set the succeed flag to 'false' 
-  testHelper.handleCreate('profile', false);
+In this case, you are are creating a 'project' record with a specific name, and belonging
+to a particular user. To mock this createRecord call do this:
   
-  store.createRecord('profile').save() //=> fails
+```javascript
+  // note that you don't include the user association 
+  testHelper.handleCreate('project', {name: "Moo"})
 
 ```
 
+*mocking a failed create*
 
-###### Real Life handling of createRecord
-
-**Usually 
 ```javascript
-  // set up the profile you want to create here 
-  testHelper.handleCreate('profile', 'with_company', {description: "Moo"})
+  // set the succeed flag to 'false' 
+  testHelper.handleCreate('profile', null, false);
   
-  // don't put options or traits here just put 'profile', since the above handle create 
-  // is tailoring the profile for you 
-  store.createRecord('profile').save().then(function(profile) {
-    profile.toJSON() //=> {id:1, description: "Moo", company: "1"}
-  });
+  store.createRecord('profile').save() //=> fails
 
 ```
 
@@ -733,8 +729,10 @@ test("Creates new project", function() {
 
     click('.add-div div:contains(New Project)')
     fillIn('.add-project input', newProjectName)
-    // This is the special sauce that makes this project really hum.
-    // Check out the FactoryGuyTestMixin to see what is going on here
+
+    // Remember, you only need to pass in attributes of the model you expect
+    // to create in your application. You do not need to include belongsTo records,
+    // as in this case the 'user' belongsTo association
     viewHelper.handleCreate('project', {name: newProjectName})
 
     /**

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-factory-guy",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"
@@ -15,12 +15,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "handlebars": "~1.1.2",
-    "jquery": "2.0.3",
-    "ember": "latest",
     "ember-data": "1.0.0-beta.11",
-    "chance": "latest",
-    "qunit": "latest",
     "jquery-mockjax": "latest"
   },
   "ignore": [
@@ -36,7 +31,11 @@
     "tests"
   ],
   "devDependencies": {
+    "chance": "latest",
+    "qunit": "latest",
     "sinon": "http://sinonjs.org/releases/sinon-1.10.1.js",
-    "sinon-qunit": "~2.0.0"
+    "sinon-qunit": "~2.0.0",
+    "jquery": "2.0.3",
+    "ember": "latest"
   }
 }

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

@@ -1,19 +1,17 @@
 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 }
-};
-
+  this.toString = function () {
+    return message;
+  };
+}
 /**
  A ModelDefinition encapsulates a model's definition
 
@@ -27,8 +25,8 @@ ModelDefinition = function (model, config) {
   var defaultAttributes = {};
   var namedModels = {};
   var modelId = 1;
+  var sequenceName = null;
   this.model = model;
-
   /**
    @param {String} name model name like 'user' or named type like 'admin'
    @returns {Boolean} true if name is this definitions model or this definition
@@ -36,12 +34,11 @@ ModelDefinition = function (model, config) {
    */
   this.matchesName = function (name) {
     return model == name || namedModels[name];
-  }
-
-  // TODO
-  this.merge = function (config) {
-  }
-
+  };
+  // Increment id
+  this.nextId = function () {
+    return modelId++;
+  };
   /**
    Call the next method on the named sequence function. If the name
    is a function, create the sequence with that function
@@ -60,11 +57,10 @@ ModelDefinition = function (model, config) {
     }
     var sequence = sequences[name];
     if (!sequence) {
-      throw new MissingSequenceError("Can not find that sequence named [" + sequenceName + "] in '" + model + "' definition")
+      throw new MissingSequenceError('Can not find that sequence named [' + sequenceName + '] in \'' + model + '\' definition');
     }
     return sequence.next();
-  }
-
+  };
   /**
    Build a fixture by name
 
@@ -74,31 +70,30 @@ ModelDefinition = function (model, config) {
    @returns {Object} json
    */
   this.build = function (name, opts, traitArgs) {
-    var traitsObj = {}
-    traitArgs.forEach(function(trait) {
+    var traitsObj = {};
+    traitArgs.forEach(function (trait) {
       $.extend(traitsObj, traits[trait]);
-    })
+    });
     var modelAttributes = namedModels[name] || {};
     // merge default, modelAttributes, traits and opts to get the rough fixture
     var fixture = $.extend({}, defaultAttributes, modelAttributes, traitsObj, opts);
     // deal with attributes that are functions or objects
-    for (attribute in fixture) {
+    for (var attribute in fixture) {
       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])
+        fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
       }
     }
     // set the id, unless it was already set in opts
     if (!fixture.id) {
-      fixture.id = modelId++;
+      fixture.id = this.nextId();
     }
     return fixture;
-  }
-
+  };
   /**
    Build a list of fixtures
 
@@ -114,63 +109,53 @@ ModelDefinition = function (model, config) {
       arr.push(this.build(name, opts, traits));
     }
     return arr;
-  }
-
+  };
   // Set the modelId back to 1, and reset the sequences
   this.reset = function () {
     modelId = 1;
-    for (name in sequences) {
+    for (var name in sequences) {
       sequences[name].reset();
     }
-  }
-
+  };
   var parseDefault = function (object) {
     if (!object) {
-      return
+      return;
     }
     defaultAttributes = object;
-  }
-
+  };
   var parseTraits = function (object) {
     if (!object) {
-      return
+      return;
     }
     traits = object;
-  }
-
+  };
   var parseSequences = function (object) {
     if (!object) {
-      return
+      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')
+        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;
-  }
-
+  };
   // initialize
   parseConfig(config);
-}
+};
 FactoryGuy = {
   modelDefinitions: {},
-
   /**
    ```javascript
 
@@ -216,7 +201,6 @@ FactoryGuy = {
       this.modelDefinitions[model] = new ModelDefinition(model, config);
     }
   },
-
   /**
    Used in model definitions to declare use of a sequence. For example:
 
@@ -241,16 +225,15 @@ FactoryGuy = {
             definition containing the sequence
    */
   generate: function (nameOrFunction) {
-    var sortaRandomName = Math.floor((1 + Math.random()) * 0x10000).toString(16) + Date.now()
+    var sortaRandomName = Math.floor((1 + Math.random()) * 65536).toString(16) + Date.now();
     return function () {
-      if (Em.typeOf(nameOrFunction) == "function") {
+      if (Em.typeOf(nameOrFunction) == 'function') {
         return this.generate(sortaRandomName, nameOrFunction);
       } else {
         return this.generate(nameOrFunction);
       }
-    }
+    };
   },
-
   /**
    Used in model definitions to define a belongsTo association attribute.
    For example:
@@ -282,14 +265,12 @@ FactoryGuy = {
   belongsTo: function (fixtureName, opts) {
     return function () {
       return FactoryGuy.build(fixtureName, opts);
-    }
+    };
   },
-
-  association: function(fixtureName, opts) {
-    console.log('DEPRECATION Warning: use FactoryGuy.belongsTo instead')
+  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:
@@ -321,9 +302,8 @@ FactoryGuy = {
   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.
@@ -334,9 +314,10 @@ FactoryGuy = {
    */
   lookupModelForFixtureName: function (name) {
     var definition = this.lookupDefinitionForFixtureName(name);
-    if (definition) { return definition.model; }
+    if (definition) {
+      return definition.model;
+    }
   },
-
   /**
 
    @param {String} name a fixture name could be model name like 'person'
@@ -344,15 +325,13 @@ FactoryGuy = {
    @returns {ModelDefinition} ModelDefinition associated with model or undefined if not found
    */
   lookupDefinitionForFixtureName: function (name) {
-    for (model in this.modelDefinitions) {
+    for (var model in this.modelDefinitions) {
       var definition = this.modelDefinitions[model];
       if (definition.matchesName(name)) {
         return definition;
       }
     }
   },
-
-
   /**
    Build fixtures for model or specific fixture name. For example:
 
@@ -369,23 +348,22 @@ FactoryGuy = {
    */
   build: function () {
     var args = Array.prototype.slice.call(arguments);
-    var opts = {}
+    var opts = {};
     var name = args.shift();
     if (!name) {
-      throw new Error("Build needs a factory name to build");
+      throw new Error('Build needs a factory name to build');
     }
-    if (Ember.typeOf(args[args.length-1]) == 'object') {
-      opts  = args.pop();
+    if (Ember.typeOf(args[args.length - 1]) == 'object') {
+      opts = args.pop();
     }
-    var traits = args; // whatever is left are traits
-
+    var traits = args;
+    // whatever is left are traits
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
-      throw new Error("Can't find that factory named [" + name + "]");
+      throw new Error('Can\'t find that factory named [' + name + ']');
     }
     return definition.build(name, opts, traits);
   },
-
   /**
    Build list of fixtures for model or specific fixture name. For example:
 
@@ -403,21 +381,28 @@ FactoryGuy = {
     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");
+      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 opts = {};
+    if (Ember.typeOf(args[args.length - 1]) == 'object') {
+      opts = args.pop();
     }
-    var traits = args; // whatever is left are traits
-
+    var traits = args;
+    // whatever is left are traits
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
-      throw new Error("Can't find that factory named [" + name + "]");
+      throw new Error('Can\'t find that factory named [' + name + ']');
     }
     return definition.buildList(name, number, traits, opts);
   },
-
+  /**
+   Unload all models of the given type from the store in the next Ember runloop
+  */
+  unloadModel: function (modelType) {
+    Ember.run(function () {
+      store.unloadAll(modelType);
+    });
+  },
   /**
    TODO: This is kind of problematic right now .. needs work
 
@@ -425,7 +410,7 @@ FactoryGuy = {
    Reset the id sequence for the models back to zero.
   */
   resetModels: function (store) {
-    for (model in this.modelDefinitions) {
+    for (var model in this.modelDefinitions) {
       var definition = this.modelDefinitions[model];
       definition.reset();
       try {
@@ -433,16 +418,11 @@ FactoryGuy = {
         if (store.usingFixtureAdapter()) {
           modelType.FIXTURES = [];
         }
-        Ember.run(function(){
-          store.unloadAll(modelType);
-        })
+        this.unloadModel(modelType);
       } catch (e) {
-//        console.log(e)
       }
     }
   },
-
-
   /**
    Push fixture to model's FIXTURES array.
    Used when store's adapter is a DS.FixtureAdapter.
@@ -452,13 +432,12 @@ FactoryGuy = {
    @returns {Object} json fixture data
    */
   pushFixture: function (modelClass, fixture) {
-    if (!modelClass['FIXTURES']) {
-      modelClass['FIXTURES'] = [];
+    if (!modelClass.FIXTURES) {
+      modelClass.FIXTURES = [];
     }
-    modelClass['FIXTURES'].push(fixture);
+    modelClass.FIXTURES.push(fixture);
     return fixture;
   },
-
   /**
    Clears all model definitions
   */
@@ -467,7 +446,7 @@ FactoryGuy = {
       this.modelDefinitions = {};
     }
   }
-}
+};
 DS.Store.reopen({
   /**
    @returns {Boolean} true if store's adapter is DS.FixtureAdapter
@@ -476,7 +455,6 @@ DS.Store.reopen({
     var adapter = this.adapterFor('application');
     return adapter instanceof DS.FixtureAdapter;
   },
-
   /**
    Make new fixture and save to store. If the store is using FixtureAdapter,
    will push to FIXTURE array, otherwise will use push method on adapter to load
@@ -489,23 +467,19 @@ DS.Store.reopen({
    */
   makeFixture: function () {
     var store = this;
-    var fixture = FactoryGuy.build.apply(FactoryGuy,arguments);
+    var fixture = FactoryGuy.build.apply(FactoryGuy, arguments);
     var name = arguments[0];
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var modelType = store.modelFor(modelName);
-
     if (this.usingFixtureAdapter()) {
       this.setAssociationsForFixtureAdapter(modelType, modelName, fixture);
       return FactoryGuy.pushFixture(modelType, fixture);
     } else {
-      return store.makeModel(modelType, fixture)
+      return store.makeModel(modelType, fixture);
     }
   },
-
   makeModel: function (modelType, fixture) {
-    var store = this,
-        modelName = store.modelFor(modelType).typeKey,
-        model;
+    var store = this, modelName = store.modelFor(modelType).typeKey, model;
     Em.run(function () {
       store.findEmbeddedAssociationsForRESTAdapter(modelType, fixture);
       if (fixture.type) {
@@ -519,7 +493,6 @@ DS.Store.reopen({
     });
     return model;
   },
-
   /**
    Make a list of Fixtures
 
@@ -532,11 +505,10 @@ DS.Store.reopen({
     var arr = [];
     var number = arguments[1];
     for (var i = 0; i < number; i++) {
-      arr.push(this.makeFixture.apply(this,arguments));
+      arr.push(this.makeFixture.apply(this, arguments));
     }
     return arr;
   },
-
   /**
    Set the hasMany and belongsTo associations for FixtureAdapter.
 
@@ -582,10 +554,9 @@ DS.Store.reopen({
             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) {
@@ -597,14 +568,13 @@ DS.Store.reopen({
           var belongsToFixtures = adapter.fixturesForType(relationship.type);
           var belongsTofixture = adapter.findFixtureById(belongsToFixtures, fixture[relationship.key]);
           if (!belongsTofixture[hasManyName]) {
-            belongsTofixture[hasManyName] = []
+            belongsTofixture[hasManyName] = [];
           }
           belongsTofixture[hasManyName].push(fixture.id);
         }
       }
-    })
+    });
   },
-
   /**
    Before pushing the fixture to the store, do some preprocessing. Descend into the tree
    of object data, and convert child objects to record instances recursively.
@@ -631,20 +601,19 @@ DS.Store.reopen({
         var hasManyRecords = fixture[relationship.key];
         if (Ember.typeOf(hasManyRecords) == 'array') {
           if (Ember.typeOf(hasManyRecords[0]) == 'object') {
-            var records = Em.A()
+            var records = Em.A();
             hasManyRecords.map(function (object) {
               store.findEmbeddedAssociationsForRESTAdapter(relationship.type, object);
               var record = store.push(relationship.type, object);
               records.push(record);
               return record;
-            })
+            });
             fixture[relationship.key] = records;
           }
         }
       }
-    })
+    });
   },
-
   /**
    For the REST type models:
 
@@ -680,47 +649,32 @@ DS.Store.reopen({
       if (relationship.kind == 'hasMany') {
         var children = model.get(name) || [];
         children.forEach(function (child) {
-          var belongsToName = self.findRelationshipName(
-            'belongsTo',
-            child.constructor,
-            model
-          );
+          var belongsToName = self.findRelationshipName('belongsTo', child.constructor, model);
           if (belongsToName) {
             child.set(belongsToName, model);
           }
-        })
+        });
       }
-    })
+    });
   },
-
-
   findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
-    Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (relationship, name) {
-        if (relationship.kind == kind &&
-          childModel instanceof relationship.type) {
-          relationshipName = relationship.key;
-        }
+    Ember.get(belongToModelType, 'relationshipsByName').forEach(function (relationship, name) {
+      if (relationship.kind == kind && childModel instanceof relationship.type) {
+        relationshipName = relationship.key;
       }
-    )
+    });
     return relationshipName;
   },
-
   findHasManyRelationshipNameForFixtureAdapter: function (belongToModelType, childModelType) {
     var relationshipName;
-    Ember.get(belongToModelType, 'relationshipsByName').forEach(
-      function (relationship, name) {
-        if (relationship.kind == 'hasMany' &&
-          childModelType == relationship.type) {
-          relationshipName = relationship.key;
-        }
+    Ember.get(belongToModelType, 'relationshipsByName').forEach(function (relationship, name) {
+      if (relationship.kind == 'hasMany' && childModelType == relationship.type) {
+        relationshipName = relationship.key;
       }
-    )
+    });
     return relationshipName;
   },
-
-
   /**
    Adding a pushPayload for FixtureAdapter, but using the original with
    other adapters that support pushPayload.
@@ -737,31 +691,26 @@ DS.Store.reopen({
     }
   }
 });
-
 FactoryGuyTestMixin = Em.Mixin.create({
-
   // Pass in the app root, which typically is App.
   setup: function (app) {
     this.set('container', app.__container__);
     return this;
   },
-
   useFixtureAdapter: function (app) {
     app.ApplicationAdapter = DS.FixtureAdapter;
     this.getStore().adapterFor('application').simulateRemoteResponse = false;
   },
-
   /**
    @param {String} model type like user for model User
    @return {boolean} true if model's serializer is ActiveModelSerializer based
    */
   usingActiveModelSerializer: function (type) {
-    var store = this.getStore()
-    var type = store.modelFor(type);
-    var serializer = store.serializerFor(type.typeKey);
+    var store = this.getStore();
+    var modelType = store.modelFor(type);
+    var serializer = store.serializerFor(modelType.typeKey);
     return serializer instanceof DS.ActiveModelSerializer;
   },
-
   /**
    Proxy to store's find method
 
@@ -772,7 +721,6 @@ FactoryGuyTestMixin = Em.Mixin.create({
   find: function (type, id) {
     return this.getStore().find(type, id);
   },
-
   /**
    Proxy to store's makeFixture method
 
@@ -781,19 +729,15 @@ FactoryGuyTestMixin = Em.Mixin.create({
     var store = this.getStore();
     return store.makeFixture.apply(store, arguments);
   },
-
   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);
   },
-
   /**
    Using mockjax to stub an http request.
 
@@ -809,16 +753,12 @@ FactoryGuyTestMixin = Em.Mixin.create({
       responseText: json,
       type: options.type || 'GET',
       status: options.status || 200
-    }
-
+    };
     if (options.data) {
-      request.data = options.data
+      request.data = options.data;
     }
-
     $.mockjax(request);
   },
-
-
   /**
    Build url for the mockjax call. Proxy to the adapters buildURL method.
 
@@ -830,8 +770,6 @@ FactoryGuyTestMixin = Em.Mixin.create({
     var type = this.getStore().modelFor(typeName);
     return this.getStore().adapterFor(type).buildURL(type.typeKey, id);
   },
-
-
   /**
      Handling ajax GET for finding all records for a type of model.
      You can mock failed find by passing in success argument as false.
@@ -844,53 +782,38 @@ FactoryGuyTestMixin = Em.Mixin.create({
   handleFindMany: function () {
     var store = this.getStore();
     // make the records and load them in the store
-    store.makeList.apply(store,arguments);
-
+    store.makeList.apply(store, arguments);
     var name = arguments[0];
     var modelName = FactoryGuy.lookupModelForFixtureName(name);
     var responseJson = {};
-    responseJson[modelName]=[];
+    responseJson[modelName] = [];
     var url = this.buildURL(modelName);
     // mock the ajax call, but return nothing, since the records will be
     // retrieved from the store where they were just loaded above
-    this.stubEndpointForHttpRequest(url, responseJson, {type: 'GET'})
+    this.stubEndpointForHttpRequest(url, responseJson, { type: 'GET' });
   },
-
   /**
    Handling ajax POST ( create record ) for a model. You can mock
    failed create by passing in success argument as false.
 
-   @param {String} name  name of the fixture ( or model ) to create
-   @param {String} trait  optional traits ( one or more )
-   @param {Object} opts  optional fixture options
+   @param {String} modelName  name of model your creating like 'profile' for Profile
+   @param {Object} options  hash of model options ( that do not include associations )
    @param {Boolean} succeed  optional flag to indicate if the request
       should succeed ( default is true )
    */
-  handleCreate: function () {
-    var args = Array.prototype.slice.call(arguments);
-
-    var succeed = true;
-    if (Ember.typeOf(args[args.length-1]) == 'boolean') {
-      succeed = args.pop();
-    }
-
-    var name = args[0];
-    var modelName = FactoryGuy.lookupModelForFixtureName(name);
+  handleCreate: function (modelName, options, succeed) {
+    succeed = succeed === undefined ? true : succeed;
+    options = options === undefined ? {} : options;
     var url = this.buildURL(modelName);
+    var definition = FactoryGuy.modelDefinitions[modelName];
     var responseJson = {};
-    var httpOptions = {type: 'POST'}
-
+    var httpOptions = { type: 'POST' };
     if (succeed) {
-      var store = this.getStore();
-      // make the record and load it in the store
-      var model = store.makeFixture.apply(store,args);
-      // believe it or not .. this actually works
-      responseJson[modelName]=model;
+      responseJson[modelName] = $.extend(options,{id: definition.nextId()});
     } else {
       httpOptions.status = 500;
     }
-    console.log('handleCreate responseJson',responseJson)
-    this.stubEndpointForHttpRequest(url, responseJson, httpOptions)
+    this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
   },
 
   /**
@@ -904,14 +827,11 @@ FactoryGuyTestMixin = Em.Mixin.create({
    */
   handleUpdate: function (type, id, succeed) {
     succeed = succeed === undefined ? true : succeed;
-
-    this.stubEndpointForHttpRequest(
-      this.buildURL(type, id),
-      {},
-      {type: 'PUT', status: (succeed ? 200 : 500)}
-    )
+    this.stubEndpointForHttpRequest(this.buildURL(type, id), {}, {
+      type: 'PUT',
+      status: succeed ? 200 : 500
+    });
   },
-
   /**
    Handling ajax DELETE ( delete record ) for a model type. You can mock
    failed delete by passing in success argument as false.
@@ -923,14 +843,11 @@ FactoryGuyTestMixin = Em.Mixin.create({
    */
   handleDelete: function (type, id, succeed) {
     succeed = succeed === undefined ? true : succeed;
-
-    this.stubEndpointForHttpRequest(
-      this.buildURL(type, id),
-      {},
-      {type: 'DELETE', status: (succeed ? 200 : 500)}
-    )
+    this.stubEndpointForHttpRequest(this.buildURL(type, id), {}, {
+      type: 'DELETE',
+      status: succeed ? 200 : 500
+    });
   },
-
   teardown: function () {
     FactoryGuy.resetModels(this.getStore());
     $.mockjax.clear();