Resource promise

src/ngResource/resource.js

@@ -88,6 +88,8 @@
  *   - non-GET "class" actions: `Resource.action([parameters], postData, [success], [error])`
  *   - non-GET instance actions:  `instance.$action([parameters], [success], [error])`
  *
+ *   The Resource object now contains the promise from the underlying {@link ng.$http} call, which is accessable
+ *   by the `$q` property, as well as a `$resolved` property, which is set to `true` when the promise is resolved (or rejected).
  *
  * @example
  *
@@ -367,14 +369,20 @@ angular.module('ngResource', ['ng']).
           }
 
           var value = this instanceof Resource ? this : (action.isArray ? [] : new Resource(data));
-          $http({
+
+          value.$resolved = false;
+          var resolved = function () {value.$resolved = true;};
+
+          value.$q = $http({
             method: action.method,
             url: route.url(extend({}, extractParams(data, action.params || {}), params)),
             data: data,
             headers: extend({}, action.headers || {})
-          }).then(function(response) {
-              var data = response.data;
+          }).success(resolved).error(resolved);
 
+          value.$q.then(function(response) {
+              var data = response.data;
+              var q = value.$q, resolved = value.$resolved;
               if (data) {
                 if (action.isArray) {
                   value.length = 0;
@@ -383,6 +391,8 @@ angular.module('ngResource', ['ng']).
                   });
                 } else {
                   copy(data, value);
+                  value.$q = q;
+                  value.$resolved = resolved;
                 }
               }
               (success||noop)(value, response.headers);

test/ngResource/resourceSpec.js

@@ -228,7 +228,7 @@ describe("resource", function() {
     $httpBackend.expect('GET', '/CreditCard?key=value').respond([{id: 1}, {id: 2}]);
 
     var ccs = CreditCard.query({key: 'value'}, callback);
-    expect(ccs).toEqual([]);
+    expect(ccs).toEqualData([]);
     expect(callback).not.toHaveBeenCalled();
 
     $httpBackend.flush();
@@ -354,6 +354,53 @@ describe("resource", function() {
     expect(person.name).toEqual('misko');
   });
 
+  it("should have $q and $resolved properties for get", function () {
+    $httpBackend.expect('GET', '/CreditCard/123').respond({id: 123, number: '9876'});
+    var cc = CreditCard.get({id: 123}, callback);
+    expect(cc.$q).toBeDefined();
+    expect(typeof cc.$q).toBe('object');
+    expect(cc.$resolved).toBeFalsy();
+    $httpBackend.flush();
+    expect(cc.$q).toBeDefined();
+    expect(cc.$resolved).toBeTruthy();
+  });
+
+  it("should have $q and $resolved properties for query", function() {
+    $httpBackend.expect('GET', '/CreditCard?key=value').respond([{id: 1}, {id: 2}]);
+
+    var ccs = CreditCard.query({key: 'value'}, callback);
+    expect(ccs.$q).toBeDefined();
+    expect(typeof ccs.$q).toBe('object');
+    expect(ccs.$resolved).toBeFalsy();
+    $httpBackend.flush();
+    expect(ccs.$q).toBeDefined();
+    expect(ccs.$resolved).toBeTruthy();
+  });
+
+  it("should have $q and $resolved properties for save", function() {
+    $httpBackend.expect('POST', '/CreditCard/123', '{"id":{"key":123},"name":"misko"}').
+                 respond({id: {key: 123}, name: 'rama'});
+
+    var cc = CreditCard.save({id: {key: 123}, name: 'misko'}, callback);
+    expect(cc.$q).toBeDefined();
+    expect(typeof cc.$q).toBe('object');
+    expect(cc.$resolved).toBeFalsy();
+    $httpBackend.flush();
+    expect(cc.$q).toBeDefined();
+    expect(cc.$resolved).toBeTruthy();
+  });
+
+  it('should should have $q and $resolved properties for delete', function() {
+    $httpBackend.expect('DELETE', '/CreditCard/123').respond({});
+    var removed = CreditCard.remove({id:123}, callback);
+    expect(removed.$q).toBeDefined();
+    expect(typeof removed.$q).toBe('object');
+    expect(removed.$resolved).toBeFalsy();
+    $httpBackend.flush();
+    expect(removed.$q).toBeDefined();
+    expect(removed.$resolved).toBeTruthy();
+  });
+
 
   describe('failure mode', function() {
     var ERROR_CODE = 500,