ember-data-factory-guy 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab48ef500bc4ced2fb01857cca66db95f4c7aea
-  data.tar.gz: e574512d0b9706f27a6760454be6467e70c839cf
+  metadata.gz: 21e578c47d29e02b51bc42c7f6866184e7f956ed
+  data.tar.gz: 293d74863f20e2a2be14f44c789cc1401d67c070
 SHA512:
-  metadata.gz: 365a9179282b767ab47d1f7811032f55e3cb90502424e57d26c97ad43122fe3263f6e88e4b764e7a6a230e952e9abb30de54a0f3aca37d60c43c0c501f120973
-  data.tar.gz: ab8e3f43429610940df8f8c43083010360264f8f9d322795d7de11d078a0bbb919f195178396206acaa2d8bd4a3a4c8896ee937461dbaebd856386dc10e07555
+  metadata.gz: fba41b592a7a4976cd007bb17e732d072e5fe36c2ce52fd31f4121106b1e9a0eabb6713928b0ab92659911fd73074c2ba6b3db9a87643908be4502c85f2d1326
+  data.tar.gz: c9180e3a8d4995b930c2bf2b66cc0310b2b7fdd2184f020b589c3d4a1e7fd24105a5bddefa8eb6080a64d2ecd5c62c0c9b288bc7825dbd0e6406f0f5ff47dd6e

data/README.md

@@ -9,12 +9,12 @@ of ember-data-factory-guy.
 - Versions:
   - 0.6.4   -> ember-data-1.0.0-beta.8 and under
   - 0.7.1.1 -> ember-data-1.0.0-beta.10
-  - 0.7.9   -> ember-data-1.0.0-beta.11
-  - 0.7.9   -> ember-data-1.0.0-beta.12
+  - 0.8.1   -> ember-data-1.0.0-beta.11
+  - 0.8.1   -> ember-data-1.0.0-beta.12
 
-**For versions ( 0.7.1 -> 0.7.9 ), support for the fixture adapter is currently broken.**  
+**For versions ( 0.7.1 -> 0.8.1 ), support for the fixture adapter is currently broken.**  
 
-*Version 0.7.9 has many bug fixes and improvements that the earlier versions don't have, so 
+*Version 0.8.1 has many bug fixes and improvements that the earlier versions don't have, so 
 hopefully you can switch to newer version of ember-data and therefore the best 
 ember-data-factory-guy version, but if not, send me bug report and I will try and go back 
 and fix the older version you are using.*  
@@ -34,7 +34,7 @@ gem 'ember-data-factory-guy', group: test
 or for particular version:
 
 ```ruby
-gem 'ember-data-factory-guy', '0.7.9', group: test
+gem 'ember-data-factory-guy', '0.8.1', group: test
 ```
 
 then:
@@ -69,7 +69,7 @@ or for particular version:
   "dependencies": {
     "foo-dependency": "latest",
     "other-foo-dependency": "latest",
-    "ember-data-factory-guy": "0.7.9"
+    "ember-data-factory-guy": "0.8.1"
   }
 ```
 
@@ -700,7 +700,7 @@ to a particular user. To mock this createRecord call do this:
 ````
 
 
-##### View test sample
+##### Integration test sample
 
 ```javascript
 

data/bower.json

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

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

@@ -793,26 +793,61 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax POST ( create record ) for a model. You can mock
    failed create by passing in success argument as false.
 
+   ```js
+     handleCreate('post')
+     handleCreate('post', { match: {title: 'foo'} )
+     handleCreate('post', { match: {title: 'foo', user: user} )
+     handleCreate('post', { returns: {createdAt: new Date()} )
+     handleCreate('post', { match: {title: 'foo'}, returns: {createdAt: new Date()} )
+     handleCreate('post', { match: {title: 'foo'}, success: false} } )
+   ```
+
+    match - attributes that must be in request json,
+    returns - attributes to include in response json,
+    succeed - flag to indicate if the request should succeed ( default is true )
+
+    Note that any attributes in match will be added to the response json automatically,
+    so you don't need to include them in the returns hash as well.
+
+    Also, if you match on a belongsTo association, you don't have to include that in the
+    returns hash.
+
    @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 )
