Fixes #69

Author: jmdobry

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

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.
 

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",

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
 	 *

dist/angular-data.min.js

@@ -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>

guide/nav.html

@@ -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",

package.json

@@ -86,7 +86,7 @@ function find(resourceName, id, options) {
 							}
 						}, function (err) {
 							delete resource.pendingQueries[id];
-							return err;
+							return _this.$q.reject(err);
 						});
 				}
 

src/datastore/async_methods/find.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);
 				});
 		}
 

src/datastore/async_methods/findAll.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);
 			});
 		}
 

src/datastore/sync_methods/get.js

@@ -6,7 +6,7 @@
 	 * @id angular-data
 	 * @name angular-data
 	 * @description
-	 * __Version:__ 0.9.0
+	 * __Version:__ 0.9.1
 	 *
 	 * ## Install
 	 *

src/index.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();
+	});
 });

test/integration/datastore/async_methods/find.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();
+	});
 });