ember-data-factory-guy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79807f71868de1b78d4749f7d4a6ae1da807ede
-  data.tar.gz: a45cf559a2cbbd4d2c2169bcab63748148988a92
+  metadata.gz: e5bdae9f46c1972abb834e6dbc097e0c078d8e97
+  data.tar.gz: 6587a2575c0b315ebf1e03a1157e219f051e4e72
 SHA512:
-  metadata.gz: a3f8360c4ec985b6077dc1e4cc169a531ec8803313a431eba7e03d87cc6282686ce3205bfef824ab386128ed2952617acf4f29a6f06331c0065d5467ad2e54be
-  data.tar.gz: d294092adde0d91d1cb8feffccd5cd15f09854509cafe3966674bd0b9ec8220c94c2fb3c8954f21fd8075ede0ad0db2fab1a2779b08a735470189113017d7a4f
+  metadata.gz: 287ae58b03af66d6fde0256d692ce1b8ed7609487c5fa619f4fed997b980fe41eae3205aa1e97144bc643dc15f2e74b6a250721e1c097107d97af7b13fd67930
+  data.tar.gz: 29510c92fc6965cf66059895635de26153e14b818c9fd52f0974d06802091367ddb5cd625808632b70faac1578408a51901dd5ead3cedda9e846ec018eef9971

data/bower.json

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

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