+   @param {Object} options  hash of options for handling request
    */
-  handleCreate: function (modelName, options, succeed) {
-    succeed = succeed === undefined ? true : succeed;
+  handleCreate: function (modelName, options) {
     options = options === undefined ? {} : options;
+    var succeed = options.succeed === undefined ? true : options.succeed;
+    var match = options.match || {};
+    var returnArgs = options.returns || {};
+
     var url = this.buildURL(modelName);
     var definition = FactoryGuy.modelDefinitions[modelName];
+
+    var record = this.getStore().createRecord(modelName, match);
+    var expectedRequest = {};
+    expectedRequest[modelName] = record.serialize();
+
+    var httpOptions = {type: 'POST', data: JSON.stringify(expectedRequest)};
+
+    var modelType = this.getStore().modelFor(modelName)
+
     var responseJson = {};
-    var httpOptions = { type: 'POST' };
     if (succeed) {
-      responseJson[modelName] = $.extend(options,{id: definition.nextId()});
+      responseJson[modelName] = $.extend({id: definition.nextId()}, match, returnArgs);
+      // Remove belongsTo associations since they will already be set when you called
+      // createRecord, and included them in those attributes
+      Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
+        if (relationship.kind == 'belongsTo') {
+          delete responseJson[modelName][relationship.key];
+        }
+      })
     } else {
       httpOptions.status = 500;
     }
+
     this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
   },
