ember-data-factory-guy 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723e4f4e01224440a3e7cd0712f0db55a470ba1c
-  data.tar.gz: 280d62404418dfdafbf9b3c32ca5854e94522bce
+  metadata.gz: 10cce63c16d71075b39d7d4b3134fc97687dd359
+  data.tar.gz: f8273a32c925bf4c2791e946435b89d7271fa71a
 SHA512:
-  metadata.gz: 1e048aefde5b3bad5d160ea20781bfe83a9a8324df0b25990dec2d74a1a1b91e95dcd402a12bddc0c479fc20285df24d71e8783c9872889408abd2040f5e4383
-  data.tar.gz: 6a46a70429e37ff619f4427ff90c2cbdc7820bf4ea62926b797cb729cd2a2e07428738d511308e6246a632f63b463f1fc8bb78de36d7d75a07b296d3f3abfa54
+  metadata.gz: 60cb0d5dcaf087c7bc4996306c11b1775eab501cac9f1434fc77dcc9019eaf453f4a41303c802f9dea1f02f21237769b8e32191da5525c2caa5e632cbdc4e856
+  data.tar.gz: 79591c97aa1841f941cb4298524269286282b50f7510da8a154d784e4ddcf8afabc2bd8430a05d82f54886fa7a4e6f324a3377b557898f1d2f77c797ea095bee

data/bower.json

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

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

