ember-data-factory-guy 0.1 → 0.1.1

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

@@ -30,7 +30,7 @@ FactoryGuy = Ember.Object.reopenClass({
       FactoryGuy.build('user') or FactoryGuy.build('bob')
 
     @param model the model to define
-    @param config your default and specific fixtures
+    @param config your default and named fixtures
    */
   define: function (model, config) {
     var info = this.getModelInfo(model);
@@ -100,7 +100,9 @@ FactoryGuy = Ember.Object.reopenClass({
     var modelAttributes = modelInfo[name] || {};
     var defaultModelAttributes = modelInfo.default;
     var fixture = $.extend({}, defaultModelAttributes, modelAttributes, opts);
-    fixture.id = this.generateId(model);
+    if(!fixture.id){
+      fixture.id = this.generateId(model);
+    }
     return fixture;
   },
 
@@ -118,10 +120,7 @@ FactoryGuy = Ember.Object.reopenClass({
       }
     } else {
       for (model in typeMaps) {
-        if (typeMaps[model].type.typeKey != 'user') {
-//          console.log(typeMaps[model].type.typeKey)
-          store.unloadAll(typeMaps[model].type);
-        }
+        store.unloadAll(typeMaps[model].type);
       }
     }
     this.modelIds = {}
@@ -142,6 +141,7 @@ FactoryGuy = Ember.Object.reopenClass({
     return fixture;
   }
 })
+
 DS.Store.reopen({
 
   usingFixtureAdapter: function() {
@@ -266,10 +266,10 @@ DS.FixtureAdapter.reopen({
   createRecord: function(store, type, record) {
     var promise = this._super(store, type, record);
 
-    promise.then( function() {
-      var hasManyName = Ember.String.pluralize(type.typeKey);
-      var relationShips = Ember.get(type, 'relationshipNames');
-      if (relationShips.belongsTo) {
+//    promise.then( function() {
+//      var hasManyName = Ember.String.pluralize(type.typeKey);
+//      var relationShips = Ember.get(type, 'relationshipNames');
+//      if (relationShips.belongsTo) {
 //        console.log('record',record+'', type.typeKey, hasManyName);
 //        relationShips.belongsTo.forEach(function (relationship) {
 //          console.log(relationship, record.get(relationship)+'')
@@ -277,8 +277,8 @@ DS.FixtureAdapter.reopen({
 //          console.log(relationshipForType)
 //          belongsToRecord.get(hasManyName).addObject(record);
 //        })
-      }
-    })
+//      }
+//    })
     return promise;
   }
 
@@ -359,7 +359,7 @@ FactoryGuyHelperMixin = Em.Mixin.create({
 
   handleUpdate: function (root, id) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, '{}', {type: 'PUT'}
+      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
     )
   },
 

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

@@ -1 +1 @@
-FactoryGuy=Ember.Object.reopenClass({fixtureStore:{},fixtureLookup:{},modelIds:{},define:function(model,config){var info=this.getModelInfo(model);for(key in config){var value=config[key];info[key]=value;if(key!="default"){this.fixtureLookup[key]=model}}this.modelIds[model]=0},getModelInfo:function(model){if(!this.fixtureStore[model]){this.fixtureStore[model]={}}return this.fixtureStore[model]},lookupModelForName:function(name){var model=this.fixtureLookup[name];if(!model){if(this.fixtureStore[name]){model=name}}return model},generateId:function(model){var lastId=this.modelIds[model]||0;this.modelIds[model]=lastId+1;return this.modelIds[model]},build:function(name,opts){var model=this.lookupModelForName(name);if(!model){throw new Error("can't find that factory named ["+name+"]")}var modelInfo=this.fixtureStore[model];var modelAttributes=modelInfo[name]||{};var defaultModelAttributes=modelInfo.default;var fixture=$.extend({},defaultModelAttributes,modelAttributes,opts);fixture.id=this.generateId(model);return fixture},resetModels:function(store){var typeMaps=store.typeMaps;if(store.usingFixtureAdapter()){for(typeKey in this.fixtureStore){var modelType=store.modelFor(typeKey);modelType.FIXTURES=[];store.unloadAll(modelType)}}else{for(model in typeMaps){if(typeMaps[model].type.typeKey!="user"){store.unloadAll(typeMaps[model].type)}}}this.modelIds={}},pushFixture:function(modelClass,fixture){if(!modelClass["FIXTURES"]){modelClass["FIXTURES"]=[]}modelClass["FIXTURES"].push(fixture);return fixture}});DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var modelName=FactoryGuy.lookupModelForName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.modelFor(modelName);if(this.usingFixtureAdapter()){this.setBelongsToFixturesAssociation(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var self=this;var model;Em.run(function(){model=self.push(modelName,fixture);self.setBelongsToRestAssociation(modelType,modelName,model)});return model}},setBelongsToFixturesAssociation:function(modelType,modelName,parentFixture){var store=this;var adapter=this.adapterFor("application");var relationShips=Ember.get(modelType,"relationshipNames");if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){var hasManyModel=store.modelFor(Em.String.singularize(relationship));if(parentFixture[relationship]){parentFixture[relationship].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(hasManyModel);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=parentFixture.id})}})}},setBelongsToRestAssociation:function(modelType,modelName,parent){var relationShips=Ember.get(modelType,"relationshipNames");if(relationShips.hasMany){relationShips.hasMany.forEach(function(name){var children=parent.get(name);if(children.get("length")>0){children.forEach(function(child){child.set(modelName,parent)})}})}},pushPayload:function(type,payload){if(this.usingFixtureAdapter()){var model=this.modelFor(modelName);FactoryGuy.pushFixture(model,payload)}else{this._super(type,payload)}}});DS.FixtureAdapter.reopen({createRecord:function(store,type,record){var promise=this._super(store,type,record);promise.then(function(){var hasManyName=Ember.String.pluralize(type.typeKey);var relationShips=Ember.get(type,"relationshipNames");if(relationShips.belongsTo){}});return promise}});FactoryGuyHelperMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},handleCreate:function(name,opts){var model=FactoryGuy.lookupModelForName(name);this.stubEndpointForHttpRequest("/"+Em.String.pluralize(model),this.buildAjaxResponse(name,opts),{type:"POST"})},buildAjaxResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var model=FactoryGuy.lookupModelForName(name);var hash={};hash[model]=fixture;return hash},handleUpdate:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,"{}",{type:"PUT"})},handleDelete:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE"})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});
+FactoryGuy=Ember.Object.reopenClass({fixtureStore:{},fixtureLookup:{},modelIds:{},define:function(model,config){var info=this.getModelInfo(model);for(key in config){var value=config[key];info[key]=value;if(key!="default"){this.fixtureLookup[key]=model}}this.modelIds[model]=0},getModelInfo:function(model){if(!this.fixtureStore[model]){this.fixtureStore[model]={}}return this.fixtureStore[model]},lookupModelForName:function(name){var model=this.fixtureLookup[name];if(!model){if(this.fixtureStore[name]){model=name}}return model},generateId:function(model){var lastId=this.modelIds[model]||0;this.modelIds[model]=lastId+1;return this.modelIds[model]},build:function(name,opts){var model=this.lookupModelForName(name);if(!model){throw new Error("can't find that factory named ["+name+"]")}var modelInfo=this.fixtureStore[model];var modelAttributes=modelInfo[name]||{};var defaultModelAttributes=modelInfo.default;var fixture=$.extend({},defaultModelAttributes,modelAttributes,opts);if(!fixture.id){fixture.id=this.generateId(model)}return fixture},resetModels:function(store){var typeMaps=store.typeMaps;if(store.usingFixtureAdapter()){for(typeKey in this.fixtureStore){var modelType=store.modelFor(typeKey);modelType.FIXTURES=[];store.unloadAll(modelType)}}else{for(model in typeMaps){store.unloadAll(typeMaps[model].type)}}this.modelIds={}},pushFixture:function(modelClass,fixture){if(!modelClass["FIXTURES"]){modelClass["FIXTURES"]=[]}modelClass["FIXTURES"].push(fixture);return fixture}});DS.Store.reopen({usingFixtureAdapter:function(){var adapter=this.adapterFor("application");return adapter instanceof DS.FixtureAdapter},makeFixture:function(name,options){var modelName=FactoryGuy.lookupModelForName(name);var fixture=FactoryGuy.build(name,options);var modelType=this.modelFor(modelName);if(this.usingFixtureAdapter()){this.setBelongsToFixturesAssociation(modelType,modelName,fixture);return FactoryGuy.pushFixture(modelType,fixture)}else{var self=this;var model;Em.run(function(){model=self.push(modelName,fixture);self.setBelongsToRestAssociation(modelType,modelName,model)});return model}},setBelongsToFixturesAssociation:function(modelType,modelName,parentFixture){var store=this;var adapter=this.adapterFor("application");var relationShips=Ember.get(modelType,"relationshipNames");if(relationShips.hasMany){relationShips.hasMany.forEach(function(relationship){var hasManyModel=store.modelFor(Em.String.singularize(relationship));if(parentFixture[relationship]){parentFixture[relationship].forEach(function(id){var hasManyfixtures=adapter.fixturesForType(hasManyModel);var fixture=adapter.findFixtureById(hasManyfixtures,id);fixture[modelName]=parentFixture.id})}})}},setBelongsToRestAssociation:function(modelType,modelName,parent){var relationShips=Ember.get(modelType,"relationshipNames");if(relationShips.hasMany){relationShips.hasMany.forEach(function(name){var children=parent.get(name);if(children.get("length")>0){children.forEach(function(child){child.set(modelName,parent)})}})}},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);return promise}});FactoryGuyHelperMixin=Em.Mixin.create({setup:function(app){this.set("container",app.__container__);return this},useFixtureAdapter:function(app){app.ApplicationAdapter=DS.FixtureAdapter;this.getStore().adapterFor("application").simulateRemoteResponse=false},find:function(type,id){return this.getStore().find(type,id)},make:function(name,opts){return this.getStore().makeFixture(name,opts)},getStore:function(){return this.get("container").lookup("store:main")},pushPayload:function(type,hash){return this.getStore().pushPayload(type,hash)},pushRecord:function(type,hash){return this.getStore().push(type,hash)},stubEndpointForHttpRequest:function(url,json,options){options=options||{};var request={url:url,dataType:"json",responseText:json,type:options.type||"GET",status:options.status||200};if(options.data){request.data=options.data}$.mockjax(request)},handleCreate:function(name,opts){var model=FactoryGuy.lookupModelForName(name);this.stubEndpointForHttpRequest("/"+Em.String.pluralize(model),this.buildAjaxResponse(name,opts),{type:"POST"})},buildAjaxResponse:function(name,opts){var fixture=FactoryGuy.build(name,opts);var model=FactoryGuy.lookupModelForName(name);var hash={};hash[model]=fixture;return hash},handleUpdate:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"PUT"})},handleDelete:function(root,id){this.stubEndpointForHttpRequest("/"+Em.String.pluralize(root)+"/"+id,{},{type:"DELETE"})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});