@@ -96,9 +96,9 @@ ModelDefinition = function (model, config) {
   /**
    Build a list of fixtures
 
-   @param name model name or named model type
-   @param number of fixtures to build
-   @param opts attribute options
+   @param {String} name model name or named model type
+   @param {Integer} number of fixtures to build
+   @param {Object} opts attribute options
    @returns array of fixtures
    */
   this.buildList = function (name, number, opts) {
@@ -381,6 +381,12 @@ DS.Store.reopen({
     return adapter instanceof DS.FixtureAdapter;
   },
 
+  usingActiveModelSerializer: function () {
+    var adapter = this.adapterFor('application');
+    console.log('adapter.defaultSerializer', adapter.defaultSerializer)
+    return adapter.defaultSerializer == 'active-model';
+  },
+
   /**
    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.
@@ -400,6 +406,7 @@ DS.Store.reopen({
       return FactoryGuy.pushFixture(modelType, fixture);
     } else {
       var store = this;
+
       var model;
       Em.run(function () {
         store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType, fixture);
@@ -543,6 +550,7 @@ DS.Store.reopen({
    */
   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) || [];
@@ -555,7 +563,9 @@ DS.Store.reopen({
           if (relationship.options && relationship.options.inverse) {
             belongsToName = relationship.options.inverse;
           }
-          child.set(belongsToName, model);
+          if (belongsToName) {
+            child.set(belongsToName, model);
+          }
         })
       }
 
@@ -570,6 +580,7 @@ DS.Store.reopen({
             )
             if (hasManyName) {
               belongsToRecord.get(hasManyName).addObject(model);
+              return;
             }
             var oneToOneName = self.findRelationshipName(
               'belongsTo',
@@ -621,6 +632,27 @@ DS.Store.reopen({
     return relationshipName;
   },
 
+//  /**
+//   Adding the ability to check the serializer and convert the json before
+//   it's pushed. For the ActiveModelSerializer, the attributes should be snake case,
+//   for example.
+//
+//   @method push
+//   @param {String or subclass of DS.Model} type
+//   @param {Object} data
+//   @return {DS.Model} the record that was created or updated.
+//  */
+//  push: function(type, data, _partial) {
+//    var type = this.modelFor(type);
+//    var serializer = this.serializerFor(type.typeKey);
+//    console.log('serializer',serializer, serializer+'')
+////    if (this.usingActiveModelSerializer()) {
+////      var model = this.modelFor(modelName);
+////      FactoryGuy.pushFixture(model, payload);
+////    }
+//    this._super(type, data, _partial);
+//  },
+
   /**
    Adding a pushPayload for FixtureAdapter, but using the original with
    other adapters that support pushPayload.
@@ -706,16 +738,27 @@ DS.FixtureAdapter.reopen({
 FactoryGuyTestMixin = Em.Mixin.create({
 
   // Pass in the app root, which typically is App.
-  setup: function(app) {
+  setup: function (app) {
     this.set('container', app.__container__);
     return this;
   },
 
-  useFixtureAdapter: function(app) {
+  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);
+    return serializer instanceof DS.ActiveModelSerializer;
+  },
+
   /**
    Proxy to store's find method
 
@@ -723,11 +766,11 @@ FactoryGuyTestMixin = Em.Mixin.create({
    @param {Object|String|Integer|null} id
    @return {Promise} promise
    */
-  find: function(type, id) {
+  find: function (type, id) {
     return this.getStore().find(type, id);
   },
 
-  make: function(name, opts) {
+  make: function (name, opts) {
     return this.getStore().makeFixture(name, opts);
   },
 
@@ -735,20 +778,20 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return this.get('container').lookup('store:main');
   },
 
-  pushPayload: function(type, hash) {
+  pushPayload: function (type, hash) {
     return this.getStore().pushPayload(type, hash);
   },
 
-  pushRecord: function(type, hash) {
+  pushRecord: function (type, hash) {
     return this.getStore().push(type, hash);
   },
 
   /**
-    Using mockjax to stub an http request.
+   Using mockjax to stub an http request.
 
-    @param {String} url request url
-    @param {Object} json response
-    @param {Object} options ajax request options
+   @param {String} url request url
+   @param {Object} json response
+   @param {Object} options ajax request options
    */
   stubEndpointForHttpRequest: function (url, json, options) {
     options = options || {};
@@ -768,54 +811,107 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-    Handling ajax POST ( create record ) for a model
+   Build the json used for creating record
 
-    @param {String} name of the fixture ( or model ) to create
-    @param {Object} opts fixture options
+   @param {String} name of the fixture ( or model ) to create
+   @param {Object} opts fixture options
    */
-  handleCreate: function (name, opts) {
-    var model = FactoryGuy.lookupModelForFixtureName(name);
-    var responseJson = this.buildAjaxCreateResponse(name, opts);
-    var url = "/" + Em.String.pluralize(model);
-    this.stubEndpointForHttpRequest(url, responseJson, {type: 'POST'})
+  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;
+  },
+
+  /**
+   Convert Object's keys to snake case
+
+   @param {Object} fixture to convert
+   */
+  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
+      }
+    }
+  },
+
+  /**
+   Handling ajax GET ( find record ) for a model. You can mock
+   failed find by passing in status of 500.
+
+   @param {String} name of the fixture ( or model ) to find
+   @param {Object} opts fixture options
+   @param {Integer} status Optional HTTP status response code
+   */
+  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;
   },
 
   /**
-    Build the json used for creating record
+   Handling ajax POST ( create record ) for a model. You can mock
+   failed create by passing in status of 500.
 
-    @param {String} name of the fixture ( or model ) to create
-    @param {Object} opts fixture options
-¬  */
-  buildAjaxCreateResponse: function (name, opts) {
-    var fixture = FactoryGuy.build(name, opts);
-    var model = FactoryGuy.lookupModelForFixtureName(name);
-    var hash = {};
-    hash[model] = fixture;
-    return hash;
+   @param {String} name of the fixture ( or model ) to create
+   @param {Object} opts fixture options
+   @param {Integer} status Optional HTTP status response code
+   */
+  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;
   },
 
   /**
-    Handling ajax PUT ( update record ) for a model type
+   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} id id of record to update
+   @param {String} root modelType like 'user' for User
+   @param {String} id id of record to update
+   @param {Integer} status Optional HTTP status response code
    */
-  handleUpdate: function (root, id) {
+  handleUpdate: function (root, id, status) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
+        "/" + Em.String.pluralize(root) + "/" + id,
+      {},
+      {type: 'PUT', status: (status || 200)}
     )
   },
 
   /**
-    Handling ajax DELETE ( delete record ) for a model type
+   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} id id of record to update
+   @param {String} root modelType like 'user' for User
+   @param {String} id id of record to update
+   @param {Integer} status Optional HTTP status response code
    */
-  handleDelete: function (root, id) {
+  handleDelete: function (root, id, status) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'DELETE'}
+        "/" + Em.String.pluralize(root) + "/" + 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 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){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(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(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 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);if(relationship.options&&relationship.options.inverse){belongsToName=relationship.options.inverse}child.set(belongsToName,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)}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(){var relationShips=Ember.get(type,"relationshipNames");if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){var belongsToRecord=record.get(relationship);if(belongsToRecord){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,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.lookupModelForFixtureName(name);var responseJson=this.buildAjaxCreateResponse(name,opts);var url="/"+Em.String.pluralize(model);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST"});return responseJson},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())}});
+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(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){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(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(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},usingActiveModelSerializer:function(){var adapter=this.adapterFor("application");console.log("adapter.defaultSerializer",adapter.defaultSerializer);return adapter.defaultSerializer=="active-model"},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);if(relationship.options&&relationship.options.inverse){belongsToName=relationship.options.inverse}if(belongsToName){child.set(belongsToName,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(){var relationShips=Ember.get(type,"relationshipNames");if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){var belongsToRecord=record.get(relationship);if(belongsToRecord){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,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},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())}});

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.4.0"
+  s.version     = "0.4.1"
   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.4.0",
+  "version": "0.4.1",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"
@@ -24,13 +24,12 @@
     "type": "git",
     "url": ""
   },
-  "devDependencies": {
-    "0": "grunt-contrib-coffee",
-    "1": "grunt-contrib-concat",
-    "2": "grunt-contrib-uglify",
-    "3": "grunt-contrib-qunit",
-    "grunt-bump": "0.0.14"
-  },
+  "devDependencies": [
+    "grunt-contrib-coffee",
+    "grunt-contrib-concat",
+    "grunt-contrib-uglify",
+    "grunt-contrib-qunit"
+  ],
   "engines": {
     "node": ">=v0.10.1"
   }

data/src/factory_guy_test_mixin.js

@@ -1,16 +1,27 @@
 FactoryGuyTestMixin = Em.Mixin.create({
 
   // Pass in the app root, which typically is App.
-  setup: function(app) {
+  setup: function (app) {
     this.set('container', app.__container__);
     return this;
   },
 
-  useFixtureAdapter: function(app) {
+  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);
+    return serializer instanceof DS.ActiveModelSerializer;
+  },
+
   /**
    Proxy to store's find method
 
@@ -18,11 +29,11 @@ FactoryGuyTestMixin = Em.Mixin.create({
    @param {Object|String|Integer|null} id
    @return {Promise} promise
    */
-  find: function(type, id) {
+  find: function (type, id) {
     return this.getStore().find(type, id);
   },
 
-  make: function(name, opts) {
+  make: function (name, opts) {
     return this.getStore().makeFixture(name, opts);
   },
 
@@ -30,20 +41,20 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return this.get('container').lookup('store:main');
   },
 
-  pushPayload: function(type, hash) {
+  pushPayload: function (type, hash) {
     return this.getStore().pushPayload(type, hash);
   },
 
-  pushRecord: function(type, hash) {
+  pushRecord: function (type, hash) {
     return this.getStore().push(type, hash);
   },
 
   /**
-    Using mockjax to stub an http request.
+   Using mockjax to stub an http request.
 
-    @param {String} url request url
-    @param {Object} json response
-    @param {Object} options ajax request options
+   @param {String} url request url
+   @param {Object} json response
+   @param {Object} options ajax request options
    */
   stubEndpointForHttpRequest: function (url, json, options) {
     options = options || {};
@@ -63,54 +74,107 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-    Handling ajax POST ( create record ) for a model
+   Build the json used for creating record
+
+   @param {String} name of the fixture ( or model ) to create
+   @param {Object} opts fixture options
+   */
+  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;
+  },
+
+  /**
+   Convert Object's keys to snake case
+
+   @param {Object} fixture to convert
+   */
+  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
+      }
+    }
+  },
+
+  /**
+   Handling ajax GET ( find record ) for a model. You can mock
+   failed find by passing in status of 500.
 
-    @param {String} name of the fixture ( or model ) to create
-    @param {Object} opts fixture options
+   @param {String} name of the fixture ( or model ) to find
+   @param {Object} opts fixture options
+   @param {Integer} status Optional HTTP status response code
    */
-  handleCreate: function (name, opts) {
-    var model = FactoryGuy.lookupModelForFixtureName(name);
-    var responseJson = this.buildAjaxCreateResponse(name, opts);
-    var url = "/" + Em.String.pluralize(model);
-    this.stubEndpointForHttpRequest(url, responseJson, {type: 'POST'})
+  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;
   },
 
   /**
-    Build the json used for creating record
+   Handling ajax POST ( create record ) for a model. You can mock
+   failed create by passing in status of 500.
 
-    @param {String} name of the fixture ( or model ) to create
-    @param {Object} opts fixture options
-¬  */
-  buildAjaxCreateResponse: function (name, opts) {
-    var fixture = FactoryGuy.build(name, opts);
-    var model = FactoryGuy.lookupModelForFixtureName(name);
-    var hash = {};
-    hash[model] = fixture;
-    return hash;
+   @param {String} name of the fixture ( or model ) to create
+   @param {Object} opts fixture options
+   @param {Integer} status Optional HTTP status response code
+   */
+  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;
   },
 
   /**
-    Handling ajax PUT ( update record ) for a model type
+   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} id id of record to update
+   @param {String} root modelType like 'user' for User
+   @param {String} id id of record to update
+   @param {Integer} status Optional HTTP status response code
    */
-  handleUpdate: function (root, id) {
+  handleUpdate: function (root, id, status) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
+        "/" + Em.String.pluralize(root) + "/" + id,
+      {},
+      {type: 'PUT', status: (status || 200)}
     )
   },
 
   /**
-    Handling ajax DELETE ( delete record ) for a model type
+   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} id id of record to update
+   @param {String} root modelType like 'user' for User
+   @param {String} id id of record to update
+   @param {Integer} status Optional HTTP status response code
    */
-  handleDelete: function (root, id) {
+  handleDelete: function (root, id, status) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'DELETE'}
+        "/" + Em.String.pluralize(root) + "/" + id,
+      {},
+      {type: 'DELETE', status: (status || 200)}
     )
   },
 

data/src/model_definition.js

@@ -80,9 +80,9 @@ ModelDefinition = function (model, config) {
   /**
    Build a list of fixtures
 
-   @param name model name or named model type
-   @param number of fixtures to build
-   @param opts attribute options
+   @param {String} name model name or named model type
+   @param {Integer} number of fixtures to build
+   @param {Object} opts attribute options
    @returns array of fixtures
    */
   this.buildList = function (name, number, opts) {

data/src/store.js

@@ -7,6 +7,12 @@ DS.Store.reopen({
     return adapter instanceof DS.FixtureAdapter;
   },
 
+  usingActiveModelSerializer: function () {
+    var adapter = this.adapterFor('application');
+    console.log('adapter.defaultSerializer', adapter.defaultSerializer)
+    return adapter.defaultSerializer == 'active-model';
+  },
+
   /**
    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.
@@ -26,6 +32,7 @@ DS.Store.reopen({
       return FactoryGuy.pushFixture(modelType, fixture);
     } else {
       var store = this;
+
       var model;
       Em.run(function () {
         store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType, fixture);
@@ -169,6 +176,7 @@ DS.Store.reopen({
    */
   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) || [];
@@ -181,7 +189,9 @@ DS.Store.reopen({
           if (relationship.options && relationship.options.inverse) {
             belongsToName = relationship.options.inverse;
           }
-          child.set(belongsToName, model);
+          if (belongsToName) {
+            child.set(belongsToName, model);
+          }
         })
       }
 
@@ -196,6 +206,7 @@ DS.Store.reopen({
             )
             if (hasManyName) {
               belongsToRecord.get(hasManyName).addObject(model);
+              return;
             }
             var oneToOneName = self.findRelationshipName(
               'belongsTo',
@@ -247,6 +258,27 @@ DS.Store.reopen({
     return relationshipName;
   },
 
+//  /**
+//   Adding the ability to check the serializer and convert the json before
+//   it's pushed. For the ActiveModelSerializer, the attributes should be snake case,
+//   for example.
+//
+//   @method push
+//   @param {String or subclass of DS.Model} type
+//   @param {Object} data
+//   @return {DS.Model} the record that was created or updated.
+//  */
+//  push: function(type, data, _partial) {
+//    var type = this.modelFor(type);
+//    var serializer = this.serializerFor(type.typeKey);
+//    console.log('serializer',serializer, serializer+'')
+////    if (this.usingActiveModelSerializer()) {
+////      var model = this.modelFor(modelName);
+////      FactoryGuy.pushFixture(model, payload);
+////    }
+//    this._super(type, data, _partial);
+//  },
+
   /**
    Adding a pushPayload for FixtureAdapter, but using the original with
    other adapters that support pushPayload.

data/tests/active_model_adapter_factory_test.js

@@ -60,10 +60,15 @@ asyncTest("creates records in the store", function() {
 });
 
 
+test("handles camelCase attributes", function() {
+  var profile = store.makeFixture('profile', {camelCaseDescription: 'description'});
+  ok(!!profile.get('camelCaseDescription'))
+});
+
+
 test("when hasMany associations assigned, belongTo parent is assigned", function() {
   var project = store.makeFixture('project');
   var user = store.makeFixture('user', {projects: [project]})
-
   deepEqual(project.get('user').toJSON(), user.toJSON());
 });
 
@@ -210,14 +215,34 @@ test("creates records in the store", function() {
 });
 
 
-asyncTest("#store.createRecord with FactoryGuy fixtures handles snake_case or camelCase attributes", function() {
-  var json = testHelper.handleCreate('profile', {})
-  // if you examine the json .. you'll see both attributes in there
+
+module('DS.Store with ActiveModelAdapter', {
+  setup: function() {
+    testHelper = TestHelper.setup(DS.ActiveModelAdapter);
+    store = testHelper.getStore();
+  },
+  teardown: function() {
+    Em.run(function() { testHelper.teardown(); });
+  }
+});
+
+
+asyncTest("#createRecord with mockjax handles model's camelCase attributes", function() {
+  testHelper.handleCreate('profile', {camelCaseDescription: 'description'})
+
   store.createRecord('profile').save().then(function(profile) {
-    // both types of attributes work just fine
-    ok(!!profile.get('snake_case_description'))
     ok(!!profile.get('camelCaseDescription'))
     start();
-  })
-})
+  });
+});
 
+
+asyncTest("#find with mockjax handles camelCase attributes", function() {
+  var responseJson = testHelper.handleFind('profile', {camelCaseDescription: 'description'})
+  var id = responseJson.profile.id
+
+  store.find('profile', id).then(function(profile) {
+    ok(!!profile.get('camelCaseDescription'))
+    start();
+  });
+});

data/tests/support/factories/profile_factory.js

@@ -1,7 +1,5 @@
 FactoryGuy.define('profile', {
   default: {
-    description: 'Text goes here',
-    camelCaseDescription: 'boyThisIsSilly',
-    snake_case_description: 'how_do_birds_find_worms'
+    description: 'Text goes here'
   }
 })

data/tests/support/models/user.js

@@ -3,4 +3,5 @@ User = DS.Model.extend({
   company:  DS.belongsTo('company', {async: true}),
   projects: DS.hasMany('project'),
   hats:     DS.hasMany('hat', {polymorphic: true})
-});
+});
+

data/tests/support/test_helper.js

@@ -8,7 +8,6 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
   setup: function(adapter) {
     $.mockjaxSettings.logging = false;
     $.mockjaxSettings.responseTime = 0;
-
     var container = new Ember.Container();
     this.set('container', container);
 
@@ -21,7 +20,13 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuyTestMixin,{
     container.register("model:company", Company);
     container.register("model:project", Project);
     container.register("store:main", DS.Store.extend({adapter: adapter}));
-    container.register("serializer:-default", DS.RESTSerializer);
+    if (adapter == DS.ActiveModelAdapter) {
+      container.register("serializer:-default", DS.ActiveModelSerializer);
+    } else if (adapter == DS.RESTAdapter) {
+      container.register("serializer:-default", DS.RESTSerializer);
+    } else {
+      container.register("serializer:-default", DS.JSONSerializer);
+    }
     container.register('transform:string', DS.StringTransform);
 
     if (adapter instanceof DS.FixtureAdapter) {

data/tests/test_setup.js

@@ -22,9 +22,7 @@ FactoryGuy.define('soft_material', {
 })
 FactoryGuy.define('profile', {
   default: {
-    description: 'Text goes here',
-    camelCaseDescription: 'boyThisIsSilly',
-    snake_case_description: 'how_do_birds_find_worms'
+    description: 'Text goes here'
   }
 })
 FactoryGuy.define('project', {
@@ -102,6 +100,8 @@ User = DS.Model.extend({
   projects: DS.hasMany('project'),
   hats:     DS.hasMany('hat', {polymorphic: true})
 });
+
+
 /*!
  * MockJax - jQuery Plugin to Mock Ajax requests
  *

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -96,9 +96,9 @@ ModelDefinition = function (model, config) {
   /**
    Build a list of fixtures
 
-   @param name model name or named model type
-   @param number of fixtures to build
-   @param opts attribute options
+   @param {String} name model name or named model type
+   @param {Integer} number of fixtures to build
+   @param {Object} opts attribute options
    @returns array of fixtures
    */
   this.buildList = function (name, number, opts) {
@@ -381,6 +381,12 @@ DS.Store.reopen({
     return adapter instanceof DS.FixtureAdapter;
   },
 
+  usingActiveModelSerializer: function () {
+    var adapter = this.adapterFor('application');
+    console.log('adapter.defaultSerializer', adapter.defaultSerializer)
+    return adapter.defaultSerializer == 'active-model';
+  },
+
   /**
    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.
@@ -400,6 +406,7 @@ DS.Store.reopen({
       return FactoryGuy.pushFixture(modelType, fixture);
     } else {
       var store = this;
+
       var model;
       Em.run(function () {
         store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType, fixture);
@@ -543,6 +550,7 @@ DS.Store.reopen({
    */
   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) || [];
@@ -555,7 +563,9 @@ DS.Store.reopen({
           if (relationship.options && relationship.options.inverse) {
             belongsToName = relationship.options.inverse;
           }
-          child.set(belongsToName, model);
+          if (belongsToName) {
+            child.set(belongsToName, model);
+          }
         })
       }
 
@@ -570,6 +580,7 @@ DS.Store.reopen({
             )
             if (hasManyName) {
               belongsToRecord.get(hasManyName).addObject(model);
+              return;
             }
             var oneToOneName = self.findRelationshipName(
               'belongsTo',
@@ -621,6 +632,27 @@ DS.Store.reopen({
     return relationshipName;
   },
 
+//  /**
+//   Adding the ability to check the serializer and convert the json before
+//   it's pushed. For the ActiveModelSerializer, the attributes should be snake case,
+//   for example.
+//
+//   @method push
+//   @param {String or subclass of DS.Model} type
+//   @param {Object} data
+//   @return {DS.Model} the record that was created or updated.
+//  */
+//  push: function(type, data, _partial) {
+//    var type = this.modelFor(type);
+//    var serializer = this.serializerFor(type.typeKey);
+//    console.log('serializer',serializer, serializer+'')
+////    if (this.usingActiveModelSerializer()) {
+////      var model = this.modelFor(modelName);
+////      FactoryGuy.pushFixture(model, payload);
+////    }
+//    this._super(type, data, _partial);
+//  },
+
   /**
    Adding a pushPayload for FixtureAdapter, but using the original with
    other adapters that support pushPayload.
@@ -706,16 +738,27 @@ DS.FixtureAdapter.reopen({
 FactoryGuyTestMixin = Em.Mixin.create({
 
   // Pass in the app root, which typically is App.
-  setup: function(app) {
+  setup: function (app) {
     this.set('container', app.__container__);
     return this;
   },
 
-  useFixtureAdapter: function(app) {
+  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);
+    return serializer instanceof DS.ActiveModelSerializer;
+  },
+
   /**
    Proxy to store's find method
 
@@ -723,11 +766,11 @@ FactoryGuyTestMixin = Em.Mixin.create({
    @param {Object|String|Integer|null} id
    @return {Promise} promise
    */
-  find: function(type, id) {
+  find: function (type, id) {
     return this.getStore().find(type, id);
   },
 
-  make: function(name, opts) {
+  make: function (name, opts) {
     return this.getStore().makeFixture(name, opts);
   },
 
@@ -735,20 +778,20 @@ FactoryGuyTestMixin = Em.Mixin.create({
     return this.get('container').lookup('store:main');
   },
 
-  pushPayload: function(type, hash) {
+  pushPayload: function (type, hash) {
     return this.getStore().pushPayload(type, hash);
   },
 
-  pushRecord: function(type, hash) {
+  pushRecord: function (type, hash) {
     return this.getStore().push(type, hash);
   },
 
   /**
-    Using mockjax to stub an http request.
+   Using mockjax to stub an http request.
 
-    @param {String} url request url
-    @param {Object} json response
-    @param {Object} options ajax request options
+   @param {String} url request url
+   @param {Object} json response
+   @param {Object} options ajax request options
    */
   stubEndpointForHttpRequest: function (url, json, options) {
     options = options || {};
@@ -768,54 +811,107 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
   /**
-    Handling ajax POST ( create record ) for a model
+   Build the json used for creating record
 
-    @param {String} name of the fixture ( or model ) to create
-    @param {Object} opts fixture options
+   @param {String} name of the fixture ( or model ) to create
+   @param {Object} opts fixture options
    */
-  handleCreate: function (name, opts) {
-    var model = FactoryGuy.lookupModelForFixtureName(name);
-    var responseJson = this.buildAjaxCreateResponse(name, opts);
-    var url = "/" + Em.String.pluralize(model);
-    this.stubEndpointForHttpRequest(url, responseJson, {type: 'POST'})
+  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;
+  },
+
+  /**
+   Convert Object's keys to snake case
+
+   @param {Object} fixture to convert
+   */
+  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
+      }
+    }
+  },
+
+  /**
+   Handling ajax GET ( find record ) for a model. You can mock
+   failed find by passing in status of 500.
+
+   @param {String} name of the fixture ( or model ) to find
+   @param {Object} opts fixture options
+   @param {Integer} status Optional HTTP status response code
+   */
+  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;
   },
 
   /**
-    Build the json used for creating record
+   Handling ajax POST ( create record ) for a model. You can mock
+   failed create by passing in status of 500.
 
-    @param {String} name of the fixture ( or model ) to create
-    @param {Object} opts fixture options
-¬  */
-  buildAjaxCreateResponse: function (name, opts) {
-    var fixture = FactoryGuy.build(name, opts);
-    var model = FactoryGuy.lookupModelForFixtureName(name);
-    var hash = {};
-    hash[model] = fixture;
-    return hash;
+   @param {String} name of the fixture ( or model ) to create
+   @param {Object} opts fixture options
+   @param {Integer} status Optional HTTP status response code
+   */
+  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;
   },
 
   /**
-    Handling ajax PUT ( update record ) for a model type
+   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} id id of record to update
+   @param {String} root modelType like 'user' for User
+   @param {String} id id of record to update
+   @param {Integer} status Optional HTTP status response code
    */
-  handleUpdate: function (root, id) {
+  handleUpdate: function (root, id, status) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
+        "/" + Em.String.pluralize(root) + "/" + id,
+      {},
+      {type: 'PUT', status: (status || 200)}
     )
   },
 
   /**
-    Handling ajax DELETE ( delete record ) for a model type
+   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} id id of record to update
+   @param {String} root modelType like 'user' for User
+   @param {String} id id of record to update
+   @param {Integer} status Optional HTTP status response code
    */
-  handleDelete: function (root, id) {
+  handleDelete: function (root, id, status) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'DELETE'}
+        "/" + Em.String.pluralize(root) + "/" + 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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email:
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ember-data-factory-guy
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily create Fixtures for Ember Data