supporting sideloads

staugaard · Jul 6, 2012 · e50cf41 · e50cf41
1 parent fb70156
commit e50cf41
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 12 deletions.
diff --git a/dist/ember-resource.js b/dist/ember-resource.js
@@ -1046,6 +1046,7 @@ if (typeof this === 'object') this.LRUCache = LRUCache;
     },
 
     fetch: function() {
+      var ajaxOptions, sideloads;
       if (!Ember.get(this, 'isFetchable')) return $.when();
 
       var url = this.resourceURL();
@@ -1059,13 +1060,20 @@ if (typeof this === 'object') this.LRUCache = LRUCache;
       self.willFetch.call(self);
       Ember.sendEvent(self, 'willFetch');
 
-      this.deferedFetch = Ember.Resource.ajax({
+      ajaxOptions = {
         url: url,
         resource: this,
-        operation: 'read',
-        success: function(json) {
-          self.updateWithApiData(json);
-        }
+        operation: 'read'
+      };
+
+      sideloads = this.constructor.sideloads;
+
+      if(sideloads && sideloads.length !== 0) {
+        ajaxOptions.data = {include: sideloads.join(",")};
+      }
+
+      this.deferedFetch = Ember.Resource.ajax(ajaxOptions).done(function(json) {
+        self.updateWithApiData(json);
       });
 
       this.deferedFetch.fail(function() {
@@ -1074,7 +1082,7 @@ if (typeof this === 'object') this.LRUCache = LRUCache;
         self.fetched().reject();
       });
 
-      this.deferedFetch.success(function() {
+      this.deferedFetch.done(function() {
         self.didFetch.call(self);
         Ember.sendEvent(self, 'didFetch');
         self.fetched().resolve();
@@ -1337,6 +1345,10 @@ if (typeof this === 'object') this.LRUCache = LRUCache;
         classOptions.identityMapLimit = options.identityMapLimit;
       }
 
+      if(options.sideloads) {
+        classOptions.sideloads = options.sideloads;
+      }
+
       klass.reopenClass(classOptions);
 
       return klass;

diff --git a/spec/javascripts/resourceSpec.js b/spec/javascripts/resourceSpec.js
@@ -13,6 +13,37 @@ describe('A Resource instance', function() {
 
   });
 
+
+  describe("defining a resource", function() {
+
+    describe("with a sideloads attribute", function() {
+      var subject;
+      beforeEach(function() {
+        subject = Em.Resource.define({
+          url: "/users",
+          sideloads: ["abilities", "weapons"]
+        });
+      });
+
+      it("should not include the sideloads in resourceURL", function() {
+        var user = subject.create({id: 1});
+        expect(user.resourceURL()).toEqual("/users/1");
+      });
+
+      it("should send the sideloads in AJAX fetches", function() {
+        var user = subject.create({id: 1});
+        spyOn(Em.Resource, 'ajax').andReturn($.when());
+        user.fetch();
+        expect(Em.Resource.ajax).toHaveBeenCalledWith({
+          url: "/users/1",
+          resource: user,
+          operation: 'read',
+          data: {include: "abilities,weapons"}
+        });
+      });
+    });
+  });
+
   describe('with no ID', function() {
 
     beforeEach(function() {

diff --git a/src/ember-resource.js b/src/ember-resource.js
@@ -758,6 +758,7 @@
     },
 
     fetch: function() {
+      var ajaxOptions, sideloads;
       if (!Ember.get(this, 'isFetchable')) return $.when();
 
       var url = this.resourceURL();
@@ -771,13 +772,20 @@
       self.willFetch.call(self);
       Ember.sendEvent(self, 'willFetch');
 
-      this.deferedFetch = Ember.Resource.ajax({
+      ajaxOptions = {
         url: url,
         resource: this,
-        operation: 'read',
-        success: function(json) {
-          self.updateWithApiData(json);
-        }
+        operation: 'read'
+      };
+
+      sideloads = this.constructor.sideloads;
+
+      if(sideloads && sideloads.length !== 0) {
+        ajaxOptions.data = {include: sideloads.join(",")};
+      }
+
+      this.deferedFetch = Ember.Resource.ajax(ajaxOptions).done(function(json) {
+        self.updateWithApiData(json);
       });
 
       this.deferedFetch.fail(function() {
@@ -786,7 +794,7 @@
         self.fetched().reject();
       });
 
-      this.deferedFetch.success(function() {
+      this.deferedFetch.done(function() {
         self.didFetch.call(self);
         Ember.sendEvent(self, 'didFetch');
         self.fetched().resolve();
@@ -1049,6 +1057,10 @@
         classOptions.identityMapLimit = options.identityMapLimit;
       }
 
+      if(options.sideloads) {
+        classOptions.sideloads = options.sideloads;
+      }
+
       klass.reopenClass(classOptions);
 
       return klass;