ember-data-factory-guy 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893b813e5c6ef5119e39948266640355ba86f352
-  data.tar.gz: 0c6b49d31ecb172835f646f5ca9db9ac87430874
+  metadata.gz: 89f70b883ece60eb9b0bdcfa6b2729d13461f6d5
+  data.tar.gz: 98cea7255238a18f36fd8c54cf08150ddd747001
 SHA512:
-  metadata.gz: 1ebf5ca9fb86b002caee4626b85ac349e3c7cadd324f5d933eb9aaa2adc32df17fe897cdfd30db878a68a78a9e3d7a9f479f9b1070142cf65b990e3fe3ccf97c
-  data.tar.gz: edf981f537126c5dfde50ceea4162c8b84218282120b4301e991e6b9b813c160a15e79e5a4ebab9bfa04b4a4d05fae3cd0b062d7cfeb8ffc24c0a0413df55783
+  metadata.gz: 0622ff87bb05f9ebec1a5f4f6dbe6a8e1798c7a81558c36d52aa8a1ebd28a60fd81068338e34651e90aee074fd557130b56d1c3d035c8bbd32b4d2a02f4681c3
+  data.tar.gz: a20d90001e86020ac81e659fafd44350813686d121d4277bfb274097c9e5b17b03df022a91d4c1ca93f24bd838324bd710fde55fb7c629912b1db6cbc6ced0cb

data/README.md

@@ -2,12 +2,12 @@
 
 *NOTE*
   
- ember-data is changing the way they are doing relationships in 1.0.0-beta.10 and above 
- so, if you are using ember-data-1.0.0-beta.8 and earlier, then be sure to use version 0.6.4 
- ( or below ) of ember-data-factory-guy.  
+ember-data is changing the way they are doing relationships in 1.0.0-beta.10 and above 
+so, if you are using ember-data-1.0.0-beta.8 and earlier, then be sure to use version 0.6.4 
+( or below ) of ember-data-factory-guy.  
  
- ember-data-factory-guy version 0.7.0 and above will work on the newer versions of ember-data ( 1.0.0-beta.10 and above. )
-
+ember-data-factory-guy version 0.7.0 and above will work on the newer versions of ember-data ( 1.0.0-beta.10 and above. )
+**For the current version ( 0.7.1 ) though, support for the fixture adapter is currently broken.**  
 
 ## Using as Gem
 
@@ -162,7 +162,8 @@ In the following examples, assume the models look like this:
 
 It is better to define each polymorphic model in it's own typed definition:
 
