ember-data-factory-guy 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba327d4ab533e2f7963019b5f361b64437e4a44b
-  data.tar.gz: 14d0e116fc4b25cf21f2c6530d310ae20c0c8bb1
+  metadata.gz: 893b813e5c6ef5119e39948266640355ba86f352
+  data.tar.gz: 0c6b49d31ecb172835f646f5ca9db9ac87430874
 SHA512:
-  metadata.gz: 37b8348c03752999359f5a13b43430efcb460b8f3b6d3e8188da34e38f6d476b2d869eb46f5ac97d545903b7f81c87c23b41b8be69e9b941de6cc77c0af8d265
-  data.tar.gz: 3260af6bd6998457f22cee06f52005aa069fc0a870e10d4a65462059c12dd198815e3270934b12af4df0fbedd831856e4a98e902c259d51abe2c7d1033fd874d
+  metadata.gz: 1ebf5ca9fb86b002caee4626b85ac349e3c7cadd324f5d933eb9aaa2adc32df17fe897cdfd30db878a68a78a9e3d7a9f479f9b1070142cf65b990e3fe3ccf97c
+  data.tar.gz: edf981f537126c5dfde50ceea4162c8b84218282120b4301e991e6b9b813c160a15e79e5a4ebab9bfa04b4a4d05fae3cd0b062d7cfeb8ffc24c0a0413df55783

data/README.md

@@ -1,5 +1,14 @@
 # Ember Data Factory Guy  [![Build Status](https://secure.travis-ci.org/danielspaniel/ember-data-factory-guy.png?branch=master)](http://travis-ci.org/danielspaniel/ember-data-factory-guy)
 
+*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-factory-guy version 0.7.0 and above will work on the newer versions of ember-data ( 1.0.0-beta.10 and above. )
+
+
 ## Using as Gem
 
 To Use with in Rails project or project with sprockets:
@@ -10,6 +19,12 @@ In Gemfile:
 gem 'ember-data-factory-guy', group: test
 ```
 
+or for particular version:
+
+```ruby
+gem 'ember-data-factory-guy', '0.7.0', group: test
+```
+
 then:
 
 ```
@@ -36,6 +51,16 @@ Add as one of your dependencies in bower.json file:
   }
 ```
 
+or for particular version:
+
+```json
+  "dependencies": {
+    "foo-dependency": "latest",
+    "other-foo-dependency": "latest",
+    "ember-data-factory-guy": "0.7.0"
+  }
+```
+
 then:
 ```
     $ bower install

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-factory-guy",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "authors": [
     "Daniel Sudol <dansudol@yahoo.com>",
     "Opak Alex <opak.alexandr@gmail.com>"
@@ -17,9 +17,9 @@
 
   "dependencies": {
     "handlebars": "~1.1.2",
-    "jquery": "1.10.2",
-    "ember": "~1.6.0",
-    "ember-data": "~1.0.0-beta.7",
+    "jquery": "2.0.3",
+    "ember": "1.7.0",
+    "ember-data": "1.0.0-beta.10",
     "chance": "latest",
     "qunit": "latest"
   },

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

@@ -495,7 +495,7 @@ DS.Store.reopen({
 
       var model;
       Em.run(function () {
-        store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType, fixture);
+        store.findEmbeddedAssociationsForRESTAdapter(modelType, fixture);
         if (fixture.type) {
           // assuming its polymorphic if there is a type attribute
           // is this too bold an assumption?
@@ -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;
     }
@@ -603,7 +603,7 @@ DS.Store.reopen({
    @param modelType
    @param fixture
    */
-  findEmbeddedBelongsToAssociationsForRESTAdapter: function (modelType, fixture) {
+  findEmbeddedAssociationsForRESTAdapter: function (modelType, fixture) {
     var store = this;
     Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
       if (relationship.kind == 'belongsTo') {
@@ -629,94 +629,6 @@ DS.Store.reopen({
     })
   },
 
-  /**
-   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});
-   ```
-
-   @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 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
-            );
-            // Guard against a situation where a model can belong to itself.
-            // Do not want to set the belongsTo on this case.
-            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(
@@ -761,95 +673,6 @@ DS.Store.reopen({
   }
 });
 
-
-DS.FixtureAdapter.reopen({
-
-  /**
-   Overriding createRecord to add the record created to the
-   hashMany records for all of the records that this record belongsTo.
-
-   For example:
-
-   If models are defined like so:
-
-   User = DS.Model.extend({
-       projects: DS.hasMany('project')
-     })
-
-   Project = DS.Model.extend({
-       user: DS.belongsTo('user')
-     })
-
-   and you create a project record with a user defined:
-    store.createRecord('project', {user: user})
-
-   this method will take the new project created and add it to the user's 'projects'
-   hasMany array.
-
-   And a full code example:
-
-   var userJson = store.makeFixture('user');
-
-   store.find('user', userJson.id).then(function(user) {
-       store.createRecord('project', {user: user}).save()
-         .then( function(project) {
-           // user.get('projects.length') == 1;
-       })
-     })
-
-   @method createRecord
-   @param {DS.Store} store
-   @param {subclass of DS.Model} type
-   @param {DS.Model} record
-   @return {Promise} promise
-   */
-  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
-                );
-                if (hasManyName) {
-                  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.get('firstObject').constructor,
-                  record
-                );
-                belongsToRecord.forEach(function (child){
-                  Em.RSVP.resolve(child.get(hasManyName)).then( function(value) {
-                    value.addObjects(record);
-                  });
-                });
-              }
-            });
-          })
-        }
-      });
-    });
-
-    return promise;
-  }
-})
-
 FactoryGuyTestMixin = Em.Mixin.create({
 
   // Pass in the app root, which typically is App.
@@ -976,11 +799,18 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
 
-  handleSideLoadFind: function (modelName, json) {
-    var responseJson = this.buildAjaxHttpResponse(name, opts);
-    var id = responseJson[modelName].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)}
+    )
   },
 
 

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.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"){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)}}})},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}}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}}})},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);if(hasManyName){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.get("firstObject").constructor,record);belongsToRecord.forEach(function(child){Em.RSVP.resolve(child.get(hasManyName)).then(function(value){value.addObjects(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}}},buildURL:function(type,id){return this.getStore().adapterFor("application").buildURL(type,id)},handleSideLoadFind:function(modelName,json){var responseJson=this.buildAjaxHttpResponse(name,opts);var id=responseJson[modelName].id;var url=this.buildURL(modelName,id)},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)});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())}});