-
   /**
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in success argument as false.
@@ -851,6 +886,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   }
 });
 
+
   FactoryGuy.testMixin = FactoryGuyTestMixin;
   FactoryGuy.sequence = Sequence;
   FactoryGuy.sequence.missingSequenceError = MissingSequenceError;

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

@@ -1 +1 @@
-(function(){var Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};var MissingSequenceError=function(message){this.toString=function(){return message}};var ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;var sequenceName=null;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.nextId=function(){return modelId++};this.generate=function(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,opts);for(var 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=this.nextId()}return fixture};this.buildList=function(name,number,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(var name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.typeOf(sequenceFn)!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseTraits(config.traits);delete config.traits;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};var FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},generate:function(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){console.log("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(var model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},resetModels:function(store){for(var 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){console.log("resetModels",e)}}},pushFixture:function(modelClass,fixture){if(!modelClass.FIXTURES){modelClass.FIXTURES=[]}modelClass.FIXTURES.push(fixture);return fixture},clear:function(opts){if(!opts){this.modelDefinitions={}}}};(function(){DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(){var store=this;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)}},makeModel:function(modelType,fixture){var store=this,modelName=store.modelFor(modelType).typeKey,model;Em.run(function(){store.findEmbeddedAssociationsForRESTAdapter(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(){var arr=[];var number=arguments[1];for(var i=0;i<number;i++){arr.push(this.makeFixture.apply(this,arguments))}return arr},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){id=object.id;hasManyRelation[index]=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)}}})},findEmbeddedAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,belongsToRecord);belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"){if(Ember.typeOf(hasManyRecords[0])=="object"){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}}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){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}});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}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}})})();var 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 modelType=store.modelFor(type);var serializer=store.serializerFor(modelType.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(){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)},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)},buildURL:function(typeName,id){var type=this.getStore().modelFor(typeName);return this.getStore().adapterFor(type).buildURL(type.typeKey,id)},handleFindMany:function(){var store=this.getStore();store.makeList.apply(store,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};responseJson[modelName]=[];var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET"})},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"};if(succeed){responseJson[modelName]=$.extend(options,{id:definition.nextId()})}else{httpOptions.status=500}this.stubEndpointForHttpRequest(url,responseJson,httpOptions)},handleUpdate:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:succeed?200:500})},handleDelete:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:succeed?200:500})},teardown:function(){FactoryGuy.resetModels(this.getStore());$.mockjax.clear()}});FactoryGuy.testMixin=FactoryGuyTestMixin;FactoryGuy.sequence=Sequence;FactoryGuy.sequence.missingSequenceError=MissingSequenceError;if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports){exports=module.exports=FactoryGuy}exports.FactoryGuy=FactoryGuy}if(typeof define==="function"&&define.amd){define("factory-guy",[],function(){return FactoryGuy})}if(typeof window==="object"&&typeof window.document==="object"){window.FactoryGuy=FactoryGuy}})();
+(function(){var Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};var MissingSequenceError=function(message){this.toString=function(){return message}};var ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;var sequenceName=null;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.nextId=function(){return modelId++};this.generate=function(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,opts);for(var 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=this.nextId()}return fixture};this.buildList=function(name,number,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(var name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.typeOf(sequenceFn)!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseTraits(config.traits);delete config.traits;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};var FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},generate:function(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},belongsTo:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},association:function(fixtureName,opts){console.log("DEPRECATION Warning: use FactoryGuy.belongsTo instead");return this.belongsTo(fixtureName,opts)},hasMany:function(fixtureName,number,opts){return function(){return FactoryGuy.buildList(fixtureName,number,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(var model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},resetModels:function(store){for(var 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){console.log("resetModels",e)}}},pushFixture:function(modelClass,fixture){if(!modelClass.FIXTURES){modelClass.FIXTURES=[]}modelClass.FIXTURES.push(fixture);return fixture},clear:function(opts){if(!opts){this.modelDefinitions={}}}};(function(){DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(){var store=this;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)}},makeModel:function(modelType,fixture){var store=this,modelName=store.modelFor(modelType).typeKey,model;Em.run(function(){store.findEmbeddedAssociationsForRESTAdapter(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(){var arr=[];var number=arguments[1];for(var i=0;i<number;i++){arr.push(this.makeFixture.apply(this,arguments))}return arr},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var hasManyRelation=fixture[relationship.key];if(hasManyRelation){$.each(fixture[relationship.key],function(index,object){var id=object;if(Ember.typeOf(object)=="object"){id=object.id;hasManyRelation[index]=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)}}})},findEmbeddedAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){store.findEmbeddedAssociationsForRESTAdapter(relationship.type,belongsToRecord);belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"){if(Ember.typeOf(hasManyRecords[0])=="object"){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}}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(relationship,name){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){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}});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}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}})})();var 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 modelType=store.modelFor(type);var serializer=store.serializerFor(modelType.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(){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)},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)},buildURL:function(typeName,id){var type=this.getStore().modelFor(typeName);return this.getStore().adapterFor(type).buildURL(type.typeKey,id)},handleFindMany:function(){var store=this.getStore();store.makeList.apply(store,arguments);var name=arguments[0];var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson={};responseJson[modelName]=[];var url=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET"})},handleCreate:function(modelName,options){options=options===undefined?{}:options;var succeed=options.succeed===undefined?true:options.succeed;var match=options.match||{};var returnArgs=options.returns||{};var url=this.buildURL(modelName);var definition=FactoryGuy.modelDefinitions[modelName];var record=this.getStore().createRecord(modelName,match);var expectedRequest={};expectedRequest[modelName]=record.serialize();var httpOptions={type:"POST",data:JSON.stringify(expectedRequest)};var modelType=this.getStore().modelFor(modelName);var responseJson={};if(succeed){responseJson[modelName]=$.extend({id:definition.nextId()},match,returnArgs);Ember.get(modelType,"relationshipsByName").forEach(function(relationship){if(relationship.kind=="belongsTo"){delete responseJson[modelName][relationship.key]}})}else{httpOptions.status=500}this.stubEndpointForHttpRequest(url,responseJson,httpOptions)},handleUpdate:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:succeed?200:500})},handleDelete:function(type,id,succeed){succeed=succeed===undefined?true:succeed;this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:succeed?200:500})},teardown:function(){FactoryGuy.resetModels(this.getStore());$.mockjax.clear()}});FactoryGuy.testMixin=FactoryGuyTestMixin;FactoryGuy.sequence=Sequence;FactoryGuy.sequence.missingSequenceError=MissingSequenceError;if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports){exports=module.exports=FactoryGuy}exports.FactoryGuy=FactoryGuy}if(typeof define==="function"&&define.amd){define("factory-guy",[],function(){return FactoryGuy})}if(typeof window==="object"&&typeof window.document==="object"){window.FactoryGuy=FactoryGuy}})();

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

data/src/factory_guy_test_mixin.js

@@ -103,26 +103,61 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax POST ( create record ) for a model. You can mock
    failed create by passing in success argument as false.
 
+   ```js
+     handleCreate('post')
+     handleCreate('post', { match: {title: 'foo'} )
+     handleCreate('post', { match: {title: 'foo', user: user} )
+     handleCreate('post', { returns: {createdAt: new Date()} )
+     handleCreate('post', { match: {title: 'foo'}, returns: {createdAt: new Date()} )
+     handleCreate('post', { match: {title: 'foo'}, success: false} } )
+   ```
+
+    match - attributes that must be in request json,
+    returns - attributes to include in response json,
+    succeed - flag to indicate if the request should succeed ( default is true )
+
+    Note that any attributes in match will be added to the response json automatically,
+    so you don't need to include them in the returns hash as well.
+
+    Also, if you match on a belongsTo association, you don't have to include that in the
+    returns hash.
+
    @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 )
+   @param {Object} options  hash of options for handling request
    */
