Finished tests for nested endpoints.

Author: jmdobry

dist/angular-data.js

@@ -2064,7 +2064,8 @@ function errorPrefix(resourceName) {
  * @id DS.async_methods:create
  * @name create
  * @description
- * Create a new resource and save it to the server.
+ * The "C" in "CRUD". Delegate to the `create` method of whatever adapter is being used (http by default) and inject the
+ * result into the data store.
  *
  * ## Signature:
  * ```js
@@ -2074,20 +2075,19 @@ function errorPrefix(resourceName) {
  * ## Example:
  *
  * ```js
- * DS.create('document', { author: 'John Anderson' })
- *  .then(function (document) {
- *      document; // { id: 'aab7ff66-e21e-46e2-8be8-264d82aee535', author: 'John Anderson' }
+ * DS.create('document', {
+ *   author: 'John Anderson'
+ * }).then(function (document) {
+ *   document; // { id: 5, author: 'John Anderson' }
  *
- *      // The new document is already in the data store
- *      DS.get('document', document.id); // { id: 'aab7ff66-e21e-46e2-8be8-264d82aee535', author: 'John Anderson' }
- *  }, function (err) {
- *      // handle error
- *  });
+ *   // The new document is already in the data store
+ *   DS.get('document', document.id); // { id: 5, author: 'John Anderson' }
+ * });
  * ```
  *
  * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc.
  * @param {object} attrs The attributes with which to create the item of the type specified by `resourceName`.
- * @param {object=} options Configuration options. Properties:
+ * @param {object=} options Configuration options. Passed directly to the adapter's `create` method. Properties:
  *
  * - `{boolean=}` - `cacheResponse` - Inject the data returned by the server into the data store. Default: `true`.
  * - `{boolean=}` - `upsert` - If `attrs` already contains a primary key, then attempt to call `DS.update` instead. Default: `true`.
@@ -2107,16 +2107,16 @@ function create(resourceName, attrs, options) {
   var DS = this;
   var deferred = DS.$q.defer();
   var promise = deferred.promise;
+  var definition = DS.definitions[resourceName];
 
   try {
     options = options || {};
 
-    if (!DS.definitions[resourceName]) {
+    if (!definition) {
       throw new DS.errors.NER(errorPrefix(resourceName) + resourceName);
     } else if (!DS.utils.isObject(attrs)) {
       throw new DS.errors.IA(errorPrefix(resourceName) + 'attrs: Must be an object!');
     }
-    var definition = DS.definitions[resourceName];
     var resource = DS.store[resourceName];
 
     if (!('cacheResponse' in options)) {

dist/angular-data.min.js

@@ -7,7 +7,8 @@ function errorPrefix(resourceName) {
  * @id DS.async_methods:create
  * @name create
  * @description
- * Create a new resource and save it to the server.
+ * The "C" in "CRUD". Delegate to the `create` method of whatever adapter is being used (http by default) and inject the
+ * result into the data store.
  *
  * ## Signature:
  * ```js
@@ -17,20 +18,19 @@ function errorPrefix(resourceName) {
  * ## Example:
  *
  * ```js
- * DS.create('document', { author: 'John Anderson' })
- *  .then(function (document) {
- *      document; // { id: 'aab7ff66-e21e-46e2-8be8-264d82aee535', author: 'John Anderson' }
+ * DS.create('document', {
+ *   author: 'John Anderson'
+ * }).then(function (document) {
+ *   document; // { id: 5, author: 'John Anderson' }
  *
- *      // The new document is already in the data store
- *      DS.get('document', document.id); // { id: 'aab7ff66-e21e-46e2-8be8-264d82aee535', author: 'John Anderson' }
- *  }, function (err) {
- *      // handle error
- *  });
+ *   // The new document is already in the data store
+ *   DS.get('document', document.id); // { id: 5, author: 'John Anderson' }
+ * });
  * ```
  *
  * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc.
  * @param {object} attrs The attributes with which to create the item of the type specified by `resourceName`.
- * @param {object=} options Configuration options. Properties:
+ * @param {object=} options Configuration options. Passed directly to the adapter's `create` method. Properties:
  *
  * - `{boolean=}` - `cacheResponse` - Inject the data returned by the server into the data store. Default: `true`.
  * - `{boolean=}` - `upsert` - If `attrs` already contains a primary key, then attempt to call `DS.update` instead. Default: `true`.
@@ -50,16 +50,16 @@ function create(resourceName, attrs, options) {
   var DS = this;
   var deferred = DS.$q.defer();
   var promise = deferred.promise;
+  var definition = DS.definitions[resourceName];
 
   try {
     options = options || {};
 
-    if (!DS.definitions[resourceName]) {
+    if (!definition) {
       throw new DS.errors.NER(errorPrefix(resourceName) + resourceName);
     } else if (!DS.utils.isObject(attrs)) {
       throw new DS.errors.IA(errorPrefix(resourceName) + 'attrs: Must be an object!');
     }
-    var definition = DS.definitions[resourceName];
     var resource = DS.store[resourceName];
 
     if (!('cacheResponse' in options)) {

src/datastore/async_methods/create.js

@@ -76,4 +76,31 @@ describe('DS.destroyAll(resourceName, params[, options]): ', function () {
 
     assert.deepEqual(DS.filter('post', {}), [], 'The posts should not be in the store yet');
   });
+  it('should handle nested resources', function () {
+    $httpBackend.expectDELETE('http://test.angular-cache.com/user/4/comment?content=test').respond(204);
+
+    DS.destroyAll('comment', {
+      content: 'test'
+    }, {
+      parentKey: 4
+    }).then(function () {
+    }, function (err) {
+      console.log(err);
+      fail('Should not have failed!');
+    });
+
+    $httpBackend.flush();
+
+    $httpBackend.expectDELETE('http://test.angular-cache.com/comment?content=test').respond(204);
+
+    DS.destroyAll('comment', {
+      content: 'test'
+    }).then(function () {
+    }, function (err) {
+      console.log(err);
+      fail('Should not have failed!');
+    });
+
+    $httpBackend.flush();
+  });
 });

test/integration/datastore/async_methods/destroyAll.test.js

@@ -234,4 +234,51 @@ describe('DS.findAll(resourceName, params[, options]): ', function () {
     assert.equal(lifecycle.serialize.callCount, 0, 'serialize should have been called');
     assert.equal(lifecycle.deserialize.callCount, 1, 'deserialize should have been called');
   });
+  it('should handle nested resources', function () {
+    var testComment = {
+      id: 5,
+      content: 'test',
+      approvedBy: 4
+    };
+    var testComment2 = {
+      id: 6,
+      content: 'test',
+      approvedBy: 4
+    };
+    $httpBackend.expectGET('http://test.angular-cache.com/user/4/comment?content=test').respond(200, [testComment, testComment2]);
+
+    DS.findAll('comment', {
+      content: 'test'
+    }, {
+      parentKey: 4
+    }).then(function (comments) {
+      assert.deepEqual(comments, [testComment, testComment2]);
+      assert.deepEqual(comments, DS.filter('comment', {
+        content: 'test'
+      }));
+    }, function () {
+      fail('Should not have failed!');
+    });
+
+    $httpBackend.flush();
+
+    DS.ejectAll('comment');
+
+    $httpBackend.expectGET('http://test.angular-cache.com/comment?content=test').respond(200, [testComment, testComment2]);
+
+    DS.findAll('comment', {
+      content: 'test'
+    }, {
+      bypassCache: true
+    }).then(function (comments) {
+      assert.deepEqual(comments, [testComment, testComment2]);
+      assert.deepEqual(comments, DS.filter('comment', {
+        content: 'test'
+      }));
+    }, function () {
+      fail('Should not have failed!');
+    });
+
+    $httpBackend.flush();
+  });
 });

test/integration/datastore/async_methods/findAll.test.js

@@ -96,4 +96,58 @@ describe('DS.updateAll(resourceName, attrs, params[, options])', function () {
     assert.equal(lifecycle.serialize.callCount, 2, 'serialize should have been called');
     assert.equal(lifecycle.deserialize.callCount, 2, 'deserialize should have been called');
   });
+  it('should handle nested resources', function () {
+    var testComment = {
+      id: 5,
+      content: 'stuff',
+      approvedBy: 4
+    };
+    var testComment2 = {
+      id: 6,
+      content: 'stuff',
+      approvedBy: 4
+    };
+    $httpBackend.expectPUT('http://test.angular-cache.com/user/4/comment?content=test').respond(200, [testComment, testComment2]);
+
+    DS.inject('comment', testComment);
+
+    DS.updateAll('comment', {
+      content: 'stuff'
+    }, {
+      content: 'test'
+    }, {
+      parentKey: 4
+    }).then(function (comments) {
+      assert.deepEqual(comments, [testComment, testComment2]);
+      assert.deepEqual(comments, DS.filter('comment', {
+        content: 'stuff'
+      }));
+    }, function () {
+      fail('Should not have failed!');
+    });
+
+    $httpBackend.flush();
+
+    DS.ejectAll('comment');
+
+    $httpBackend.expectPUT('http://test.angular-cache.com/comment?content=test').respond(200, [testComment, testComment2]);
+
+    DS.inject('comment', testComment2);
+
+    DS.updateAll('comment', {
+      content: 'stuff'
+    }, {
+      content: 'test'
+    }).then(function (comments) {
+      assert.deepEqual(comments, [testComment, testComment2]);
+      assert.deepEqual(comments, DS.filter('comment', {
+        content: 'stuff',
+        sort: 'id'
+      }));
+    }, function () {
+      fail('Should not have failed!');
+    });
+
+    $httpBackend.flush();
+  });
 });