data/dist/factory_guy_has_many.js

@@ -78,18 +78,19 @@
             // cache the promise so we can use it
             // when we come back and don't need to rebuild
             // the relationship.
-            set(rel, 'promise', resolver.promise);
-            return rel;
+//            set(rel, 'promise', resolver.promise);
+            return relationship;
+//            return rel;
           });
         }
-
-        var promise = relationship.get('promise').then(function() {
-          return relationship;
-        }, null, "DS: Async hasMany records received");
-
-        return DS.PromiseArray.create({
-          promise: promise
-        });
+        return relationship;
+//        var promise = relationship.get('promise').then(function() {
+//          return relationship;
+//        }, null, "DS: Async hasMany records received");
+//
+//        return DS.PromiseArray.create({
+//          promise: promise
+//        });
       }
 
       return buildRelationship(this, key, options, function(store, data) {

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

data/src/factory_guy_test_mixin.js

@@ -124,11 +124,18 @@ FactoryGuyTestMixin = Em.Mixin.create({
   },
 
 
-  handleSideLoadFind: function (modelName, json) {
-    var responseJson = this.buildAjaxHttpResponse(name, opts);
-    var id = responseJson[modelName].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)}
+    )
   },
 
 

data/src/has_many.js

@@ -78,18 +78,19 @@
             // cache the promise so we can use it
             // when we come back and don't need to rebuild
             // the relationship.
-            set(rel, 'promise', resolver.promise);
-            return rel;
+//            set(rel, 'promise', resolver.promise);
+            return relationship;
+//            return rel;
           });
         }
-
-        var promise = relationship.get('promise').then(function() {
-          return relationship;
-        }, null, "DS: Async hasMany records received");
-
-        return DS.PromiseArray.create({
-          promise: promise
-        });
+        return relationship;
+//        var promise = relationship.get('promise').then(function() {
+//          return relationship;
+//        }, null, "DS: Async hasMany records received");
+//
+//        return DS.PromiseArray.create({
+//          promise: promise
+//        });
       }
 
       return buildRelationship(this, key, options, function(store, data) {

data/src/store.js

@@ -29,7 +29,7 @@ DS.Store.reopen({
 
       var model;
       Em.run(function () {
-        store.findEmbeddedBelongsToAssociationsForRESTAdapter(modelType, fixture);
+        store.findEmbeddedAssociationsForRESTAdapter(modelType, fixture);
         if (fixture.type) {
           // assuming its polymorphic if there is a type attribute
           // is this too bold an assumption?
@@ -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;
     }
@@ -137,7 +137,7 @@ DS.Store.reopen({
    @param modelType
    @param fixture
    */
-  findEmbeddedBelongsToAssociationsForRESTAdapter: function (modelType, fixture) {
+  findEmbeddedAssociationsForRESTAdapter: function (modelType, fixture) {
     var store = this;
     Ember.get(modelType, 'relationshipsByName').forEach(function (name, relationship) {
       if (relationship.kind == 'belongsTo') {
@@ -163,94 +163,6 @@ DS.Store.reopen({
     })
   },
 
-  /**
-   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});
-   ```
-
-   @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 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
-            );
-            // Guard against a situation where a model can belong to itself.
-            // Do not want to set the belongsTo on this case.
-            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(
@@ -294,92 +206,3 @@ DS.Store.reopen({
     }
   }
 });
-
-
-DS.FixtureAdapter.reopen({
-
-  /**
-   Overriding createRecord to add the record created to the
-   hashMany records for all of the records that this record belongsTo.
-
-   For example:
-
-   If models are defined like so:
-
-   User = DS.Model.extend({
-       projects: DS.hasMany('project')
-     })
-
-   Project = DS.Model.extend({
-       user: DS.belongsTo('user')
-     })
-
-   and you create a project record with a user defined:
-    store.createRecord('project', {user: user})
-
-   this method will take the new project created and add it to the user's 'projects'
-   hasMany array.
-
-   And a full code example:
-
-   var userJson = store.makeFixture('user');
-
-   store.find('user', userJson.id).then(function(user) {
-       store.createRecord('project', {user: user}).save()
-         .then( function(project) {
-           // user.get('projects.length') == 1;
-       })
-     })
-
-   @method createRecord
-   @param {DS.Store} store
-   @param {subclass of DS.Model} type
-   @param {DS.Model} record
-   @return {Promise} promise
-   */
-  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
-                );
-                if (hasManyName) {
-                  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.get('firstObject').constructor,
-                  record
-                );
-                belongsToRecord.forEach(function (child){
-                  Em.RSVP.resolve(child.get(hasManyName)).then( function(value) {
-                    value.addObjects(record);
-                  });
-                });
-              }
-            });
-          })
-        }
-      });
-    });
-
-    return promise;
-  }
-})