-  handleCreate: function (modelName, options, succeed) {
-    succeed = succeed === undefined ? true : succeed;
+  handleCreate: function (modelName, options) {
     options = options === undefined ? {} : options;
+    var succeed = options.succeed === undefined ? true : options.succeed;
+    var match = options.match || {};
+    var returnArgs = options.returns || {};
+
     var url = this.buildURL(modelName);
     var definition = FactoryGuy.modelDefinitions[modelName];
+
+    var record = this.getStore().createRecord(modelName, match);
+    var expectedRequest = {};
+    expectedRequest[modelName] = record.serialize();
+
+    var httpOptions = {type: 'POST', data: JSON.stringify(expectedRequest)};
+
+    var modelType = this.getStore().modelFor(modelName)
+
     var responseJson = {};
-    var httpOptions = { type: 'POST' };
     if (succeed) {
-      responseJson[modelName] = $.extend(options,{id: definition.nextId()});
+      responseJson[modelName] = $.extend({id: definition.nextId()}, match, returnArgs);
+      // Remove belongsTo associations since they will already be set when you called
+      // createRecord, and included them in those attributes
+      Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
+        if (relationship.kind == 'belongsTo') {
+          delete responseJson[modelName][relationship.key];
+        }
+      })
     } else {
       httpOptions.status = 500;
     }
+
     this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
   },