@@ -23,6 +23,7 @@ function MissingSequenceError(message) {
  */
 ModelDefinition = function (model, config) {
   var sequences = {};
+  var traits = {};
   var defaultAttributes = {};
   var namedModels = {};
   var modelId = 1;
@@ -69,12 +70,17 @@ ModelDefinition = function (model, config) {
 
    @param {String} name fixture name
    @param {Object} opts attributes to override
+   @param {String} traits array of traits
    @returns {Object} json
    */
-  this.build = function (name, opts) {
+  this.build = function (name, opts, traitArgs) {
+    var traitsObj = {}
+    traitArgs.forEach(function(trait) {
+      $.extend(traitsObj, traits[trait]);
+    })
     var modelAttributes = namedModels[name] || {};
-    // merge default, modelAttributes and opts to get the rough fixture
-    var fixture = $.extend({}, defaultAttributes, modelAttributes, opts);
+    // merge default, modelAttributes, traits and opts to get the rough fixture
+    var fixture = $.extend({}, defaultAttributes, modelAttributes, traitsObj, opts);
     // deal with attributes that are functions or objects
     for (attribute in fixture) {
       if (Ember.typeOf(fixture[attribute]) == 'function') {
@@ -98,13 +104,14 @@ ModelDefinition = function (model, config) {
 
    @param {String} name model name or named model type
    @param {Integer} number of fixtures to build
+   @param {Array} array of traits to build with
    @param {Object} opts attribute options
    @returns array of fixtures
    */
-  this.buildList = function (name, number, opts) {
+  this.buildList = function (name, number, traits, opts) {
     var arr = [];
     for (var i = 0; i < number; i++) {
-      arr.push(this.build(name, opts))
+      arr.push(this.build(name, opts, traits))
     }
     return arr;
   }
@@ -124,13 +131,25 @@ ModelDefinition = function (model, config) {
     defaultAttributes = object;
   }
 
+  var parseTraits = function (object) {
+    if (!object) {
+      return
+    }
+//    for (trait in object) {
+//      var trait = object[trait];
+//      if (Ember.typeOf(trait) == 'function') {}
+//      object[trait] = new Trait(trait);
+//    }
+    traits = object;
+  }
+
   var parseSequences = function (object) {
     if (!object) {
       return
     }
     for (sequenceName in object) {
       var sequenceFn = object[sequenceName];
-      if (typeof sequenceFn != 'function') {
+      if (Ember.typeOf(sequenceFn) != 'function') {
         throw new Error('Problem with [' + sequenceName + '] sequence definition. Sequences must be functions')
       }
       object[sequenceName] = new Sequence(sequenceFn);
@@ -142,6 +161,9 @@ ModelDefinition = function (model, config) {
     parseSequences(config.sequences);
     delete config.sequences;
 
+    parseTraits(config.traits);
+    delete config.traits;
+
     parseDefault(config.default);
     delete config.default;
 
@@ -293,18 +315,32 @@ FactoryGuy = {
    Build fixtures for model or specific fixture name. For example:
 
    FactoryGuy.build('user') for User model
-   FactoryGuy.build('bob') for User model with bob attributes
+   FactoryGuy.build('bob') for a 'bob' User
+   FactoryGuy.build('bob', 'dude') for a 'bob' User with dude traits
+   FactoryGuy.build('bob', 'dude', 'funny') for a 'bob' User with dude and funny traits
+   FactoryGuy.build('bob', 'dude', name: 'wombat') for a 'bob' User with dude trait and custom attribute name of 'wombat'
 
    @param {String} name Fixture name
+   @param {String} trait trait name ( can be more than one )
    @param {Object} opts Options that will override default fixture values
    @returns {Object} json fixture
    */
-  build: function (name, opts) {
+  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; // whatever is left are traits
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
-    return definition.build(name, opts);
+    return definition.build(name, opts, traits);
   },
 
   /**
@@ -315,15 +351,28 @@ FactoryGuy = {
 
    @param {String} name fixture name
    @param {Number} number number of fixtures to create
+   @param {String} trait (one or more)
    @param {Object} opts options that will override default fixture values
    @returns {Array} list of fixtures
    */
-  buildList: function (name, number, opts) {
+  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; // whatever is left are traits
+    console.log(name, number, traits+'', opts)
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
-    return definition.buildList(name, number, opts);
+    return definition.buildList(name, number, traits, opts);
   },
 
   /**

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);var hasManyName=self.findRelationshipName("hasMany",child.constructor,model);var inverseName=relationship.options&&relationship.options.inverse;if(belongsToName){child.set(belongsToName||inverseName,model)}else if(hasManyName){relation=child.get(hasManyName||inverseName)||[];relation.pushObject(model)}})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var setAssociations=function(){var hasManyName=self.findRelationshipName("hasMany",belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model);return}var oneToOneName=self.findRelationshipName("belongsTo",belongsToRecord.constructor,model);if(oneToOneName&&!(belongsToRecord.constructor==model.constructor)){belongsToRecord.set(oneToOneName,model)}};if(belongsToRecord.then){belongsToRecord.then(function(record){belongsToRecord=record;setAssociations()})}else{setAssociations()}}}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind==kind&&childModel instanceof relationship.type){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipNameForFixtureAdapter:function(belongToModelType,childModelType){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}});DS.FixtureAdapter.reopen({createRecord:function(store,type,record){var promise=this._super(store,type,record);promise.then(function(){Em.RSVP.Promise.resolve(Ember.get(type,"relationshipNames")).then(function(relationShips){if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then(function(relationship){relationship.addObject(record)})}})})}if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord&&belongsToRecord.get("length")>0){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);belongsToRecord.forEach(function(child){child.get(hasManyName).addObject(record)})}})})}})});return promise}});FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var type=store.modelFor(type);var serializer=store.serializerFor(type.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},buildAjaxHttpResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var modelName=FactoryGuy.lookupModelForFixtureName(name);if(this.usingActiveModelSerializer(modelName)){this.toSnakeCase(fixture)}var hash={};hash[modelName]=fixture;return hash},toSnakeCase:function(fixture){for(key in fixture){if(key!=Em.String.decamelize(key)){var value=fixture[key];delete fixture[key];fixture[Em.String.decamelize(key)]=value}}},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url="/"+Em.String.pluralize(modelName)+"/"+id;this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200});return responseJson},handleCreate:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var url="/"+Em.String.pluralize(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT",status:status||200})},handleDelete:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE",status:status||200})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});
+Sequence=function(fn){var index=1;this.next=function(){return fn.call(this,index++)};this.reset=function(){index=1}};function MissingSequenceError(message){this.toString=function(){return message}}ModelDefinition=function(model,config){var sequences={};var traits={};var defaultAttributes={};var namedModels={};var modelId=1;this.model=model;this.matchesName=function(name){return model==name||namedModels[name]};this.merge=function(config){};this.generate=function(name,sequenceFn){if(sequenceFn){if(!sequences[name]){sequences[name]=new Sequence(sequenceFn)}}var sequence=sequences[name];if(!sequence){throw new MissingSequenceError("Can not find that sequence named ["+sequenceName+"] in '"+model+"' definition")}return sequence.next()};this.build=function(name,opts,traitArgs){var traitsObj={};traitArgs.forEach(function(trait){$.extend(traitsObj,traits[trait])});var modelAttributes=namedModels[name]||{};var fixture=$.extend({},defaultAttributes,modelAttributes,traitsObj,opts);for(attribute in fixture){if(Ember.typeOf(fixture[attribute])=="function"){fixture[attribute]=fixture[attribute].call(this,fixture)}else if(Ember.typeOf(fixture[attribute])=="object"){fixture[attribute]=FactoryGuy.build(attribute,fixture[attribute])}}if(!fixture.id){fixture.id=modelId++}return fixture};this.buildList=function(name,number,traits,opts){var arr=[];for(var i=0;i<number;i++){arr.push(this.build(name,opts,traits))}return arr};this.reset=function(){modelId=1;for(name in sequences){sequences[name].reset()}};var parseDefault=function(object){if(!object){return}defaultAttributes=object};var parseTraits=function(object){if(!object){return}traits=object};var parseSequences=function(object){if(!object){return}for(sequenceName in object){var sequenceFn=object[sequenceName];if(Ember.typeOf(sequenceFn)!="function"){throw new Error("Problem with ["+sequenceName+"] sequence definition. Sequences must be functions")}object[sequenceName]=new Sequence(sequenceFn)}sequences=object};var parseConfig=function(config){parseSequences(config.sequences);delete config.sequences;parseTraits(config.traits);delete config.traits;parseDefault(config.default);delete config.default;namedModels=config};parseConfig(config)};FactoryGuy={modelDefinitions:{},define:function(model,config){if(this.modelDefinitions[model]){this.modelDefinitions[model].merge(config)}else{this.modelDefinitions[model]=new ModelDefinition(model,config)}},generate:function(nameOrFunction){var sortaRandomName=Math.floor((1+Math.random())*65536).toString(16)+Date.now();return function(){if(Em.typeOf(nameOrFunction)=="function"){return this.generate(sortaRandomName,nameOrFunction)}else{return this.generate(nameOrFunction)}}},association:function(fixtureName,opts){return function(){return FactoryGuy.build(fixtureName,opts)}},lookupModelForFixtureName:function(name){var definition=this.lookupDefinitionForFixtureName(name);if(definition){return definition.model}},lookupDefinitionForFixtureName:function(name){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];if(definition.matchesName(name)){return definition}}},build:function(){var args=Array.prototype.slice.call(arguments);var opts={};var name=args.shift();if(!name){throw new Error("Build needs a factory name to build")}if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.build(name,opts,traits)},buildList:function(){var args=Array.prototype.slice.call(arguments);var name=args.shift();var number=args.shift();if(!name||!number){throw new Error("buildList needs a name and a number ( at least ) to build with")}var opts={};if(Ember.typeOf(args[args.length-1])=="object"){opts=args.pop()}var traits=args;console.log(name,number,traits+"",opts);var definition=this.lookupDefinitionForFixtureName(name);if(!definition){throw new Error("Can't find that factory named ["+name+"]")}return definition.buildList(name,number,traits,opts)},resetModels:function(store){for(model in this.modelDefinitions){var definition=this.modelDefinitions[model];definition.reset();try{var modelType=store.modelFor(definition.model);if(store.usingFixtureAdapter()){modelType.FIXTURES=[]}store.unloadAll(modelType)}catch(e){}}},pushFixture:function(modelClass,fixture){if(!modelClass["FIXTURES"]){modelClass["FIXTURES"]=[]}modelClass["FIXTURES"].push(fixture);return fixture},clear:function(opts){if(!opts){this.modelDefinitions={}}}};DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var store=this;var modelName=FactoryGuy.lookupModelForFixtureName(name);var fixture=FactoryGuy.build(name,options);var modelType=store.modelFor(modelName);if(this.usingFixtureAdapter()){this.setAssociationsForFixtureAdapter(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var store=this;var model;Em.run(function(){store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore();modelType=store.modelFor(modelName)}model=store.push(modelName,fixture);store.setAssociationsForRESTAdapter(modelType,modelName,model)});return model}},makeList:function(name,number,options){var arr=[];for(var i=0;i<number;i++){arr.push(this.makeFixture(name,options))}return arr},setAssociationsForFixtureAdapter:function(modelType,modelName,fixture){var self=this;var adapter=this.adapterFor("application");Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){if(fixture[relationship.key]){fixture[relationship.key].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(relationship.type);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=fixture.id})}}if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(belongsToRecord){if(typeof belongsToRecord=="object"){FactoryGuy.pushFixture(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord.id}var hasManyName=self.findHasManyRelationshipNameForFixtureAdapter(relationship.type,relationship.parentType);var belongsToFixtures=adapter.fixturesForType(relationship.type);var belongsTofixture=adapter.findFixtureById(belongsToFixtures,fixture[relationship.key]);if(!belongsTofixture[hasManyName]){belongsTofixture[hasManyName]=[]}belongsTofixture[hasManyName].push(fixture.id)}}})},findEmbeddedBelongsToAssociationsForRESTAdapter:function(modelType,fixture){var store=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="belongsTo"){var belongsToRecord=fixture[relationship.key];if(Ember.typeOf(belongsToRecord)=="object"){belongsToRecord=store.push(relationship.type,belongsToRecord);fixture[relationship.key]=belongsToRecord}}})},setAssociationsForRESTAdapter:function(modelType,modelName,model){var self=this;Ember.get(modelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);var hasManyName=self.findRelationshipName("hasMany",child.constructor,model);var inverseName=relationship.options&&relationship.options.inverse;if(belongsToName){child.set(belongsToName||inverseName,model)}else if(hasManyName){relation=child.get(hasManyName||inverseName)||[];relation.pushObject(model)}})}if(relationship.kind=="belongsTo"){var belongsToRecord=model.get(name);if(belongsToRecord){var setAssociations=function(){var hasManyName=self.findRelationshipName("hasMany",belongsToRecord.constructor,model);if(hasManyName){belongsToRecord.get(hasManyName).addObject(model);return}var oneToOneName=self.findRelationshipName("belongsTo",belongsToRecord.constructor,model);if(oneToOneName&&!(belongsToRecord.constructor==model.constructor)){belongsToRecord.set(oneToOneName,model)}};if(belongsToRecord.then){belongsToRecord.then(function(record){belongsToRecord=record;setAssociations()})}else{setAssociations()}}}})},findRelationshipName:function(kind,belongToModelType,childModel){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind==kind&&childModel instanceof relationship.type){relationshipName=relationship.key}});return relationshipName},findHasManyRelationshipNameForFixtureAdapter:function(belongToModelType,childModelType){var relationshipName;Ember.get(belongToModelType,"relationshipsByName").forEach(function(name,relationship){if(relationship.kind=="hasMany"&&childModelType==relationship.type){relationshipName=relationship.key}});return relationshipName},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}});DS.FixtureAdapter.reopen({createRecord:function(store,type,record){var promise=this._super(store,type,record);promise.then(function(){Em.RSVP.Promise.resolve(Ember.get(type,"relationshipNames")).then(function(relationShips){if(relationShips.belongsTo){relationShips.belongsTo.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);Ember.RSVP.resolve(belongsToRecord.get(hasManyName)).then(function(relationship){relationship.addObject(record)})}})})}if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){Em.RSVP.Promise.resolve(record.get(relationship)).then(function(belongsToRecord){if(belongsToRecord&&belongsToRecord.get("length")>0){var hasManyName=store.findRelationshipName("hasMany",belongsToRecord.constructor,record);belongsToRecord.forEach(function(child){child.get(hasManyName).addObject(record)})}})})}})});return promise}});FactoryGuyTestMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},usingActiveModelSerializer:function(type){var store=this.getStore();var type=store.modelFor(type);var serializer=store.serializerFor(type.typeKey);return serializer instanceof DS.ActiveModelSerializer},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},buildAjaxHttpResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var modelName=FactoryGuy.lookupModelForFixtureName(name);if(this.usingActiveModelSerializer(modelName)){this.toSnakeCase(fixture)}var hash={};hash[modelName]=fixture;return hash},toSnakeCase:function(fixture){for(key in fixture){if(key!=Em.String.decamelize(key)){var value=fixture[key];delete fixture[key];fixture[Em.String.decamelize(key)]=value}}},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url="/"+Em.String.pluralize(modelName)+"/"+id;this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200});return responseJson},handleCreate:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var url="/"+Em.String.pluralize(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT",status:status||200})},handleDelete:function(root,id,status){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE",status:status||200})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});

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.2"
+  s.version     = "0.5.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Sudol", "Alex Opak"]
   s.email       = ["dansudol@yahoo.com", "opak.alexandr@gmail.com"]

data/package.json

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

data/src/factory_guy.js

@@ -140,18 +140,32 @@ FactoryGuy = {
    Build fixtures for model or specific fixture name. For example:
 
    FactoryGuy.build('user') for User model
-   FactoryGuy.build('bob') for User model with bob attributes
+   FactoryGuy.build('bob') for a 'bob' User
+   FactoryGuy.build('bob', 'dude') for a 'bob' User with dude traits
+   FactoryGuy.build('bob', 'dude', 'funny') for a 'bob' User with dude and funny traits
+   FactoryGuy.build('bob', 'dude', name: 'wombat') for a 'bob' User with dude trait and custom attribute name of 'wombat'
 
    @param {String} name Fixture name
+   @param {String} trait trait name ( can be more than one )
    @param {Object} opts Options that will override default fixture values
    @returns {Object} json fixture
    */
-  build: function (name, opts) {
+  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; // whatever is left are traits
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
-    return definition.build(name, opts);
+    return definition.build(name, opts, traits);
   },
 
   /**
@@ -162,15 +176,28 @@ FactoryGuy = {
 
    @param {String} name fixture name
    @param {Number} number number of fixtures to create
+   @param {String} trait (one or more)
    @param {Object} opts options that will override default fixture values
    @returns {Array} list of fixtures
    */
-  buildList: function (name, number, opts) {
+  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; // whatever is left are traits
+    console.log(name, number, traits+'', opts)
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
-    return definition.buildList(name, number, opts);
+    return definition.buildList(name, number, traits, opts);
   },
 
   /**

data/src/model_definition.js

@@ -7,6 +7,7 @@
  */
 ModelDefinition = function (model, config) {
   var sequences = {};
+  var traits = {};
   var defaultAttributes = {};
   var namedModels = {};
   var modelId = 1;
@@ -53,12 +54,17 @@ ModelDefinition = function (model, config) {
 
    @param {String} name fixture name
    @param {Object} opts attributes to override
+   @param {String} traits array of traits
    @returns {Object} json
    */
-  this.build = function (name, opts) {
+  this.build = function (name, opts, traitArgs) {
+    var traitsObj = {}
+    traitArgs.forEach(function(trait) {
+      $.extend(traitsObj, traits[trait]);
+    })
     var modelAttributes = namedModels[name] || {};
-    // merge default, modelAttributes and opts to get the rough fixture
-    var fixture = $.extend({}, defaultAttributes, modelAttributes, opts);
+    // merge default, modelAttributes, traits and opts to get the rough fixture
+    var fixture = $.extend({}, defaultAttributes, modelAttributes, traitsObj, opts);
     // deal with attributes that are functions or objects
     for (attribute in fixture) {
       if (Ember.typeOf(fixture[attribute]) == 'function') {
@@ -82,13 +88,14 @@ ModelDefinition = function (model, config) {
 
    @param {String} name model name or named model type
    @param {Integer} number of fixtures to build
+   @param {Array} array of traits to build with
    @param {Object} opts attribute options
    @returns array of fixtures
    */
-  this.buildList = function (name, number, opts) {
+  this.buildList = function (name, number, traits, opts) {
     var arr = [];
     for (var i = 0; i < number; i++) {
-      arr.push(this.build(name, opts))
+      arr.push(this.build(name, opts, traits));
     }
     return arr;
   }
@@ -108,13 +115,25 @@ ModelDefinition = function (model, config) {
     defaultAttributes = object;
   }
 
+  var parseTraits = function (object) {
+    if (!object) {
+      return
+    }
+//    for (trait in object) {
+//      var trait = object[trait];
+//      if (Ember.typeOf(trait) == 'function') {}
+//      object[trait] = new Trait(trait);
+//    }
+    traits = object;
+  }
+
   var parseSequences = function (object) {
     if (!object) {
       return
     }
     for (sequenceName in object) {
       var sequenceFn = object[sequenceName];
-      if (typeof sequenceFn != 'function') {
+      if (Ember.typeOf(sequenceFn) != 'function') {
         throw new Error('Problem with [' + sequenceName + '] sequence definition. Sequences must be functions')
       }
       object[sequenceName] = new Sequence(sequenceFn);
@@ -126,6 +145,9 @@ ModelDefinition = function (model, config) {
     parseSequences(config.sequences);
     delete config.sequences;
 
+    parseTraits(config.traits);
+    delete config.traits;
+
     parseDefault(config.default);
     delete config.default;
 

data/tests/factory_guy_test.js

@@ -100,6 +100,30 @@ test("Using associations in attribute definition", function() {
 });
 
 
+test("#build with traits", function() {
+  var json = FactoryGuy.build('project', 'big');
+  deepEqual(json, {id: 1, title: 'Big Project'}, 'trait with model attributes');
+
+  var json = FactoryGuy.build('project', 'with_user');
+  deepEqual(json, {id: 2, title: 'Project1', user: {id: 1, name: 'User1'}}, 'trait with belongsTo attributes');
+
+  var json = FactoryGuy.build('project', 'big', 'with_user');
+  deepEqual(json, {id: 3, title: 'Big Project', user: {id: 2, name: 'User1'}}, 'more than one trait used together');
+
+  var json = FactoryGuy.build('project', 'big', 'with_user', {title: 'Crazy Project'});
+  deepEqual(json, {id: 4, title: 'Crazy Project', user: {id: 3, name: 'User1'}}, 'more than one trait used together with custom attributes');
+
+  var json = FactoryGuy.build('project', 'big', 'with_dude');
+  deepEqual(json, {id: 5, title: 'Big Project', user: {id: 4, name: 'Dude'}}, 'trait with custom belongsTo association object');
+
+  var json = FactoryGuy.build('project', 'with_admin');
+  deepEqual(json, {id: 6, title: 'Project2', user: {id: 5, name: 'Admin'}}, 'trait with attribute using FactoryGuy.association method');
+
+  var json = FactoryGuy.build('project', 'with_title_sequence');
+  deepEqual(json, {id: 7, title: 'Project3'}, 'trait with attribute using sequence');
+});
+
+
 test("#build creates default json for model", function() {
   var json = FactoryGuy.build('user');
   deepEqual(json, {id: 1, name: 'User1'});
@@ -138,6 +162,15 @@ test("#buildList creates list of fixtures", function() {
   var userList = FactoryGuy.buildList('user', 2);
   deepEqual(userList[0], {id: 1, name: 'User1'});
   deepEqual(userList[1], {id: 2, name: 'User1'});
+
+  var userList = FactoryGuy.buildList('user', 1, {name: 'Crazy'});
+  deepEqual(userList[0], {id: 3, name: 'Crazy'},'using custom attributes');
+
+  var projectList = FactoryGuy.buildList('project', 1, 'big');
+  deepEqual(projectList[0], {id: 1, title: 'Big Project'}, 'using traits');
+
+  var projectList = FactoryGuy.buildList('project', 1, 'big', {title: 'Really Big'});
+  deepEqual(projectList[0], {id: 2, title: 'Really Big'}, 'using traits and custom attributes');
 });
 
 

data/tests/support/factories/project_factory.js

@@ -2,6 +2,13 @@ FactoryGuy.define('project', {
   sequences: {
     title: function(num) {return 'Project' + num}
   },
+  traits: {
+    big: { title: 'Big Project' },
+    with_title_sequence: { title: FactoryGuy.generate('title') },
+    with_user: { user: {} },
+    with_dude: { user: {name: 'Dude'} },
+    with_admin: { user: FactoryGuy.association('admin') }
+  },
   default: {
     title: FactoryGuy.generate('title')
   },

data/tests/test_setup.js

@@ -29,6 +29,13 @@ FactoryGuy.define('project', {
   sequences: {
     title: function(num) {return 'Project' + num}
   },
+  traits: {
+    big: { title: 'Big Project' },
+    with_title_sequence: { title: FactoryGuy.generate('title') },
+    with_user: { user: {} },
+    with_dude: { user: {name: 'Dude'} },
+    with_admin: { user: FactoryGuy.association('admin') }
+  },
   default: {
     title: FactoryGuy.generate('title')
   },

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -23,6 +23,7 @@ function MissingSequenceError(message) {
  */
 ModelDefinition = function (model, config) {
   var sequences = {};
+  var traits = {};
   var defaultAttributes = {};
   var namedModels = {};
   var modelId = 1;
@@ -69,12 +70,17 @@ ModelDefinition = function (model, config) {
 
    @param {String} name fixture name
    @param {Object} opts attributes to override
+   @param {String} traits array of traits
    @returns {Object} json
    */
-  this.build = function (name, opts) {
+  this.build = function (name, opts, traitArgs) {
+    var traitsObj = {}
+    traitArgs.forEach(function(trait) {
+      $.extend(traitsObj, traits[trait]);
+    })
     var modelAttributes = namedModels[name] || {};
-    // merge default, modelAttributes and opts to get the rough fixture
-    var fixture = $.extend({}, defaultAttributes, modelAttributes, opts);
+    // merge default, modelAttributes, traits and opts to get the rough fixture
+    var fixture = $.extend({}, defaultAttributes, modelAttributes, traitsObj, opts);
     // deal with attributes that are functions or objects
     for (attribute in fixture) {
       if (Ember.typeOf(fixture[attribute]) == 'function') {
@@ -98,13 +104,14 @@ ModelDefinition = function (model, config) {
 
    @param {String} name model name or named model type
    @param {Integer} number of fixtures to build
+   @param {Array} array of traits to build with
    @param {Object} opts attribute options
    @returns array of fixtures
    */
-  this.buildList = function (name, number, opts) {
+  this.buildList = function (name, number, traits, opts) {
     var arr = [];
     for (var i = 0; i < number; i++) {
-      arr.push(this.build(name, opts))
+      arr.push(this.build(name, opts, traits))
     }
     return arr;
   }
@@ -124,13 +131,25 @@ ModelDefinition = function (model, config) {
     defaultAttributes = object;
   }
 
+  var parseTraits = function (object) {
+    if (!object) {
+      return
+    }
+//    for (trait in object) {
+//      var trait = object[trait];
+//      if (Ember.typeOf(trait) == 'function') {}
+//      object[trait] = new Trait(trait);
+//    }
+    traits = object;
+  }
+
   var parseSequences = function (object) {
     if (!object) {
       return
     }
     for (sequenceName in object) {
       var sequenceFn = object[sequenceName];
-      if (typeof sequenceFn != 'function') {
+      if (Ember.typeOf(sequenceFn) != 'function') {
         throw new Error('Problem with [' + sequenceName + '] sequence definition. Sequences must be functions')
       }
       object[sequenceName] = new Sequence(sequenceFn);
@@ -142,6 +161,9 @@ ModelDefinition = function (model, config) {
     parseSequences(config.sequences);
     delete config.sequences;
 
+    parseTraits(config.traits);
+    delete config.traits;
+
     parseDefault(config.default);
     delete config.default;
 
@@ -293,18 +315,32 @@ FactoryGuy = {
    Build fixtures for model or specific fixture name. For example:
 
    FactoryGuy.build('user') for User model
-   FactoryGuy.build('bob') for User model with bob attributes
+   FactoryGuy.build('bob') for a 'bob' User
+   FactoryGuy.build('bob', 'dude') for a 'bob' User with dude traits
+   FactoryGuy.build('bob', 'dude', 'funny') for a 'bob' User with dude and funny traits
+   FactoryGuy.build('bob', 'dude', name: 'wombat') for a 'bob' User with dude trait and custom attribute name of 'wombat'
 
    @param {String} name Fixture name
+   @param {String} trait trait name ( can be more than one )
    @param {Object} opts Options that will override default fixture values
    @returns {Object} json fixture
    */
-  build: function (name, opts) {
+  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; // whatever is left are traits
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
-    return definition.build(name, opts);
+    return definition.build(name, opts, traits);
   },
 
   /**
@@ -315,15 +351,28 @@ FactoryGuy = {
 
    @param {String} name fixture name
    @param {Number} number number of fixtures to create
+   @param {String} trait (one or more)
    @param {Object} opts options that will override default fixture values
    @returns {Array} list of fixtures
    */
-  buildList: function (name, number, opts) {
+  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; // whatever is left are traits
+    console.log(name, number, traits+'', opts)
     var definition = this.lookupDefinitionForFixtureName(name);
     if (!definition) {
       throw new Error("Can't find that factory named [" + name + "]");
     }
-    return definition.buildList(name, number, opts);
+    return definition.buildList(name, number, traits, opts);
   },
 
   /**

metadata

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