Fixes #69

jmdobry · jmdobry · commit 17cdf07bf84a · 2014-05-30T13:14:11.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 0.9.1 - xx May 2014
+
+###### Backwards compatible bug fixes
+- #69 - Failed requests should throw an error, not just return it
+
 ##### 0.9.0 - 22 May 2014
 
 ###### Breaking API changes
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 __Data store for Angular.js.__
 
-__Latest Release:__ [0.8.1](http://angular-data.codetrain.io/)
-__master:__ [0.9.0](http://angular-data-next.codetrain.io/)
+__Latest Release:__ [0.9.1](http://angular-data.codetrain.io/)
+__master:__ [0.9.1](http://angular-data-next.codetrain.io/)
 
 Angular-data is in a pre-1.0.0 development stage; the API is fluctuating, not a lot of tests yet, etc.
 
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "author": "Jason Dobry",
   "name": "angular-data",
   "description": "Data store for Angular.js.",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "homepage": "http://angular-data.codetrain.io/",
   "repository": {
     "type": "git",
diff --git a/dist/angular-data.js b/dist/angular-data.js
@@ -2182,7 +2182,7 @@ function find(resourceName, id, options) {
 							}
 						}, function (err) {
 							delete resource.pendingQueries[id];
-							return err;
+							return _this.$q.reject(err);
 						});
 				}
 
@@ -2243,14 +2243,14 @@ function _findAll(utils, resourceName, params, options) {
 						try {
 							return processResults.apply(_this, [utils, data, resourceName, queryHash]);
 						} catch (err) {
-							throw new _this.errors.UnhandledError(err);
+							return _this.$q.reject(_this.errors.UnhandledError(err));
 						}
 					} else {
 						return data;
 					}
 				}, function (err) {
 					delete resource.pendingQueries[queryHash];
-					return err;
+					return _this.$q.reject(err);
 				});
 		}
 
@@ -4220,13 +4220,14 @@ function get(resourceName, id, options) {
 	} else if (!this.utils.isObject(options)) {
 		throw new this.errors.IllegalArgumentError(errorPrefix + 'options: Must be an object!', { options: { actual: typeof options, expected: 'object' } });
 	}
+	var _this = this;
 
 	try {
 		// cache miss, request resource from server
 		var item = this.store[resourceName].index.get(id);
 		if (!item && options.loadFromServer) {
 			this.find(resourceName, id).then(null, function (err) {
-				throw err;
+				return _this.$q.reject(err);
 			});
 		}
 
@@ -4963,7 +4964,7 @@ module.exports = [function () {
 	 * @id angular-data
 	 * @name angular-data
 	 * @description
-	 * __Version:__ 0.9.0
+	 * __Version:__ 0.9.1
 	 *
 	 * ## Install
 	 *
diff --git a/dist/angular-data.min.js b/dist/angular-data.min.js
diff --git a/guide/nav.html b/guide/nav.html
@@ -72,7 +72,7 @@
                         <i class="icon-wrench icon-white"></i> API <b class="caret"></b>
                     </a>
                     <ul class="dropdown-menu">
-                        <li class="nav-header">Angular-data - 0.9.0</li>
+                        <li class="nav-header">Angular-data - 0.9.1</li>
                         <li>
                             <a href="/documentation/api/angular-data/angular-data">Overview</a>
                         </li>
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-data",
   "description": "Data store for Angular.js.",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "homepage": "http://angular-data.codetrain.io",
   "repository": {
     "type": "git",
diff --git a/src/datastore/async_methods/find.js b/src/datastore/async_methods/find.js
@@ -86,7 +86,7 @@ function find(resourceName, id, options) {
 							}
 						}, function (err) {
 							delete resource.pendingQueries[id];
-							return err;
+							return _this.$q.reject(err);
 						});
 				}
 
diff --git a/src/datastore/async_methods/findAll.js b/src/datastore/async_methods/findAll.js
@@ -40,14 +40,14 @@ function _findAll(utils, resourceName, params, options) {
 						try {
 							return processResults.apply(_this, [utils, data, resourceName, queryHash]);
 						} catch (err) {
-							throw new _this.errors.UnhandledError(err);
+							return _this.$q.reject(_this.errors.UnhandledError(err));
 						}
 					} else {
 						return data;
 					}
 				}, function (err) {
 					delete resource.pendingQueries[queryHash];
-					return err;
+					return _this.$q.reject(err);
 				});
 		}
 
diff --git a/src/datastore/sync_methods/get.js b/src/datastore/sync_methods/get.js
@@ -41,13 +41,14 @@ function get(resourceName, id, options) {
 	} else if (!this.utils.isObject(options)) {
 		throw new this.errors.IllegalArgumentError(errorPrefix + 'options: Must be an object!', { options: { actual: typeof options, expected: 'object' } });
 	}
+	var _this = this;
 
 	try {
 		// cache miss, request resource from server
 		var item = this.store[resourceName].index.get(id);
 		if (!item && options.loadFromServer) {
 			this.find(resourceName, id).then(null, function (err) {
-				throw err;
+				return _this.$q.reject(err);
 			});
 		}
 
diff --git a/src/index.js b/src/index.js
@@ -6,7 +6,7 @@
 	 * @id angular-data
 	 * @name angular-data
 	 * @description
-	 * __Version:__ 0.9.0
+	 * __Version:__ 0.9.1
 	 *
 	 * ## Install
 	 *
diff --git a/test/integration/datastore/async_methods/find.test.js b/test/integration/datastore/async_methods/find.test.js
@@ -100,4 +100,15 @@ describe('DS.find(resourceName, id[, 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 correctly propagate errors', function () {
+		$httpBackend.expectGET('http://test.angular-cache.com/posts/5').respond(404, 'Not Found');
+
+		DS.find('post', 5).then(function () {
+			fail('Should not have succeeded!');
+		}, function (err) {
+			assert.equal(err.data, 'Not Found');
+		});
+
+		$httpBackend.flush();
+	});
 });
