ember-data-factory-guy 0.8.7 → 0.9.0

data/tests/support/models/user.js

@@ -1,5 +1,6 @@
 User = DS.Model.extend({
   name:       DS.attr('string'),
+  info:       DS.attr('object'),
   company:    DS.belongsTo('company', {async: true, inverse: 'users', polymorphic: true}),
   properties: DS.hasMany('property', {async: true, inverse: 'owners'}),
   projects:   DS.hasMany('project'),

data/tests/support/test_helper.js

@@ -1,3 +1,13 @@
+ObjectTransform = DS.Transform.extend({
+  serialize: function(obj) {
+    return JSON.parse(obj);
+  },
+  deserialize: function(obj) {
+    return JSON.stringify(obj);
+  }
+});
+
+
 TestHelper = Ember.Object.createWithMixins(FactoryGuy.testMixin,{
 
   /**
@@ -34,7 +44,10 @@ TestHelper = Ember.Object.createWithMixins(FactoryGuy.testMixin,{
     if (adapter instanceof DS.FixtureAdapter) {
       adapter.simulateRemoteResponse = false;
     }
+    // bypassing the parent TestHelper setup because there is no application
+    // here in testing, just a container
     this.set('container', env.container);
+    FactoryGuy.setStore(this.getStore());
     return this;
   }
 });
@@ -69,6 +82,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.register('transform:object', ObjectTransform);
     container.injection('serializer', 'store', 'store:main');
 
     env.store = container.lookup('store:main');

data/tests/test_setup.js

@@ -1,3 +1,107 @@
+Company = DS.Model.extend({
+  type:    DS.attr('string', {defaultValue: 'Company'}),
+  name:    DS.attr('string'),
+  profile: DS.belongsTo('profile'),
+  users:   DS.hasMany('user', {async: true, inverse: 'company'}),
+  projects: DS.hasMany('project', {async: true})
+});
+
+SmallCompany = Company.extend({
+  type:    DS.attr('string', {defaultValue: 'SmallCompany'}),
+  owner: DS.belongsTo('user', {async: true}),
+  projects: DS.hasMany('project')
+});
+
+Group = DS.Model.extend({
+  type:    DS.attr('string', {defaultValue: 'Group'}),
+  name:    DS.attr('string'),
+  versions: DS.hasMany('group'),
+  profiles: DS.hasMany('profile')
+})
+
+BigGroup = Group.extend({
+  type:    DS.attr('string', {defaultValue: 'BigGroup'}),
+  group: DS.belongsTo('group')
+})
+
+SmallGroup = Group.extend({
+  type:    DS.attr('string', {defaultValue: 'SmallGroup'}),
+  group: DS.belongsTo('group')
+})
+
+
+Hat = DS.Model.extend({
+  type: DS.attr('string'),
+  user: DS.belongsTo('user'),
+  outfit: DS.belongsTo('outfit'),
+  hat:  DS.belongsTo('hat', {inverse: 'hats', polymorphic: true}),
+  hats: DS.hasMany('hat', {inverse: 'hat', polymorphic: true}),
+  fluffy_materials: DS.hasMany('fluffy_materials')
+});
+
+BigHat = Hat.extend({
+  materials: DS.hasMany('soft_material')
+});
+SmallHat = Hat.extend();
+
+
+
+SoftMaterial = DS.Model.extend({
+  name: DS.attr('string'),
+  hat:  DS.belongsTo('big_hat')
+})
+
+FluffyMaterial = DS.Model.extend({
+  name: DS.attr('string'),
+  hat:  DS.belongsTo('hat', {polymorphic: true})
+})
+
+Outfit = DS.Model.extend({
+  name: DS.attr('string'),
+  hats: DS.hasMany('hat', {polymorphic: true})
+})
+
+Person = DS.Model.extend({
+  type: DS.attr('string'),
+  name: DS.attr('string')
+})
+
+Profile = DS.Model.extend({
+  created_at:             DS.attr('date'),
+  description:            DS.attr('string'),
+  camelCaseDescription:   DS.attr('string'),
+  snake_case_description: DS.attr('string'),
+  company:                DS.belongsTo('company'),
+  group:                  DS.belongsTo('group', {polymorphic: true})
+});
+
+Project = DS.Model.extend({
+  title:    DS.attr('string'),
+  user:     DS.belongsTo('user'),
+  parent:   DS.belongsTo('project', {inverse: 'children'}),
+  children: DS.hasMany('project', {inverse: 'parent'})
+});
+
+
+
+
+
+
+Property = DS.Model.extend({
+  name:    DS.attr('string'),
+  company: DS.belongsTo('company', {async: true}),
+  owners:  DS.hasMany('user', {async: true, inverse: 'properties'})
+});
+User = DS.Model.extend({
+  name:       DS.attr('string'),
+  info:       DS.attr('object'),
+  company:    DS.belongsTo('company', {async: true, inverse: 'users', polymorphic: true}),
+  properties: DS.hasMany('property', {async: true, inverse: 'owners'}),
+  projects:   DS.hasMany('project'),
+  hats:       DS.hasMany('hat', {polymorphic: true})
+});
+
+
 FactoryGuy.define("company", {
   default: {
     name: 'Silly corp'
@@ -171,106 +275,3 @@ FactoryGuy.define('user', {
   }
 });
 
-
-Company = DS.Model.extend({
-  type:    DS.attr('string', {defaultValue: 'Company'}),
-  name:    DS.attr('string'),
-  profile: DS.belongsTo('profile'),
-  users:   DS.hasMany('user', {async: true, inverse: 'company'}),
-  projects: DS.hasMany('project', {async: true})
-});
-
-SmallCompany = Company.extend({
-  type:    DS.attr('string', {defaultValue: 'SmallCompany'}),
-  owner: DS.belongsTo('user', {async: true}),
-  projects: DS.hasMany('project')
-});
-
-Group = DS.Model.extend({
-  type:    DS.attr('string', {defaultValue: 'Group'}),
-  name:    DS.attr('string'),
-  versions: DS.hasMany('group'),
-  profiles: DS.hasMany('profile')
-})
-
-BigGroup = Group.extend({
-  type:    DS.attr('string', {defaultValue: 'BigGroup'}),
-  group: DS.belongsTo('group')
-})
-
-SmallGroup = Group.extend({
-  type:    DS.attr('string', {defaultValue: 'SmallGroup'}),
-  group: DS.belongsTo('group')
-})
-
-
-Hat = DS.Model.extend({
-  type: DS.attr('string'),
-  user: DS.belongsTo('user'),
-  outfit: DS.belongsTo('outfit'),
-  hat:  DS.belongsTo('hat', {inverse: 'hats', polymorphic: true}),
-  hats: DS.hasMany('hat', {inverse: 'hat', polymorphic: true}),
-  fluffy_materials: DS.hasMany('fluffy_materials')
-});
-
-BigHat = Hat.extend({
-  materials: DS.hasMany('soft_material')
-});
-SmallHat = Hat.extend();
-
-
-
-SoftMaterial = DS.Model.extend({
-  name: DS.attr('string'),
-  hat:  DS.belongsTo('big_hat')
-})
-
-FluffyMaterial = DS.Model.extend({
-  name: DS.attr('string'),
-  hat:  DS.belongsTo('hat', {polymorphic: true})
-})
-
-Outfit = DS.Model.extend({
-  name: DS.attr('string'),
-  hats: DS.hasMany('hat', {polymorphic: true})
-})
-
-Person = DS.Model.extend({
-  type: DS.attr('string'),
-  name: DS.attr('string')
-})
-
-Profile = DS.Model.extend({
-  created_at:             DS.attr('date'),
-  description:            DS.attr('string'),
-  camelCaseDescription:   DS.attr('string'),
-  snake_case_description: DS.attr('string'),
-  company:                DS.belongsTo('company'),
-  group:                  DS.belongsTo('group', {polymorphic: true})
-});
-
-Project = DS.Model.extend({
-  title:    DS.attr('string'),
-  user:     DS.belongsTo('user'),
-  parent:   DS.belongsTo('project', {inverse: 'children'}),
-  children: DS.hasMany('project', {inverse: 'parent'})
-});
-
-
-
-
-
-
-Property = DS.Model.extend({
-  name:    DS.attr('string'),
-  company: DS.belongsTo('company', {async: true}),
-  owners:  DS.hasMany('user', {async: true, inverse: 'properties'})
-});
-User = DS.Model.extend({
-  name:       DS.attr('string'),
-  company:    DS.belongsTo('company', {async: true, inverse: 'users', polymorphic: true}),
-  properties: DS.hasMany('property', {async: true, inverse: 'owners'}),
-  projects:   DS.hasMany('project'),
-  hats:       DS.hasMany('hat', {polymorphic: true})
-});
-

data/vendor/assets/javascripts/ember_data_factory_guy.js

@@ -90,9 +90,19 @@ var ModelDefinition = function (model, config) {
         // function might be a sequence of a named association
         fixture[attribute] = fixture[attribute].call(this, fixture);
       } else if (Ember.typeOf(fixture[attribute]) == 'object') {
-        // if it's an object it's for a model association, so build the json
+        // If it's an object and it's a model association attribute, build the json
         // for the association and replace the attribute with that json
-        fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+        if (FactoryGuy.getStore()) {
+          if (FactoryGuy.isAttributeRelationship(this.model, attribute)) {
+            fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+          }
+        } else {
+          // For legacy reasons, if the store is not set in FactoryGuy, keep
+          // this code the way it is ( though it will cause failures when the object is actually
+          // a custom attribute and not a relationship ), while users start setting the store
+          // in FactoryGuy, or using testHelper.make instead of store.makeFixture
+          fixture[attribute] = FactoryGuy.build(attribute, fixture[attribute]);
+        }
       }
     }
     // set the id, unless it was already set in opts
@@ -213,6 +223,44 @@ var FactoryGuy = {
       this.modelDefinitions[model] = new ModelDefinition(model, config);
     }
   },
+  /**
+   Setting the store so FactoryGuy can do some model introspection.
+   */
+   setStore: function(store) {
+    Ember.assert("FactoryGuy#setStore needs a valid store instance.You passed in ["+store+"]",store instanceof DS.Store)
+    this.store = store;
+  },
+  getStore: function() {
+    return this.store;
+  },
+  /**
+   Checks a model's attribute to determine if it's a relationship.
+
+   @param {String} typeName  model type name like 'user' for User model class
+   @param {String} attribute  attribute you want to check
+   @returns {Boolean} true if the attribute is a relationship, false if not
+   */
+  isAttributeRelationship: function(typeName, attribute) {
+    if (!this.store) {
+      console.log("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures")
+      // The legacy value was true.
+      return true;
+    }
+    var model = this.store.modelFor(typeName);
+    return !!model.typeForRelationship(attribute);
+  },
+  /**
+   Make new fixture and save to store. Proxy to store#makeFixture method
+
+   @param {String} name  fixture name
+   @param {String} trait  optional trait names ( one or more )
+   @param {Object} opts  optional fixture options that will override default fixture values
+   @returns {Object|DS.Model} json or record depending on the adapter type
+   */
+  make: function() {
+    Ember.assert("FactoryGuy does not have the application's store. Use FactoryGuy.setStore(store) before making any fixtures", this.store);
+    return this.store.makeFixture.apply(this.store,arguments);
+  },
   /**
    Used in model definitions to declare use of a sequence. For example:
 
@@ -736,6 +784,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   // Pass in the app root, which typically is App.
   setup: function (app) {
     this.set('container', app.__container__);
+    FactoryGuy.setStore(this.getStore());
     return this;
   },
   useFixtureAdapter: function (app) {
@@ -763,8 +812,7 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     return this.getStore().find(type, id);
   },
   /**
-   Proxy to store's makeFixture method
-
+   Make new fixture and save to store. Proxy to store#makeFixture method
    */
   make: function () {
     var store = this.getStore();
@@ -773,12 +821,6 @@ var FactoryGuyTestMixin = Em.Mixin.create({
   getStore: function () {
     return this.get('container').lookup('store:main');
   },
-  pushPayload: function (type, hash) {
-    return this.getStore().pushPayload(type, hash);
-  },
-  pushRecord: function (type, hash) {
-    return this.getStore().push(type, hash);
-  },
   /**
    Using mockjax to stub an http request.
 
@@ -855,7 +897,10 @@ var FactoryGuyTestMixin = Em.Mixin.create({
     so you don't need to include them in the returns hash as well.
 
      2) If you don't use match options for exact match, there will be no id returned to the model.
-
+        The reason being, that this method purposely returns an empty hash response with a 'don't match'
+        style handleCreate, because if the responseJson returns a non empty data hash ( with even only
+        the id), this essentially empty hash of attributes will override ( and nullify ) all the attributes
+        that set when you created the record.
      3) If you match on a belongsTo association, you don't have to include that in the
     returns hash.
 
@@ -908,8 +953,25 @@ var FactoryGuyTestMixin = Em.Mixin.create({
    @param {Boolean} succeed  optional flag to indicate if the request
       should succeed ( default is true )
    */
-  handleUpdate: function (type, id, succeed) {
-    succeed = succeed === undefined ? true : succeed;
+  handleUpdate: function () {
+    var args = Array.prototype.slice.call(arguments)
+    Ember.assert("To handleUpdate pass in a model instance or a type and an id", args.length>0)
+    var succeed = true;
+    if (typeof args[args.length-1] == 'boolean') {
+      args.pop()
+      succeed = false;
+    }
+    Ember.assert("To handleUpdate pass in a model instance or a type and an id",args.length>0)
+    var type, id;
+    if (args[0] instanceof DS.Model) {
+      var model = args[0];
+      type = model.constructor.typeKey;
+      id = model.id;
+    } else if (typeof args[0] == "string" && typeof parseInt(args[1]) == "number") {
+      type = args[0];
+      id = args[1];
+    }
+    Ember.assert("To handleUpdate pass in a model instance or a type and an id",type && id)
     this.stubEndpointForHttpRequest(this.buildURL(type, id), {}, {
       type: 'PUT',
       status: succeed ? 200 : 500
@@ -1056,12 +1118,10 @@ if (FactoryGuy !== undefined) {
 				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) ) {
+			if ( ! requestSettings.data || !isMockDataEqual(handler.data, requestSettings.data) ) {
 				// They're not identical, do not mock this request
 				return null;
 			}
@@ -1072,6 +1132,7 @@ if (FactoryGuy !== undefined) {
 			// 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.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Daniel Sudol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies: []
 description: Easily create Fixtures for Ember Data
 email:
@@ -19,8 +19,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gruntfile.js
 - LICENSE
 - README.md
@@ -80,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: ember-data-factory-guy
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Easily create Fixtures for Ember Data