-
   /**
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in success argument as false.
@@ -160,3 +195,4 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     $.mockjax.clear();
   }
 });
+

data/tests/active_model_adapter_factory_test.js

@@ -65,12 +65,12 @@ test("makeFixture with fixture options", function() {
   ok(profile.get('description') == 'dude');
 });
 
-test("makeFixture with traits", function() {
+test("makeFixture with attributes in traits", function() {
   var profile = store.makeFixture('profile', 'goofy_description');
   ok(profile.get('description') == 'goofy');
 });
 
-test("makeFixture with traits and fixture options ", function() {
+test("makeFixture with attributes in traits and fixture options ", function() {
   var profile = store.makeFixture('profile', 'goofy_description', {description: 'dude'});
   ok(profile.get('description') == 'dude');
 });
@@ -247,6 +247,17 @@ test("hasMany associations defined with traits", function() {
 })
 
 
+
+test("belongsTo associations defined with traits", function() {
+  var hat1 = store.makeFixture('hat', 'with_user');
+  equal(hat1.get('user') instanceof User, true)
+
+  var hat2 = store.makeFixture('hat', 'with_user', 'with_outfit');
+  equal(hat2.get('user') instanceof User, true)
+  equal(hat2.get('outfit') instanceof Outfit, true)
+})
+
+
 test("with (nested json fixture) belongsTo has a hasMany association which has a belongsTo", function() {
   var project = store.makeFixture('project', 'with_user_having_hats_belonging_to_outfit');
   var user = project.get('user');

data/tests/factory_guy_test_mixin_test.js

@@ -38,9 +38,14 @@ module('FactoryGuyTestMixin (using mockjax) with DS.RESTAdapter', {
 
 asyncTest("#handleCreate the basic", function() {
   var customDescription = "special description"
-  testHelper.handleCreate('profile', {description: customDescription})
 
-  store.createRecord('profile').save().then(function(profile) {
+  testHelper.handleCreate('profile', {
+    match: {description: customDescription}
+  })
+
+  store.createRecord('profile', {
+    description: customDescription
+  }).save().then(function(profile) {
     ok(profile instanceof Profile)
     ok(profile.get('description') == customDescription)
     start();
@@ -106,11 +111,16 @@ module('FactoryGuyTestMixin (using mockjax) with DS.ActiveModelAdapter', {
 
 /////// handleCreate //////////
 
-asyncTest("#handleCreate the basic", function() {
+asyncTest("#handleCreate matches attributes and returns these", function() {
   var customDescription = "special description"
-  testHelper.handleCreate('profile', {description: customDescription})
 
-  store.createRecord('profile', {description: customDescription}).save().then(function(profile) {
+  testHelper.handleCreate('profile', {
+    match: {description: customDescription}
+  })
+
+  store.createRecord('profile', {
+    description: customDescription
+  }).save().then(function(profile) {
     ok(profile instanceof Profile)
     ok(profile.id == 1)
     ok(profile.get('description') == customDescription)
@@ -118,42 +128,81 @@ asyncTest("#handleCreate the basic", function() {
   });
 });
 
-asyncTest("#handleCreate with belongsTo association", function() {
+
+asyncTest("#handleCreate returns attributes", function() {
+  var date = new Date()
+
+  testHelper.handleCreate('profile', {
+    returns: {created_at: date}
+  })
+
+  store.createRecord('profile').save().then(function(profile) {
+    ok(profile.get('created_at') == date.toString())
+    start();
+  });
+});
+
+asyncTest("#handleCreate returns camelCase attributes", function() {
+  var customDescription = "special description"
+
+  testHelper.handleCreate('profile', {
+    returns: {camel_case_description: customDescription}
+  })
+
+  store.createRecord('profile', {
+    camel_case_description: 'description'
+  }).save().then(function(profile) {
+    ok(profile.get('camelCaseDescription') == customDescription)
+    start();
+  });
+});
+
+asyncTest("#handleCreate match belongsTo association", function() {
   var company = store.makeFixture('company')
-  testHelper.handleCreate('profile')
+  testHelper.handleCreate('profile', {match:{ company: company}})
 
   store.createRecord('profile', {company: company}).save().then(function(profile) {
-    ok(profile instanceof Profile)
-    ok(profile.id == 1)
     ok(profile.get('company') == company)
     start();
   });
 });
 
-asyncTest("#handleCreate with belongsTo polymorphic association", function() {
+asyncTest("#handleCreate match belongsTo polymorphic association", function() {
   var group = store.makeFixture('group')
-  testHelper.handleCreate('profile')
+  testHelper.handleCreate('profile', {match:{ group: group}})
 
   store.createRecord('profile', {group: group}).save().then(function(profile) {
-    ok(profile instanceof Profile)
-    ok(profile.id == 1)
     ok(profile.get('group') == group)
     start();
   });
 });
 
-asyncTest("#handleCreate with model that has camelCase attribute", function() {
+
+asyncTest("#handleCreate match attributes and return attributes", function() {
+  var date = new Date()
   var customDescription = "special description"
-  testHelper.handleCreate('profile', {camelCaseDescription: customDescription})
+  var company = store.makeFixture('company')
+  var group = store.makeFixture('big_group')
 
-  store.createRecord('profile', {camelCaseDescription: 'description'}).save().then(function(profile) {
-    ok(profile.get('camelCaseDescription') == customDescription)
+  testHelper.handleCreate('profile', {
+    match: {description: customDescription, company: company, group: group},
+    returns: {created_at: new Date()}
+  })
+
+  store.createRecord('profile', {
+    description: customDescription, company: company, group: group
+  }).save().then(function(profile) {
     start();
+    ok(profile.get('created_at') == date.toString())
+    ok(profile.get('group') == group)
+    ok(profile.get('company') == company)
+    ok(profile.get('description') == customDescription)
   });
 });
 
+
 asyncTest("#handleCreate failure", function() {
-  testHelper.handleCreate('profile', {}, false)
+  testHelper.handleCreate('profile', { succeed: false } )
 
   store.createRecord('profile').save()
     .then(
@@ -166,6 +215,24 @@ asyncTest("#handleCreate failure", function() {
 });
 
 
+asyncTest("#handleCreate match but still fail", function() {
+  var description = "special description"
+
+  testHelper.handleCreate('profile', {
+    match: {description: description}, succeed: false
+  })
+
+  store.createRecord('profile', {description: description}).save()
+    .then(
+      function() {},
+      function() {
+        ok(true)
+        start();
+      }
+    )
+});
+
+
 
 /////// handleFindMany //////////
 

data/tests/rest_adapter_factory_test.js

@@ -241,6 +241,15 @@ test("hasMany associations defined with traits", function() {
   ok(user.get('projects.lastObject.user') == user)
 })
 
+test("belongsTo associations defined with traits", function() {
+  var hat1 = store.makeFixture('hat', 'with_user');
+  equal(hat1.get('user') instanceof User, true)
+
+  var hat2 = store.makeFixture('hat', 'with_user', 'with_outfit');
+  equal(hat2.get('user') instanceof User, true)
+  equal(hat2.get('outfit') instanceof Outfit, true)
+})
+
 
 test("with (nested json fixture) belongsTo has a hasMany association which has a belongsTo", function() {
   var project = store.makeFixture('project', 'with_user_having_hats_belonging_to_outfit');

data/tests/support/factories/hat_factory.js

@@ -7,11 +7,9 @@ FactoryGuy.define('hat', {
     type: 'BigHat'
   },
   traits: {
-    belonging_to_user: {
-      user: FactoryGuy.belongsTo('user')
-    },
-    belonging_to_outfit: {
-      outfit: FactoryGuy.belongsTo('outfit')
-    }
+    with_user: { user: {} },
+    belonging_to_user: { user: {} },
+    with_outfit: { outfit: {} },
+    belonging_to_outfit: { outfit: {} }
   }
 })

data/tests/support/models/profile.js

@@ -1,4 +1,5 @@
 Profile = DS.Model.extend({
+  created_at:                   DS.attr('date'),
   description:            DS.attr('string'),
   camelCaseDescription:   DS.attr('string'),
   snake_case_description: DS.attr('string'),

data/tests/support/test_helper.js

@@ -68,6 +68,7 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuy.testMixin,{
 
     container.register('serializer:-default', serializer);
     container.register('transform:string', DS.StringTransform);
+    container.register('transform:date', DS.DateTransform);
     container.injection('serializer', 'store', 'store:main');
 
     env.store = container.lookup('store:main');

data/tests/test_setup.js

@@ -54,12 +54,10 @@ FactoryGuy.define('hat', {
     type: 'BigHat'
   },
   traits: {
-    belonging_to_user: {
-      user: FactoryGuy.belongsTo('user')
-    },
-    belonging_to_outfit: {
-      outfit: FactoryGuy.belongsTo('outfit')
-    }
+    with_user: { user: {} },
+    belonging_to_user: { user: {} },
+    with_outfit: { outfit: {} },
+    belonging_to_outfit: { outfit: {} }
   }
 })
 FactoryGuy.define('soft_material', {
@@ -242,6 +240,7 @@ Person = DS.Model.extend({
 })
 
 Profile = DS.Model.extend({
+  created_at:                   DS.attr('date'),
   description:            DS.attr('string'),
   camelCaseDescription:   DS.attr('string'),
   snake_case_description: DS.attr('string'),

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -791,26 +791,61 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    Handling ajax POST ( create record ) for a model. You can mock
    failed create by passing in success argument as false.
 
+   ```js
+     handleCreate('post')
+     handleCreate('post', { match: {title: 'foo'} )
+     handleCreate('post', { match: {title: 'foo', user: user} )
+     handleCreate('post', { returns: {createdAt: new Date()} )
+     handleCreate('post', { match: {title: 'foo'}, returns: {createdAt: new Date()} )
+     handleCreate('post', { match: {title: 'foo'}, success: false} } )
+   ```
+
+    match - attributes that must be in request json,
+    returns - attributes to include in response json,
+    succeed - flag to indicate if the request should succeed ( default is true )
+
+    Note that any attributes in match will be added to the response json automatically,
+    so you don't need to include them in the returns hash as well.
+
+    Also, if you match on a belongsTo association, you don't have to include that in the
+    returns hash.
+
    @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 )
+   @param {Object} options  hash of options for handling request
    */