data/ember-data-factory-guy.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "ember-data-factory-guy"
-  s.version     = "0.1"
+  s.version     = "0.1.1"
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["daniel sudol", "alex opak"]
-  s.email       = ["dansudol@yahoo.com"]
-  s.homepage    = "http://rubygems.org/gems/ember-data-factory-guy"
-  s.summary     = "Create Fixtures for Ember Data"
-  s.description = "Create Fixtures for Ember Data"
+  s.authors     = ["Daniel Sudol", "Alex Opak"]
+  s.email       = ["dansudol@yahoo.com", "opak.alexandr@gmail.com"]
+  s.homepage    = "https://github.com/danielspaniel/ember-data-factory-guy"
+  s.summary     = "Easily create Fixtures for Ember Data"
+  s.description = "Easily create Fixtures for Ember Data"
   s.license     = "MIT"
 
   s.required_rubygems_version = ">= 1.3.6"

data/src/factory_guy.js

@@ -30,7 +30,7 @@ FactoryGuy = Ember.Object.reopenClass({
       FactoryGuy.build('user') or FactoryGuy.build('bob')
 
     @param model the model to define
-    @param config your default and specific fixtures
+    @param config your default and named fixtures
    */
   define: function (model, config) {
     var info = this.getModelInfo(model);
@@ -100,7 +100,9 @@ FactoryGuy = Ember.Object.reopenClass({
     var modelAttributes = modelInfo[name] || {};
     var defaultModelAttributes = modelInfo.default;
     var fixture = $.extend({}, defaultModelAttributes, modelAttributes, opts);
-    fixture.id = this.generateId(model);
+    if(!fixture.id){
+      fixture.id = this.generateId(model);
+    }
     return fixture;
   },
 
@@ -118,10 +120,7 @@ FactoryGuy = Ember.Object.reopenClass({
       }
     } else {
       for (model in typeMaps) {
-        if (typeMaps[model].type.typeKey != 'user') {
-//          console.log(typeMaps[model].type.typeKey)
-          store.unloadAll(typeMaps[model].type);
-        }
+        store.unloadAll(typeMaps[model].type);
       }
     }
     this.modelIds = {}
@@ -141,4 +140,4 @@ FactoryGuy = Ember.Object.reopenClass({
     modelClass['FIXTURES'].push(fixture);
     return fixture;
   }
-})
+})

data/src/has_many.js

@@ -61,7 +61,7 @@
 
     return Ember.computed('data', function(key) {
       var adapter = this.store.adapterFor('application');
-      if (adapter.toString().match('Fixture')) {
+      if (adapter instanceof DS.FixtureAdapter) {
         var relationship = this._relationships[key],
             promiseLabel = "DS: Async hasMany " + this + " : " + key;
 

data/src/store.js

@@ -122,10 +122,10 @@ DS.FixtureAdapter.reopen({
   createRecord: function(store, type, record) {
     var promise = this._super(store, type, record);
 
-    promise.then( function() {
-      var hasManyName = Ember.String.pluralize(type.typeKey);
-      var relationShips = Ember.get(type, 'relationshipNames');
-      if (relationShips.belongsTo) {
+//    promise.then( function() {
+//      var hasManyName = Ember.String.pluralize(type.typeKey);
+//      var relationShips = Ember.get(type, 'relationshipNames');
+//      if (relationShips.belongsTo) {
 //        console.log('record',record+'', type.typeKey, hasManyName);
 //        relationShips.belongsTo.forEach(function (relationship) {
 //          console.log(relationship, record.get(relationship)+'')
@@ -133,8 +133,8 @@ DS.FixtureAdapter.reopen({
 //          console.log(relationshipForType)
 //          belongsToRecord.get(hasManyName).addObject(record);
 //        })
-      }
-    })
+//      }
+//    })
     return promise;
   }
 

data/tests/fixture_adapter_factory_test.js

@@ -118,17 +118,17 @@ asyncTest("#makeFixture sets hasMany associations on fixtures", function() {
   })
 })
 
-asyncTest("#createRecord adds belongsTo associations to hasMany array", function() {
-  var user = store.makeFixture('user');
-
-  store.find('user', user.id).then(function(user){
-
-    var projectJson = {title:'project', user: user};
-
-    store.createRecord('project', projectJson).save()
-      .then( function() {
-        equal(user.get('projects.length'), 1);
-        start();
-      });
-  })
-})
+//asyncTest("#createRecord adds belongsTo associations to hasMany array", function() {
+//  var user = store.makeFixture('user');
+//
+//  store.find('user', user.id).then(function(user){
+//
+//    var projectJson = {title:'project', user: user};
+//
+//    store.createRecord('project', projectJson).save()
+//      .then( function() {
+//        equal(user.get('projects.length'), 1);
+//        start();
+//      });
+//  })
+//})

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -30,7 +30,7 @@ FactoryGuy = Ember.Object.reopenClass({
       FactoryGuy.build('user') or FactoryGuy.build('bob')
 
     @param model the model to define
-    @param config your default and specific fixtures
+    @param config your default and named fixtures
    */
   define: function (model, config) {
     var info = this.getModelInfo(model);
@@ -100,7 +100,9 @@ FactoryGuy = Ember.Object.reopenClass({
     var modelAttributes = modelInfo[name] || {};
     var defaultModelAttributes = modelInfo.default;
     var fixture = $.extend({}, defaultModelAttributes, modelAttributes, opts);
-    fixture.id = this.generateId(model);
+    if(!fixture.id){
+      fixture.id = this.generateId(model);
+    }
     return fixture;
   },
 
@@ -118,10 +120,7 @@ FactoryGuy = Ember.Object.reopenClass({
       }
     } else {
       for (model in typeMaps) {
-        if (typeMaps[model].type.typeKey != 'user') {
-//          console.log(typeMaps[model].type.typeKey)
-          store.unloadAll(typeMaps[model].type);
-        }
+        store.unloadAll(typeMaps[model].type);
       }
     }
     this.modelIds = {}
@@ -142,6 +141,7 @@ FactoryGuy = Ember.Object.reopenClass({
     return fixture;
   }
 })
+
 DS.Store.reopen({
 
   usingFixtureAdapter: function() {
@@ -266,10 +266,10 @@ DS.FixtureAdapter.reopen({
   createRecord: function(store, type, record) {
     var promise = this._super(store, type, record);
 
-    promise.then( function() {
-      var hasManyName = Ember.String.pluralize(type.typeKey);
-      var relationShips = Ember.get(type, 'relationshipNames');
-      if (relationShips.belongsTo) {
+//    promise.then( function() {
+//      var hasManyName = Ember.String.pluralize(type.typeKey);
+//      var relationShips = Ember.get(type, 'relationshipNames');
+//      if (relationShips.belongsTo) {
 //        console.log('record',record+'', type.typeKey, hasManyName);
 //        relationShips.belongsTo.forEach(function (relationship) {
 //          console.log(relationship, record.get(relationship)+'')
@@ -277,8 +277,8 @@ DS.FixtureAdapter.reopen({
 //          console.log(relationshipForType)
 //          belongsToRecord.get(hasManyName).addObject(record);
 //        })
-      }
-    })
+//      }
+//    })
     return promise;
   }
 
@@ -359,7 +359,7 @@ FactoryGuyHelperMixin = Em.Mixin.create({
 
   handleUpdate: function (root, id) {
     this.stubEndpointForHttpRequest(
-      "/" + Em.String.pluralize(root) + "/" + id, '{}', {type: 'PUT'}
+      "/" + Em.String.pluralize(root) + "/" + id, {}, {type: 'PUT'}
     )
   },
 

data/vendor/assets/javascripts/factory_guy_has_many.js

@@ -61,7 +61,7 @@
 
     return Ember.computed('data', function(key) {
       var adapter = this.store.adapterFor('application');
-      if (adapter.toString().match('Fixture')) {
+      if (adapter instanceof DS.FixtureAdapter) {
         var relationship = this._relationships[key],
             promiseLabel = "DS: Async hasMany " + this + " : " + key;
 

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-factory-guy
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
-- daniel sudol
-- alex opak
+- Daniel Sudol
+- Alex Opak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 +03:00
+date: 2014-04-24 00:00:00.000000000 +03:00
 default_executable: 
 dependencies: []
-description: Create Fixtures for Ember Data
+description: Easily create Fixtures for Ember Data
 email:
 - dansudol@yahoo.com
+- opak.alexandr@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -48,7 +49,7 @@ files:
 - vendor/assets/javascripts/ember_data_factory_guy.js
 - vendor/assets/javascripts/factory_guy_has_many.js
 has_rdoc: true
-homepage: http://rubygems.org/gems/ember-data-factory-guy
+homepage: https://github.com/danielspaniel/ember-data-factory-guy
 licenses:
 - MIT
 post_install_message: 
@@ -72,5 +73,5 @@ rubyforge_project: ember-data-factory-guy
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Create Fixtures for Ember Data
+summary: Easily create Fixtures for Ember Data
 test_files: []