diff --git a/test/integration/datastore/async_methods/findAll.test.js b/test/integration/datastore/async_methods/findAll.test.js
@@ -101,4 +101,15 @@ 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 correctly propagate errors', function () {
+		$httpBackend.expectGET(/http:\/\/test\.angular-cache\.com\/posts\??/).respond(404, 'Not Found');
+
+		DS.findAll('post', {}).then(function () {
+			fail('Should not have succeeded!');
+		}, function (err) {
+			assert.equal(err.data, 'Not Found');
+		});
+
+		$httpBackend.flush();
+	});
 });

Original file line number	Diff line number	Diff line change
`@@ -2182,7 +2182,7 @@ function find(resourceName, id, options) {`
`2182`	`2182`	`}`
`2183`	`2183`	`}, function (err) {`
`2184`	`2184`	`delete resource.pendingQueries[id];`
`2185`		`- return err;`
	`2185`	`+ return _this.$q.reject(err);`
`2186`	`2186`	`});`
`2187`	`2187`	`}`
`2188`	`2188`
`@@ -2243,14 +2243,14 @@ function _findAll(utils, resourceName, params, options) {`
`2243`	`2243`	`try {`
`2244`	`2244`	`return processResults.apply(_this, [utils, data, resourceName, queryHash]);`
`2245`	`2245`	`} catch (err) {`
`2246`		`- throw new _this.errors.UnhandledError(err);`
	`2246`	`+ return _this.$q.reject(_this.errors.UnhandledError(err));`
`2247`	`2247`	`}`
`2248`	`2248`	`} else {`
`2249`	`2249`	`return data;`
`2250`	`2250`	`}`
`2251`	`2251`	`}, function (err) {`
`2252`	`2252`	`delete resource.pendingQueries[queryHash];`
`2253`		`- return err;`
	`2253`	`+ return _this.$q.reject(err);`
`2254`	`2254`	`});`
`2255`	`2255`	`}`
`2256`	`2256`
`@@ -4220,13 +4220,14 @@ function get(resourceName, id, options) {`
`4220`	`4220`	`} else if (!this.utils.isObject(options)) {`
`4221`	`4221`	`throw new this.errors.IllegalArgumentError(errorPrefix + 'options: Must be an object!', { options: { actual: typeof options, expected: 'object' } });`
`4222`	`4222`	`}`
	`4223`	`+ var _this = this;`
`4223`	`4224`
`4224`	`4225`	`try {`
`4225`	`4226`	`// cache miss, request resource from server`
`4226`	`4227`	`var item = this.store[resourceName].index.get(id);`
`4227`	`4228`	`if (!item && options.loadFromServer) {`
`4228`	`4229`	`this.find(resourceName, id).then(null, function (err) {`
`4229`		`- throw err;`
	`4230`	`+ return _this.$q.reject(err);`
`4230`	`4231`	`});`
`4231`	`4232`	`}`
`4232`	`4233`
`@@ -4963,7 +4964,7 @@ module.exports = [function () {`
`4963`	`4964`	`* @id angular-data`
`4964`	`4965`	`* @name angular-data`
`4965`	`4966`	`* @description`
`4966`		`- * __Version:__ 0.9.0`
	`4967`	`+ * __Version:__ 0.9.1`
`4967`	`4968`	`*`
`4968`	`4969`	`* ## Install`
`4969`	`4970`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-data",`
`3`	`3`	`"description": "Data store for Angular.js.",`
`4`		`- "version": "0.9.0",`
	`4`	`+ "version": "0.9.1",`
`5`	`5`	`"homepage": "http://angular-data.codetrain.io",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ function find(resourceName, id, options) {`
`86`	`86`	`}`
`87`	`87`	`}, function (err) {`
`88`	`88`	`delete resource.pendingQueries[id];`
`89`		`- return err;`
	`89`	`+ return _this.$q.reject(err);`
`90`	`90`	`});`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ function _findAll(utils, resourceName, params, options) {`
`40`	`40`	`try {`
`41`	`41`	`return processResults.apply(_this, [utils, data, resourceName, queryHash]);`
`42`	`42`	`} catch (err) {`
`43`		`- throw new _this.errors.UnhandledError(err);`
	`43`	`+ return _this.$q.reject(_this.errors.UnhandledError(err));`
`44`	`44`	`}`
`45`	`45`	`} else {`
`46`	`46`	`return data;`
`47`	`47`	`}`
`48`	`48`	`}, function (err) {`
`49`	`49`	`delete resource.pendingQueries[queryHash];`
`50`		`- return err;`
	`50`	`+ return _this.$q.reject(err);`
`51`	`51`	`});`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,14 @@ function get(resourceName, id, options) {`
`41`	`41`	`} else if (!this.utils.isObject(options)) {`
`42`	`42`	`throw new this.errors.IllegalArgumentError(errorPrefix + 'options: Must be an object!', { options: { actual: typeof options, expected: 'object' } });`
`43`	`43`	`}`
	`44`	`+ var _this = this;`
`44`	`45`
`45`	`46`	`try {`
`46`	`47`	`// cache miss, request resource from server`
`47`	`48`	`var item = this.store[resourceName].index.get(id);`
`48`	`49`	`if (!item && options.loadFromServer) {`
`49`	`50`	`this.find(resourceName, id).then(null, function (err) {`
`50`		`- throw err;`
	`51`	`+ return _this.$q.reject(err);`
`51`	`52`	`});`
`52`	`53`	`}`
`53`	`54`