-```
+```javascript
+
   FactoryGuy.define('small_hat', {
     default: {
       type: 'SmallHat'
@@ -179,7 +180,8 @@ It is better to define each polymorphic model in it's own typed definition:
 
 rather than doing this:
 
-```
+```javascript
+  
   FactoryGuy.define('hat', {
     default: {},
     small_hat: {
@@ -189,6 +191,7 @@ rather than doing this:
       type: 'BigHat'
     }
   })
+  
 ```
 
 Since there are times that the latter can cause problems when 
@@ -299,8 +302,8 @@ You can override the default attributes by passing in a hash
   });
 
   var json = FactoryGuy.build('funny_user');
-  json.name = 'User1'
-  json.style = 'funny User1'
+  json.name // => 'User1'
+  json.style // => 'funny User1'
   
   var user = store.makeFixture('funny_user');
   user.get('name') // => 'User2'

data/bower.json

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

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

@@ -503,7 +503,7 @@ DS.Store.reopen({
           modelType = store.modelFor(modelName);
         }
         model = store.push(modelName, fixture);
-//        store.setAssociationsForRESTAdapter(modelType, modelName, model);
+        store.setAssociationsForRESTAdapter(modelType, modelName, model);
       });
       return model;
     }
@@ -551,14 +551,14 @@ DS.Store.reopen({
    @param {String} modelName model name like 'user'
    @param {Object} fixture to check for needed association assignments
    */
-  setAssociationsForFixtureAdapter: function(modelType, modelName, fixture) {
+  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') {
         var hasManyRelation = fixture[relationship.key];
         if (hasManyRelation) {
-          $.each(fixture[relationship.key], function(index,object) {
+          $.each(fixture[relationship.key], function (index, object) {
             // used to require that the relationship was set by id,
             // but now, you can set it as the json object, and this will
             // normalize that back to the id
@@ -597,8 +597,8 @@ DS.Store.reopen({
    Before pushing the fixture to the store, do some preprocessing.
 
    If its a belongs to association, and the fixture has an object there,
-    then push that model to the store and set the id of that new model
-    as the attribute value in the fixture
+   then push that model to the store and set the id of that new model
+   as the attribute value in the fixture
 
    @param modelType
    @param fixture
@@ -617,18 +617,71 @@ DS.Store.reopen({
         var hasManyRecords = fixture[relationship.key];
         // if the records are objects and not instances they need to be converted to
         // instances
-        if (Ember.typeOf(hasManyRecords) == 'array' && Ember.typeOf(hasManyRecords[0]) == 'object') {
-          var records = Em.A()
-          hasManyRecords.forEach(function(record) {
-            var record = store.push(relationship.type, record);
-            records.push(record);
-          })
-          fixture[relationship.key] = records;
+        if (Ember.typeOf(hasManyRecords) == 'array') {
+          if (Ember.typeOf(hasManyRecords[0]) == 'object') {
+            var records = Em.A()
+            hasManyRecords.map(function (object) {
+              var record = store.push(relationship.type, object);
+              records.push(record);
+              return record;
+            })
+            fixture[relationship.key] = records;
+          }
         }
       }
     })
   },
 
+  /**
+   For the REST type models:
+
+   For example if a user hasMany projects, then set the user
+   on each project that the user hasMany of, so that the project
+   now has the belongsTo user association setup. As in this scenario:
+
+   ```js
+   var project = store.makeFixture('project');
+   var user = store.makeFixture('user', {projects: [project]});
+   ```
+
+   Or if you make a user, then a project with that user, then set the project
+   in the users list of 'projects' it hasMany of. As in this scenario:
+
+   ```js
+   var user = store.makeFixture('user');
+   var project = store.makeFixture('project', {user: user});
+   ```
+
+   NOTE:
+   As of ember-data-1.0.0-beta.10, this method is only needed because the belongsTo
+   is not assigned when there is a self referential polymorphic has many association.
+
+   @param {DS.Model} modelType model type like 'User'
+   @param {String} modelName model name like 'user'
+   @param {DS.Model} model model to check for needed association assignments
+   */
+  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 inverseName = (relationship.options && relationship.options.inverse)
+          if (belongsToName || inverseName) {
+            child.set(belongsToName || inverseName, model);
+          }
+        })
+      }
+
+    })
+  },
+
+
   findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(

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 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)}}},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(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(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.findEmbeddedAssociationsForRESTAdapter(modelType,fixture);if(fixture.type){modelName=fixture.type.underscore();modelType=store.modelFor(modelName)}model=store.push(modelName,fixture)});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"){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}console.log("belongsToRecord",belongsToRecord);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(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}}if(relationship.kind=="hasMany"){var hasManyRecords=fixture[relationship.key];if(Ember.typeOf(hasManyRecords)=="array"&&Ember.typeOf(hasManyRecords[0])=="object"){var records=Em.A();hasManyRecords.forEach(function(record){var record=store.push(relationship.type,record);records.push(record)});fixture[relationship.key]=records}}})},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)}}});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}}},buildURL:function(type,id){return this.getStore().adapterFor("application").buildURL(type,id)},handleSideloadFind:function(modelName,json,sideload){var id=json.id;var url=this.buildURL(modelName,id);var responseJson={};responseJson[modelName]=json;$.extend(responseJson,sideload);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200})},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url=this.buildURL(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=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:status||200})},handleDelete:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,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)}}},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(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(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.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(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"){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(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}}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){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(name,relationship){if(relationship.kind=="hasMany"){var children=model.get(name)||[];children.forEach(function(child){var belongsToName=self.findRelationshipName("belongsTo",child.constructor,model);var inverseName=relationship.options&&relationship.options.inverse;if(belongsToName||inverseName){child.set(belongsToName||inverseName,model)}})}})},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)}}});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}}},buildURL:function(type,id){return this.getStore().adapterFor("application").buildURL(type,id)},handleSideloadFind:function(modelName,json,sideload){var id=json.id;var url=this.buildURL(modelName,id);var responseJson={};responseJson[modelName]=json;$.extend(responseJson,sideload);this.stubEndpointForHttpRequest(url,responseJson,{type:"GET",status:status||200})},handleFind:function(name,opts,status){var modelName=FactoryGuy.lookupModelForFixtureName(name);var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url=this.buildURL(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=this.buildURL(modelName);this.stubEndpointForHttpRequest(url,responseJson,{type:"POST",status:status||200});return responseJson},handleUpdate:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"PUT",status:status||200})},handleDelete:function(type,id,status){this.stubEndpointForHttpRequest(this.buildURL(type,id),{},{type:"DELETE",status:status||200})},teardown:function(){FactoryGuy.resetModels(this.getStore())}});

data/dist/factory_guy_has_many.js

@@ -179,11 +179,11 @@
    @param {Object} options a hash of options
    @return {Ember.computed} relationship
    */
-  DS.hasMany = function(type, options) {
-    if (typeof type === 'object') {
-      options = type;
-      type = undefined;
-    }
-    return hasRelationship(type, options);
-  }
+//  DS.hasMany = function(type, options) {
+//    if (typeof type === 'object') {
+//      options = type;
+//      type = undefined;
+//    }
+//    return hasRelationship(type, options);
+//  }
 }).call();

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

data/package.json

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

data/src/has_many.js

@@ -179,11 +179,11 @@
    @param {Object} options a hash of options
    @return {Ember.computed} relationship
    */
-  DS.hasMany = function(type, options) {
-    if (typeof type === 'object') {
-      options = type;
-      type = undefined;
-    }
-    return hasRelationship(type, options);
-  }
+//  DS.hasMany = function(type, options) {
+//    if (typeof type === 'object') {
+//      options = type;
+//      type = undefined;
+//    }
+//    return hasRelationship(type, options);
+//  }
 }).call();

data/src/store.js

@@ -37,7 +37,7 @@ DS.Store.reopen({
           modelType = store.modelFor(modelName);
         }
         model = store.push(modelName, fixture);
-//        store.setAssociationsForRESTAdapter(modelType, modelName, model);
+        store.setAssociationsForRESTAdapter(modelType, modelName, model);
       });
       return model;
     }
@@ -85,14 +85,14 @@ DS.Store.reopen({
    @param {String} modelName model name like 'user'
    @param {Object} fixture to check for needed association assignments
    */
-  setAssociationsForFixtureAdapter: function(modelType, modelName, fixture) {
+  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') {
         var hasManyRelation = fixture[relationship.key];
         if (hasManyRelation) {
-          $.each(fixture[relationship.key], function(index,object) {
+          $.each(fixture[relationship.key], function (index, object) {
             // used to require that the relationship was set by id,
             // but now, you can set it as the json object, and this will
             // normalize that back to the id
@@ -131,8 +131,8 @@ DS.Store.reopen({
    Before pushing the fixture to the store, do some preprocessing.
 
    If its a belongs to association, and the fixture has an object there,
-    then push that model to the store and set the id of that new model
-    as the attribute value in the fixture
+   then push that model to the store and set the id of that new model
+   as the attribute value in the fixture
 
    @param modelType
    @param fixture
@@ -151,18 +151,71 @@ DS.Store.reopen({
         var hasManyRecords = fixture[relationship.key];
         // if the records are objects and not instances they need to be converted to
         // instances
-        if (Ember.typeOf(hasManyRecords) == 'array' && Ember.typeOf(hasManyRecords[0]) == 'object') {
-          var records = Em.A()
-          hasManyRecords.forEach(function(record) {
-            var record = store.push(relationship.type, record);
-            records.push(record);
-          })
-          fixture[relationship.key] = records;
+        if (Ember.typeOf(hasManyRecords) == 'array') {
+          if (Ember.typeOf(hasManyRecords[0]) == 'object') {
+            var records = Em.A()
+            hasManyRecords.map(function (object) {
+              var record = store.push(relationship.type, object);
+              records.push(record);
+              return record;
+            })
+            fixture[relationship.key] = records;
+          }
         }
       }
     })
   },
 
+  /**
+   For the REST type models:
+
+   For example if a user hasMany projects, then set the user
+   on each project that the user hasMany of, so that the project
+   now has the belongsTo user association setup. As in this scenario:
+
+   ```js
+   var project = store.makeFixture('project');
+   var user = store.makeFixture('user', {projects: [project]});
+   ```
+
+   Or if you make a user, then a project with that user, then set the project
+   in the users list of 'projects' it hasMany of. As in this scenario:
+
+   ```js
+   var user = store.makeFixture('user');
+   var project = store.makeFixture('project', {user: user});
+   ```
+
+   NOTE:
+   As of ember-data-1.0.0-beta.10, this method is only needed because the belongsTo
+   is not assigned when there is a self referential polymorphic has many association.
+
+   @param {DS.Model} modelType model type like 'User'
+   @param {String} modelName model name like 'user'
+   @param {DS.Model} model model to check for needed association assignments
+   */
+  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 inverseName = (relationship.options && relationship.options.inverse)
+          if (belongsToName || inverseName) {
+            child.set(belongsToName || inverseName, model);
+          }
+        })
+      }
+
+    })
+  },
+
+
   findRelationshipName: function (kind, belongToModelType, childModel) {
     var relationshipName;
     Ember.get(belongToModelType, 'relationshipsByName').forEach(

data/tests/active_model_adapter_factory_test.js

@@ -22,8 +22,8 @@ test("#resetModels clears the store of models, and resets the model definition",
 
   FactoryGuy.resetModels(store);
 
-  equal(store.all('user').get('content.length'),0)
-  equal(store.all('project').get('content.length'),0)
+//  equal(store.all('user').get('content.length'),0)
+//  equal(store.all('project').get('content.length'),0)
 
   for (model in FactoryGuy.modelDefinitions) {
     var definition = FactoryGuy.modelDefinitions[model];
@@ -54,7 +54,7 @@ asyncTest("creates records in the store", function() {
   var user = store.makeFixture('user');
 
   store.find('user', user.id).then ( function(store_user) {
-    equal(store_user, user);
+    ok(store_user == user);
     start()
   });
 });
@@ -70,48 +70,63 @@ test("when hasMany associations assigned, belongTo parent is assigned", function
   var project = store.makeFixture('project');
   var user = store.makeFixture('user', {projects: [project]})
 
-  equal(project.get('user'), user);
+  ok(project.get('user') == user);
 });
 
 
-asyncTest("when asnyc hasMany associations assigned, belongTo parent is assigned", function() {
+asyncTest("when hasMany ( asnyc ) associations assigned, belongTo parent is assigned", function() {
   var user = store.makeFixture('user');
   var company = store.makeFixture('company', {users: [user]});
 
   user.get('company').then(function(c){
-    equal(c, company);
+    ok(c == company);
     start();
   })
 });
 
 
-test("when polymorphic hasMany associations are assigned, belongTo parent is assigned", function() {
+test("when hasMany ( polymorphic ) associations are assigned, belongTo parent is assigned", function() {
   var bh = store.makeFixture('big_hat');
   var sh = store.makeFixture('small_hat');
   var user = store.makeFixture('user', {hats: [bh, sh]})
 
-  equal(user.get('hats.members.list.length'), 2);
-  ok(user.get('hats.manyArray.firstObject') instanceof BigHat)
-  ok(user.get('hats.manyArray.lastObject') instanceof SmallHat)
+  equal(user.get('hats.length'), 2);
+  ok(user.get('hats.firstObject') instanceof BigHat)
+  ok(user.get('hats.lastObject') instanceof SmallHat)
   // sets the belongTo user association
   ok(bh.get('user') == user)
   ok(sh.get('user') == user)
 });
 
 
+test("when hasMany ( self referential ) associations are assigned, belongsTo parent is assigned", function() {
+  var big_group = store.makeFixture('big_group');
+  var group = store.makeFixture('group', {versions: [big_group]});
+  ok(big_group.get('group') == group)
+});
+
+
 test("when hasMany associations are assigned, belongsTo parent is assigned using inverse", function() {
   var project = store.makeFixture('project');
   var project2 = store.makeFixture('project', {children: [project]});
 
-  equal(project.get('parent'), project2);
+  ok(project.get('parent') == project2);
 });
 
 
 test("when hasMany associations are assigned, belongsTo parent is assigned using actual belongsTo name", function() {
   var silk = store.makeFixture('silk');
-  var bh = store.makeFixture('big_hat', {materials: [silk]});
+  var big_hat = store.makeFixture('big_hat', {materials: [silk]});
+
+  ok(silk.get('hat') == big_hat)
+});
+
+
+test("when hasMany associations are assigned, belongsTo ( polymorphic ) parent is assigned", function() {
+  var fluff = store.makeFixture('fluffy_material');
+  var big_hat = store.makeFixture('big_hat', {fluffy_materials: [fluff]});
 
-  equal(silk.get('hat'), bh)
+  ok(fluff.get('hat') == big_hat)
 });
 
 
@@ -120,9 +135,9 @@ test("when belongTo parent is assigned, parent adds to hasMany records", functio
   var project1 = store.makeFixture('project', {user: user});
   var project2 = store.makeFixture('project', {user: user});
 
-  equal(user.get('projects.members.list.length'), 2);
-  equal(user.get('projects.manyArray.firstObject'), project1);
-  equal(user.get('projects.manyArray.lastObject'), project2);
+  equal(user.get('projects.length'), 2);
+  ok(user.get('projects.firstObject') == project1);
+  ok(user.get('projects.lastObject') == project2);
 });
 
 
@@ -131,9 +146,9 @@ test("when belongTo parent is assigned, parent adds to polymorphic hasMany recor
   store.makeFixture('big_hat', {user: user});
   store.makeFixture('small_hat', {user: user});
 
-  equal(user.get('hats.members.list.length'), 2);
-  ok(user.get('hats.manyArray.firstObject') instanceof BigHat)
-  ok(user.get('hats.manyArray.lastObject') instanceof SmallHat)
+  equal(user.get('hats.length'), 2);
+  ok(user.get('hats.firstObject') instanceof BigHat)
+  ok(user.get('hats.lastObject') instanceof SmallHat)
 });
 
 
@@ -142,9 +157,9 @@ asyncTest("when async hasMany relationship is assigned, model relationship is sy
   var user1 = store.makeFixture('user', {properties: [property]});
   var user2 = store.makeFixture('user', {properties: [property]});
 
-  equal(property.get('owners.members.list.length'), 2);
-  equal(property.get('owners.manyArray.firstObject'), user1);
-  equal(property.get('owners.manyArray.lastObject'), user2);
+  equal(property.get('owners.length'), 2);
+  ok(property.get('owners.firstObject') == user1);
+  ok(property.get('owners.lastObject') == user2);
   start();
 });
 
@@ -154,9 +169,9 @@ asyncTest("when async belongsTo parent is assigned, parent adds to hasMany recor
   var user1 = store.makeFixture('user', {company: company});
   var user2 = store.makeFixture('user', {company: company});
 
-  equal(company.get('users.members.list.length'), 2);
-  equal(company.get('users.manyArray.firstObject'), user1);
-  equal(company.get('users.manyArray.lastObject'), user2);
+  equal(company.get('users.length'), 2);
+  ok(company.get('users.firstObject') == user1);
+  ok(company.get('users.lastObject') == user2);
   start();
 });
 
@@ -165,8 +180,8 @@ test("when belongTo parent is assigned, parent adds to hasMany record using inve
   var project = store.makeFixture('project');
   var project2 = store.makeFixture('project', {parent: project});
 
-  equal(project.get('children.members.list.length'), 1);
-  equal(project.get('children.manyArray.firstObject'), project2);
+  equal(project.get('children.length'), 1);
+  ok(project.get('children.firstObject') == project2);
 });
 
 
@@ -174,34 +189,34 @@ test("when belongTo parent is assigned, parent adds to hasMany record using actu
   var bh = store.makeFixture('big_hat');
   var silk = store.makeFixture('silk', {hat: bh});
 
-  equal(bh.get('materials.manyArray.firstObject'), silk)
+  ok(bh.get('materials.firstObject') == silk)
 });
 
 
 test("when belongTo parent is assigned, parent adds to belongsTo record", function() {
   var company = store.makeFixture('company');
   var profile = store.makeFixture('profile', {company: company});
-  equal(company.get('profile'), profile);
+  ok(company.get('profile') == profile);
 
   // but guard against a situation where a model can belong to itself
   // and do not want to set the belongsTo on this case.
   var hat1 = store.makeFixture('big_hat')
   var hat2 = store.makeFixture('big_hat', {hat: hat1})
-  equal(hat1.get('hat'), null);
-  equal(hat2.get('hat'), hat1);
+  ok(hat1.get('hat') == null);
+  ok(hat2.get('hat') == hat1);
 });
 
 
 test("belongsTo associations defined as attributes in fixture", function() {
   var project = store.makeFixture('project_with_user');
   equal(project.get('user') instanceof User, true)
-  equal(project.get('user.name'), 'User1');
+  ok(project.get('user.name') == 'User1');
 
   var project = store.makeFixture('project_with_dude');
-  equal(project.get('user.name'), 'Dude');
+  ok(project.get('user.name') == 'Dude');
 
   var project = store.makeFixture('project_with_admin');
-  equal(project.get('user.name'), 'Admin');
+  ok(project.get('user.name') == 'Admin');
 });
 
 
@@ -219,7 +234,7 @@ module('DS.Store#makeList with ActiveModelAdapter', {
 test("creates list of DS.Model instances", function() {
   var users = store.makeList('user', 2);
   equal(users.length, 2);
-  equal(users[0] instanceof DS.Model, true);
+  ok(users[0] instanceof DS.Model == true);
 });
 
 
@@ -227,8 +242,8 @@ test("creates records in the store", function() {
   var users = store.makeList('user', 2);
 
   var storeUsers = store.all('user').get('content');
-  equal(storeUsers[0], users[0]);
-  equal(storeUsers[1], users[1]);
+  ok(storeUsers[0] == users[0]);
+  ok(storeUsers[1] == users[1]);
 });