-  handleCreate: function (modelName, options, succeed) {
-    succeed = succeed === undefined ? true : succeed;
+  handleCreate: function (modelName, options) {
     options = options === undefined ? {} : options;
+    var succeed = options.succeed === undefined ? true : options.succeed;
+    var match = options.match || {};
+    var returnArgs = options.returns || {};
+
     var url = this.buildURL(modelName);
     var definition = FactoryGuy.modelDefinitions[modelName];
+
+    var record = this.getStore().createRecord(modelName, match);
+    var expectedRequest = {};
+    expectedRequest[modelName] = record.serialize();
+
+    var httpOptions = {type: 'POST', data: JSON.stringify(expectedRequest)};
+
+    var modelType = this.getStore().modelFor(modelName)
+
     var responseJson = {};
-    var httpOptions = { type: 'POST' };
     if (succeed) {
-      responseJson[modelName] = $.extend(options,{id: definition.nextId()});
+      responseJson[modelName] = $.extend({id: definition.nextId()}, match, returnArgs);
+      // Remove belongsTo associations since they will already be set when you called
+      // createRecord, and included them in those attributes
+      Ember.get(modelType, 'relationshipsByName').forEach(function (relationship) {
+        if (relationship.kind == 'belongsTo') {
+          delete responseJson[modelName][relationship.key];
+        }
+      })
     } else {
       httpOptions.status = 500;
     }
+
     this.stubEndpointForHttpRequest(url, responseJson, httpOptions);
   },
-
   /**
    Handling ajax PUT ( update record ) for a model type. You can mock
    failed update by passing in success argument as false.
@@ -849,6 +884,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   }
 });
 
+
 /*!
  * MockJax - jQuery Plugin to Mock Ajax requests
  *
@@ -964,9 +1000,11 @@ var FactoryGuyTestMixin = Em.Mixin.create({
 				return null;
 			}
 		}
-
 		// Inspect the data submitted in the request (either POST body or GET query string)
 		if ( handler.data ) {
+//      console.log('request.data', requestSettings.data )
+//      console.log('handler.data', handler.data )
+//      console.log('data equal', isMockDataEqual(handler.data, requestSettings.data) )
 			if ( ! requestSettings.data || !isMockDataEqual(handler.data, requestSettings.data) ) {
 				// They're not identical, do not mock this request
 				return null;
@@ -978,7 +1016,6 @@ var FactoryGuyTestMixin = Em.Mixin.create({
 			// The request type doesn't match (GET vs. POST)
 			return null;
 		}
-
 		return handler;
 	}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email: