From 17cdf07bf84aad2f38d5f5aa26f6054f19334ee0 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Fri, 30 May 2014 13:14:11 -0600 Subject: [PATCH 1/3] Fixes #69 --- CHANGELOG.md | 5 +++++ README.md | 4 ++-- bower.json | 2 +- dist/angular-data.js | 11 ++++++----- dist/angular-data.min.js | 4 ++-- guide/nav.html | 2 +- package.json | 2 +- src/datastore/async_methods/find.js | 2 +- src/datastore/async_methods/findAll.js | 4 ++-- src/datastore/sync_methods/get.js | 3 ++- src/index.js | 2 +- test/integration/datastore/async_methods/find.test.js | 11 +++++++++++ .../datastore/async_methods/findAll.test.js | 11 +++++++++++ 13 files changed, 46 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d26ced2..26b278d 100644 --- 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 index 2a99dee..a36ceba 100644 --- 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 index 74e7a41..4e00d2d 100644 --- 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 index 70265ce..3ff8cfd 100644 --- 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 index 8509418..6090e6b 100644 --- a/dist/angular-data.min.js +++ b/dist/angular-data.min.js @@ -7,5 +7,5 @@ * * @overview Data store for Angular.js. */ -!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gb&&a.check();)a.report(),b++}function e(a){for(var b in a)return!1;return!0}function f(a){return e(a.added)&&e(a.removed)&&e(a.changed)}function g(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var f in a)f in b||(c[f]=a[f]);return Array.isArray(a)&&a.length!==b.length&&(e.length=a.length),{added:c,removed:d,changed:e}}function h(a,b){var c=b||(Array.isArray(a)?[]:{});for(var d in a)c[d]=a[d];return Array.isArray(a)&&(c.length=a.length),c}function i(a,b,c,d){if(this.closed=!1,this.object=a,this.callback=b,this.target=c,this.token=d,this.reporting=!0,n){var e=this;this.boundInternalCallback=function(a){e.internalCallback(a)}}j(this),this.connect(),this.sync(!0)}function j(a){u&&(t.push(a),i._allObserversCount++)}function k(a,b,c,d){i.call(this,a,b,c,d)}function l(a){this.arr=[],this.callback=a,this.isObserved=!0}function m(a,b,c){for(var d={},e={},f=0;fa&&b.anyChanged);i._allObserversCount=t.length,v=!1}}},u&&(a.Platform.clearObservers=function(){t=[]}),k.prototype=r({__proto__:i.prototype,connect:function(){n&&Object.observe(this.object,this.boundInternalCallback)},sync:function(){n||(this.oldObject=h(this.object))},check:function(a){var b,c;if(n){if(!a)return!1;c={},b=m(this.object,a,c)}else c=this.oldObject,b=g(this.object,this.oldObject);return f(b)?!1:(this.reportArgs=[b.added||{},b.removed||{},b.changed||{}],this.reportArgs.push(function(a){return c[a]}),!0)},disconnect:function(){n?this.object&&Object.unobserve(this.object,this.boundInternalCallback):this.oldObject=void 0}});var x=Object.getPrototypeOf({}),y=Object.getPrototypeOf([]);l.prototype={reset:function(){this.isObserved=!this.isObserved},observe:function(a){if(c(a)&&a!==x&&a!==y){var b=this.arr.indexOf(a);b>=0&&this.arr[b+1]===this.isObserved||(0>b&&(b=this.arr.length,this.arr[b]=a,Object.observe(a,this.callback)),this.arr[b+1]=this.isObserved,this.observe(Object.getPrototypeOf(a)))}},cleanup:function(){for(var a=0,b=0,c=this.isObserved;ba&&(this.arr[a]=d,this.arr[a+1]=c),a+=2):Object.unobserve(d,this.callback),b+=2}this.arr.length=a}};var z={"new":!0,updated:!0,deleted:!0};a.Observer=i,a.Observer.hasObjectObserve=n,a.ObjectObserver=k}((c.Number={isNaN:window.isNaN})?c:c)}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],2:[function(a,b){function c(a,b){return-1!==d(a,b)}var d=a("./indexOf");b.exports=c},{"./indexOf":5}],3:[function(a,b){function c(a,b,c){b=d(b,c);var e=[];if(null==a)return e;for(var f,g=-1,h=a.length;++gc?d+c:c;d>e;){if(a[e]===b)return e;e++}return-1}b.exports=c},{}],6:[function(a,b){function c(a){return null!=a&&""!==a}function d(a,b){return b=b||"",e(a,c).join(b)}var e=a("./filter");b.exports=d},{"./filter":3}],7:[function(a,b){function c(a,b,c){var d=a.length;b=null==b?0:0>b?Math.max(d+b,0):Math.min(b,d),c=null==c?d:0>c?Math.max(d+c,0):Math.min(c,d);for(var e=[];c>b;)e.push(a[b++]);return e}b.exports=c},{}],8:[function(a,b){function c(a,b){if(null==a)return[];if(a.length<2)return a;null==b&&(b=d);var f,g,h;return f=~~(a.length/2),g=c(a.slice(0,f),b),h=c(a.slice(f,a.length),b),e(g,h,b)}function d(a,b){return b>a?-1:a>b?1:0}function e(a,b,c){for(var d=[];a.length&&b.length;)d.push(c(a[0],b[0])<=0?a.shift():b.shift());return a.length&&d.push.apply(d,a),b.length&&d.push.apply(d,b),d}b.exports=c},{}],9:[function(a,b){function c(a,b){var c={};if(null==a)return c;var e,f=-1,g=a.length;if(d(b))for(;++f"in a?d=d&&c[b]>a[">"]:">="in a?d=d&&c[b]>=a[">="]:"<"in a?d=d&&c[b]e?-1:e>d?1:0:e>d?-1:d>e?1:0})}}return this.utils.isNumber(b.query.limit)&&this.utils.isNumber(b.query.skip)?i=this.utils.slice(i,b.query.skip,Math.min(i.length,b.query.skip+b.query.limit)):this.utils.isNumber(b.query.limit)?i=this.utils.slice(i,0,Math.min(i.length,b.query.limit)):this.utils.isNumber(b.query.skip)&&(i=b.query.skip=b?a+1:b},deepFreeze:function b(a){if("function"==typeof Object.freeze){var c,d;Object.freeze(a);for(d in a)c=a[d],a.hasOwnProperty(d)&&"object"==typeof c&&!Object.isFrozen(c)&&b(c)}},diffObjectFromOldObject:function(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var h in a)h in b||(c[h]=a[h]);return{added:c,removed:d,changed:e}}}}]},{"mout/array/contains":2,"mout/array/filter":3,"mout/array/slice":7,"mout/array/sort":8,"mout/array/toLookup":9,"mout/lang/isEmpty":14,"mout/object/deepMixIn":21,"mout/object/forOwn":23,"mout/object/pick":26,"mout/object/set":27,"mout/string/makePath":28,"mout/string/upperCase":29}]},{},[59]); \ No newline at end of file +!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gb&&a.check();)a.report(),b++}function e(a){for(var b in a)return!1;return!0}function f(a){return e(a.added)&&e(a.removed)&&e(a.changed)}function g(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var f in a)f in b||(c[f]=a[f]);return Array.isArray(a)&&a.length!==b.length&&(e.length=a.length),{added:c,removed:d,changed:e}}function h(a,b){var c=b||(Array.isArray(a)?[]:{});for(var d in a)c[d]=a[d];return Array.isArray(a)&&(c.length=a.length),c}function i(a,b,c,d){if(this.closed=!1,this.object=a,this.callback=b,this.target=c,this.token=d,this.reporting=!0,n){var e=this;this.boundInternalCallback=function(a){e.internalCallback(a)}}j(this),this.connect(),this.sync(!0)}function j(a){u&&(t.push(a),i._allObserversCount++)}function k(a,b,c,d){i.call(this,a,b,c,d)}function l(a){this.arr=[],this.callback=a,this.isObserved=!0}function m(a,b,c){for(var d={},e={},f=0;fa&&b.anyChanged);i._allObserversCount=t.length,v=!1}}},u&&(a.Platform.clearObservers=function(){t=[]}),k.prototype=r({__proto__:i.prototype,connect:function(){n&&Object.observe(this.object,this.boundInternalCallback)},sync:function(){n||(this.oldObject=h(this.object))},check:function(a){var b,c;if(n){if(!a)return!1;c={},b=m(this.object,a,c)}else c=this.oldObject,b=g(this.object,this.oldObject);return f(b)?!1:(this.reportArgs=[b.added||{},b.removed||{},b.changed||{}],this.reportArgs.push(function(a){return c[a]}),!0)},disconnect:function(){n?this.object&&Object.unobserve(this.object,this.boundInternalCallback):this.oldObject=void 0}});var x=Object.getPrototypeOf({}),y=Object.getPrototypeOf([]);l.prototype={reset:function(){this.isObserved=!this.isObserved},observe:function(a){if(c(a)&&a!==x&&a!==y){var b=this.arr.indexOf(a);b>=0&&this.arr[b+1]===this.isObserved||(0>b&&(b=this.arr.length,this.arr[b]=a,Object.observe(a,this.callback)),this.arr[b+1]=this.isObserved,this.observe(Object.getPrototypeOf(a)))}},cleanup:function(){for(var a=0,b=0,c=this.isObserved;ba&&(this.arr[a]=d,this.arr[a+1]=c),a+=2):Object.unobserve(d,this.callback),b+=2}this.arr.length=a}};var z={"new":!0,updated:!0,deleted:!0};a.Observer=i,a.Observer.hasObjectObserve=n,a.ObjectObserver=k}((c.Number={isNaN:window.isNaN})?c:c)}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],2:[function(a,b){function c(a,b){return-1!==d(a,b)}var d=a("./indexOf");b.exports=c},{"./indexOf":5}],3:[function(a,b){function c(a,b,c){b=d(b,c);var e=[];if(null==a)return e;for(var f,g=-1,h=a.length;++gc?d+c:c;d>e;){if(a[e]===b)return e;e++}return-1}b.exports=c},{}],6:[function(a,b){function c(a){return null!=a&&""!==a}function d(a,b){return b=b||"",e(a,c).join(b)}var e=a("./filter");b.exports=d},{"./filter":3}],7:[function(a,b){function c(a,b,c){var d=a.length;b=null==b?0:0>b?Math.max(d+b,0):Math.min(b,d),c=null==c?d:0>c?Math.max(d+c,0):Math.min(c,d);for(var e=[];c>b;)e.push(a[b++]);return e}b.exports=c},{}],8:[function(a,b){function c(a,b){if(null==a)return[];if(a.length<2)return a;null==b&&(b=d);var f,g,h;return f=~~(a.length/2),g=c(a.slice(0,f),b),h=c(a.slice(f,a.length),b),e(g,h,b)}function d(a,b){return b>a?-1:a>b?1:0}function e(a,b,c){for(var d=[];a.length&&b.length;)d.push(c(a[0],b[0])<=0?a.shift():b.shift());return a.length&&d.push.apply(d,a),b.length&&d.push.apply(d,b),d}b.exports=c},{}],9:[function(a,b){function c(a,b){var c={};if(null==a)return c;var e,f=-1,g=a.length;if(d(b))for(;++f"in a?d=d&&c[b]>a[">"]:">="in a?d=d&&c[b]>=a[">="]:"<"in a?d=d&&c[b]e?-1:e>d?1:0:e>d?-1:d>e?1:0})}}return this.utils.isNumber(b.query.limit)&&this.utils.isNumber(b.query.skip)?i=this.utils.slice(i,b.query.skip,Math.min(i.length,b.query.skip+b.query.limit)):this.utils.isNumber(b.query.limit)?i=this.utils.slice(i,0,Math.min(i.length,b.query.limit)):this.utils.isNumber(b.query.skip)&&(i=b.query.skip=b?a+1:b},deepFreeze:function b(a){if("function"==typeof Object.freeze){var c,d;Object.freeze(a);for(d in a)c=a[d],a.hasOwnProperty(d)&&"object"==typeof c&&!Object.isFrozen(c)&&b(c)}},diffObjectFromOldObject:function(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var h in a)h in b||(c[h]=a[h]);return{added:c,removed:d,changed:e}}}}]},{"mout/array/contains":2,"mout/array/filter":3,"mout/array/slice":7,"mout/array/sort":8,"mout/array/toLookup":9,"mout/lang/isEmpty":14,"mout/object/deepMixIn":21,"mout/object/forOwn":23,"mout/object/pick":26,"mout/object/set":27,"mout/string/makePath":28,"mout/string/upperCase":29}]},{},[59]); \ No newline at end of file diff --git a/guide/nav.html b/guide/nav.html index 71d94f2..7de51af 100644 --- a/guide/nav.html +++ b/guide/nav.html @@ -72,7 +72,7 @@ API
    -
  • Angular-data - 0.9.0
    • +
  • Angular-data - 0.9.1
  • Overview
    • diff --git a/package.json b/package.json index 0f2c6b8..7a0b84b 100644 --- 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 index df8f53a..fea42ad 100644 --- 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 index eec2622..70f67d7 100644 --- 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 index 927629a..84f9653 100644 --- 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 index bd21f52..3cee8e6 100644 --- 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 index 50135d4..c69e76a 100644 --- 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 index e646665..0e056d5 100644 --- 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(); + }); }); From 39f094c90ac697c0f61ac3c64eea32bdecbf7830 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Fri, 30 May 2014 13:37:50 -0600 Subject: [PATCH 2/3] Fixes #70 --- CHANGELOG.md | 1 + dist/angular-data.js | 24 +++++++++----- dist/angular-data.min.js | 6 ++-- src/adapters/http.js | 12 +++++-- src/datastore/async_methods/findAll.js | 3 +- src/datastore/sync_methods/filter.js | 7 ++-- .../adapters/http/destroyAll.test.js | 2 +- .../integration/adapters/http/findAll.test.js | 2 +- .../datastore/async_methods/findAll.test.js | 33 +++++++++++++++---- .../datastore/sync_methods/filter.test.js | 18 ++++------ 10 files changed, 71 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26b278d..aa93148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ###### Backwards compatible bug fixes - #69 - Failed requests should throw an error, not just return it +- #70 - Make `params` and `params.query` optional ##### 0.9.0 - 22 May 2014 diff --git a/dist/angular-data.js b/dist/angular-data.js index 3ff8cfd..b67ecab 100644 --- a/dist/angular-data.js +++ b/dist/angular-data.js @@ -1,7 +1,7 @@ /** * @author Jason Dobry * @file angular-data.js -* @version 0.9.0 - Homepage +* @version 0.9.1 - Homepage * @copyright (c) 2014 Jason Dobry * @license MIT * @@ -1570,7 +1570,9 @@ function DSHttpAdapterProvider() { options = options || {}; options.params = options.params || {}; if (params) { - params.query = params.query ? defaults.queryTransform(resourceConfig.name, params.query) : params.query; + if (params.query) { + params.query = defaults.queryTransform(resourceConfig.name, params.query); + } DSUtils.deepMixIn(options.params, params); } return this.DEL( @@ -1591,7 +1593,9 @@ function DSHttpAdapterProvider() { options = options || {}; options.params = options.params || {}; if (params) { - params.query = params.query ? defaults.queryTransform(resourceConfig.name, params.query) : params.query; + if (params.query) { + params.query = defaults.queryTransform(resourceConfig.name, params.query); + } DSUtils.deepMixIn(options.params, params); } return this.GET( @@ -1613,7 +1617,9 @@ function DSHttpAdapterProvider() { options = options || {}; options.params = options.params || {}; if (params) { - params.query = params.query ? defaults.queryTransform(resourceConfig.name, params.query) : params.query; + if (params.query) { + params.query = defaults.queryTransform(resourceConfig.name, params.query); + } DSUtils.deepMixIn(options.params, params); } return this.PUT( @@ -2302,7 +2308,7 @@ function _findAll(utils, resourceName, params, options) { * ``` * * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc. - * @param {object} params Parameter object that is serialized into the query string. Properties: + * @param {object=} params Parameter object that is serialized into the query string. Properties: * * - `{object=}` - `query` - The query object by which to filter items of the type specified by `resourceName`. Properties: * - `{object=}` - `where` - Where clause. @@ -2332,6 +2338,7 @@ function findAll(resourceName, params, options) { _this = this; options = options || {}; + params = params || {}; if (!this.definitions[resourceName]) { deferred.reject(new this.errors.RuntimeError(errorPrefix + resourceName + ' is not a registered resource!')); @@ -4048,7 +4055,7 @@ var errorPrefix = 'DS.filter(resourceName, params[, options]): '; * - `{UnhandledError}` * * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc. - * @param {object} params Parameter object that is serialized into the query string. Properties: + * @param {object=} params Parameter object that is serialized into the query string. Properties: * * - `{object=}` - `query` - The query object by which to filter items of the type specified by `resourceName`. Properties: * - `{object=}` - `where` - Where clause. @@ -4065,7 +4072,7 @@ function filter(resourceName, params, options) { if (!this.definitions[resourceName]) { throw new this.errors.RuntimeError(errorPrefix + resourceName + ' is not a registered resource!'); - } else if (!this.utils.isObject(params)) { + } else if (params && !this.utils.isObject(params)) { throw new this.errors.IllegalArgumentError(errorPrefix + 'params: Must be an object!', { params: { actual: typeof params, expected: 'object' } }); } else if (!this.utils.isObject(options)) { throw new this.errors.IllegalArgumentError(errorPrefix + 'options: Must be an object!', { options: { actual: typeof options, expected: 'object' } }); @@ -4077,7 +4084,7 @@ function filter(resourceName, params, options) { _this = this; // Protect against null - params.query = params.query || {}; + params = params || {}; var queryHash = this.utils.toJson(params); @@ -4090,6 +4097,7 @@ function filter(resourceName, params, options) { } } + params.query = params.query || {}; // The query has been completed, so hit the cache with the query var filtered = this.utils.filter(resource.collection, function (attrs) { var keep = true, diff --git a/dist/angular-data.min.js b/dist/angular-data.min.js index 6090e6b..d2dd728 100644 --- a/dist/angular-data.min.js +++ b/dist/angular-data.min.js @@ -1,11 +1,11 @@ /** * @author Jason Dobry * @file angular-data.min.js -* @version 0.9.0 - Homepage +* @version 0.9.1 - Homepage * @copyright (c) 2014 Jason Dobry * @license MIT * * @overview Data store for Angular.js. */ -!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gb&&a.check();)a.report(),b++}function e(a){for(var b in a)return!1;return!0}function f(a){return e(a.added)&&e(a.removed)&&e(a.changed)}function g(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var f in a)f in b||(c[f]=a[f]);return Array.isArray(a)&&a.length!==b.length&&(e.length=a.length),{added:c,removed:d,changed:e}}function h(a,b){var c=b||(Array.isArray(a)?[]:{});for(var d in a)c[d]=a[d];return Array.isArray(a)&&(c.length=a.length),c}function i(a,b,c,d){if(this.closed=!1,this.object=a,this.callback=b,this.target=c,this.token=d,this.reporting=!0,n){var e=this;this.boundInternalCallback=function(a){e.internalCallback(a)}}j(this),this.connect(),this.sync(!0)}function j(a){u&&(t.push(a),i._allObserversCount++)}function k(a,b,c,d){i.call(this,a,b,c,d)}function l(a){this.arr=[],this.callback=a,this.isObserved=!0}function m(a,b,c){for(var d={},e={},f=0;fa&&b.anyChanged);i._allObserversCount=t.length,v=!1}}},u&&(a.Platform.clearObservers=function(){t=[]}),k.prototype=r({__proto__:i.prototype,connect:function(){n&&Object.observe(this.object,this.boundInternalCallback)},sync:function(){n||(this.oldObject=h(this.object))},check:function(a){var b,c;if(n){if(!a)return!1;c={},b=m(this.object,a,c)}else c=this.oldObject,b=g(this.object,this.oldObject);return f(b)?!1:(this.reportArgs=[b.added||{},b.removed||{},b.changed||{}],this.reportArgs.push(function(a){return c[a]}),!0)},disconnect:function(){n?this.object&&Object.unobserve(this.object,this.boundInternalCallback):this.oldObject=void 0}});var x=Object.getPrototypeOf({}),y=Object.getPrototypeOf([]);l.prototype={reset:function(){this.isObserved=!this.isObserved},observe:function(a){if(c(a)&&a!==x&&a!==y){var b=this.arr.indexOf(a);b>=0&&this.arr[b+1]===this.isObserved||(0>b&&(b=this.arr.length,this.arr[b]=a,Object.observe(a,this.callback)),this.arr[b+1]=this.isObserved,this.observe(Object.getPrototypeOf(a)))}},cleanup:function(){for(var a=0,b=0,c=this.isObserved;ba&&(this.arr[a]=d,this.arr[a+1]=c),a+=2):Object.unobserve(d,this.callback),b+=2}this.arr.length=a}};var z={"new":!0,updated:!0,deleted:!0};a.Observer=i,a.Observer.hasObjectObserve=n,a.ObjectObserver=k}((c.Number={isNaN:window.isNaN})?c:c)}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],2:[function(a,b){function c(a,b){return-1!==d(a,b)}var d=a("./indexOf");b.exports=c},{"./indexOf":5}],3:[function(a,b){function c(a,b,c){b=d(b,c);var e=[];if(null==a)return e;for(var f,g=-1,h=a.length;++gc?d+c:c;d>e;){if(a[e]===b)return e;e++}return-1}b.exports=c},{}],6:[function(a,b){function c(a){return null!=a&&""!==a}function d(a,b){return b=b||"",e(a,c).join(b)}var e=a("./filter");b.exports=d},{"./filter":3}],7:[function(a,b){function c(a,b,c){var d=a.length;b=null==b?0:0>b?Math.max(d+b,0):Math.min(b,d),c=null==c?d:0>c?Math.max(d+c,0):Math.min(c,d);for(var e=[];c>b;)e.push(a[b++]);return e}b.exports=c},{}],8:[function(a,b){function c(a,b){if(null==a)return[];if(a.length<2)return a;null==b&&(b=d);var f,g,h;return f=~~(a.length/2),g=c(a.slice(0,f),b),h=c(a.slice(f,a.length),b),e(g,h,b)}function d(a,b){return b>a?-1:a>b?1:0}function e(a,b,c){for(var d=[];a.length&&b.length;)d.push(c(a[0],b[0])<=0?a.shift():b.shift());return a.length&&d.push.apply(d,a),b.length&&d.push.apply(d,b),d}b.exports=c},{}],9:[function(a,b){function c(a,b){var c={};if(null==a)return c;var e,f=-1,g=a.length;if(d(b))for(;++f"in a?d=d&&c[b]>a[">"]:">="in a?d=d&&c[b]>=a[">="]:"<"in a?d=d&&c[b]e?-1:e>d?1:0:e>d?-1:d>e?1:0})}}return this.utils.isNumber(b.query.limit)&&this.utils.isNumber(b.query.skip)?i=this.utils.slice(i,b.query.skip,Math.min(i.length,b.query.skip+b.query.limit)):this.utils.isNumber(b.query.limit)?i=this.utils.slice(i,0,Math.min(i.length,b.query.limit)):this.utils.isNumber(b.query.skip)&&(i=b.query.skip=b?a+1:b},deepFreeze:function b(a){if("function"==typeof Object.freeze){var c,d;Object.freeze(a);for(d in a)c=a[d],a.hasOwnProperty(d)&&"object"==typeof c&&!Object.isFrozen(c)&&b(c)}},diffObjectFromOldObject:function(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var h in a)h in b||(c[h]=a[h]);return{added:c,removed:d,changed:e}}}}]},{"mout/array/contains":2,"mout/array/filter":3,"mout/array/slice":7,"mout/array/sort":8,"mout/array/toLookup":9,"mout/lang/isEmpty":14,"mout/object/deepMixIn":21,"mout/object/forOwn":23,"mout/object/pick":26,"mout/object/set":27,"mout/string/makePath":28,"mout/string/upperCase":29}]},{},[59]); \ No newline at end of file +!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gb&&a.check();)a.report(),b++}function e(a){for(var b in a)return!1;return!0}function f(a){return e(a.added)&&e(a.removed)&&e(a.changed)}function g(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var f in a)f in b||(c[f]=a[f]);return Array.isArray(a)&&a.length!==b.length&&(e.length=a.length),{added:c,removed:d,changed:e}}function h(a,b){var c=b||(Array.isArray(a)?[]:{});for(var d in a)c[d]=a[d];return Array.isArray(a)&&(c.length=a.length),c}function i(a,b,c,d){if(this.closed=!1,this.object=a,this.callback=b,this.target=c,this.token=d,this.reporting=!0,n){var e=this;this.boundInternalCallback=function(a){e.internalCallback(a)}}j(this),this.connect(),this.sync(!0)}function j(a){u&&(t.push(a),i._allObserversCount++)}function k(a,b,c,d){i.call(this,a,b,c,d)}function l(a){this.arr=[],this.callback=a,this.isObserved=!0}function m(a,b,c){for(var d={},e={},f=0;fa&&b.anyChanged);i._allObserversCount=t.length,v=!1}}},u&&(a.Platform.clearObservers=function(){t=[]}),k.prototype=r({__proto__:i.prototype,connect:function(){n&&Object.observe(this.object,this.boundInternalCallback)},sync:function(){n||(this.oldObject=h(this.object))},check:function(a){var b,c;if(n){if(!a)return!1;c={},b=m(this.object,a,c)}else c=this.oldObject,b=g(this.object,this.oldObject);return f(b)?!1:(this.reportArgs=[b.added||{},b.removed||{},b.changed||{}],this.reportArgs.push(function(a){return c[a]}),!0)},disconnect:function(){n?this.object&&Object.unobserve(this.object,this.boundInternalCallback):this.oldObject=void 0}});var x=Object.getPrototypeOf({}),y=Object.getPrototypeOf([]);l.prototype={reset:function(){this.isObserved=!this.isObserved},observe:function(a){if(c(a)&&a!==x&&a!==y){var b=this.arr.indexOf(a);b>=0&&this.arr[b+1]===this.isObserved||(0>b&&(b=this.arr.length,this.arr[b]=a,Object.observe(a,this.callback)),this.arr[b+1]=this.isObserved,this.observe(Object.getPrototypeOf(a)))}},cleanup:function(){for(var a=0,b=0,c=this.isObserved;ba&&(this.arr[a]=d,this.arr[a+1]=c),a+=2):Object.unobserve(d,this.callback),b+=2}this.arr.length=a}};var z={"new":!0,updated:!0,deleted:!0};a.Observer=i,a.Observer.hasObjectObserve=n,a.ObjectObserver=k}((c.Number={isNaN:window.isNaN})?c:c)}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],2:[function(a,b){function c(a,b){return-1!==d(a,b)}var d=a("./indexOf");b.exports=c},{"./indexOf":5}],3:[function(a,b){function c(a,b,c){b=d(b,c);var e=[];if(null==a)return e;for(var f,g=-1,h=a.length;++gc?d+c:c;d>e;){if(a[e]===b)return e;e++}return-1}b.exports=c},{}],6:[function(a,b){function c(a){return null!=a&&""!==a}function d(a,b){return b=b||"",e(a,c).join(b)}var e=a("./filter");b.exports=d},{"./filter":3}],7:[function(a,b){function c(a,b,c){var d=a.length;b=null==b?0:0>b?Math.max(d+b,0):Math.min(b,d),c=null==c?d:0>c?Math.max(d+c,0):Math.min(c,d);for(var e=[];c>b;)e.push(a[b++]);return e}b.exports=c},{}],8:[function(a,b){function c(a,b){if(null==a)return[];if(a.length<2)return a;null==b&&(b=d);var f,g,h;return f=~~(a.length/2),g=c(a.slice(0,f),b),h=c(a.slice(f,a.length),b),e(g,h,b)}function d(a,b){return b>a?-1:a>b?1:0}function e(a,b,c){for(var d=[];a.length&&b.length;)d.push(c(a[0],b[0])<=0?a.shift():b.shift());return a.length&&d.push.apply(d,a),b.length&&d.push.apply(d,b),d}b.exports=c},{}],9:[function(a,b){function c(a,b){var c={};if(null==a)return c;var e,f=-1,g=a.length;if(d(b))for(;++f"in a?d=d&&c[b]>a[">"]:">="in a?d=d&&c[b]>=a[">="]:"<"in a?d=d&&c[b]e?-1:e>d?1:0:e>d?-1:d>e?1:0})}}return this.utils.isNumber(b.query.limit)&&this.utils.isNumber(b.query.skip)?i=this.utils.slice(i,b.query.skip,Math.min(i.length,b.query.skip+b.query.limit)):this.utils.isNumber(b.query.limit)?i=this.utils.slice(i,0,Math.min(i.length,b.query.limit)):this.utils.isNumber(b.query.skip)&&(i=b.query.skip=b?a+1:b},deepFreeze:function b(a){if("function"==typeof Object.freeze){var c,d;Object.freeze(a);for(d in a)c=a[d],a.hasOwnProperty(d)&&"object"==typeof c&&!Object.isFrozen(c)&&b(c)}},diffObjectFromOldObject:function(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var h in a)h in b||(c[h]=a[h]);return{added:c,removed:d,changed:e}}}}]},{"mout/array/contains":2,"mout/array/filter":3,"mout/array/slice":7,"mout/array/sort":8,"mout/array/toLookup":9,"mout/lang/isEmpty":14,"mout/object/deepMixIn":21,"mout/object/forOwn":23,"mout/object/pick":26,"mout/object/set":27,"mout/string/makePath":28,"mout/string/upperCase":29}]},{},[59]); \ No newline at end of file diff --git a/src/adapters/http.js b/src/adapters/http.js index c0d7ae3..ac9659e 100644 --- a/src/adapters/http.js +++ b/src/adapters/http.js @@ -369,7 +369,9 @@ function DSHttpAdapterProvider() { options = options || {}; options.params = options.params || {}; if (params) { - params.query = params.query ? defaults.queryTransform(resourceConfig.name, params.query) : params.query; + if (params.query) { + params.query = defaults.queryTransform(resourceConfig.name, params.query); + } DSUtils.deepMixIn(options.params, params); } return this.DEL( @@ -390,7 +392,9 @@ function DSHttpAdapterProvider() { options = options || {}; options.params = options.params || {}; if (params) { - params.query = params.query ? defaults.queryTransform(resourceConfig.name, params.query) : params.query; + if (params.query) { + params.query = defaults.queryTransform(resourceConfig.name, params.query); + } DSUtils.deepMixIn(options.params, params); } return this.GET( @@ -412,7 +416,9 @@ function DSHttpAdapterProvider() { options = options || {}; options.params = options.params || {}; if (params) { - params.query = params.query ? defaults.queryTransform(resourceConfig.name, params.query) : params.query; + if (params.query) { + params.query = defaults.queryTransform(resourceConfig.name, params.query); + } DSUtils.deepMixIn(options.params, params); } return this.PUT( diff --git a/src/datastore/async_methods/findAll.js b/src/datastore/async_methods/findAll.js index 70f67d7..fb594db 100644 --- a/src/datastore/async_methods/findAll.js +++ b/src/datastore/async_methods/findAll.js @@ -99,7 +99,7 @@ function _findAll(utils, resourceName, params, options) { * ``` * * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc. - * @param {object} params Parameter object that is serialized into the query string. Properties: + * @param {object=} params Parameter object that is serialized into the query string. Properties: * * - `{object=}` - `query` - The query object by which to filter items of the type specified by `resourceName`. Properties: * - `{object=}` - `where` - Where clause. @@ -129,6 +129,7 @@ function findAll(resourceName, params, options) { _this = this; options = options || {}; + params = params || {}; if (!this.definitions[resourceName]) { deferred.reject(new this.errors.RuntimeError(errorPrefix + resourceName + ' is not a registered resource!')); diff --git a/src/datastore/sync_methods/filter.js b/src/datastore/sync_methods/filter.js index 729ab9e..400d8e5 100644 --- a/src/datastore/sync_methods/filter.js +++ b/src/datastore/sync_methods/filter.js @@ -26,7 +26,7 @@ var errorPrefix = 'DS.filter(resourceName, params[, options]): '; * - `{UnhandledError}` * * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc. - * @param {object} params Parameter object that is serialized into the query string. Properties: + * @param {object=} params Parameter object that is serialized into the query string. Properties: * * - `{object=}` - `query` - The query object by which to filter items of the type specified by `resourceName`. Properties: * - `{object=}` - `where` - Where clause. @@ -43,7 +43,7 @@ function filter(resourceName, params, options) { if (!this.definitions[resourceName]) { throw new this.errors.RuntimeError(errorPrefix + resourceName + ' is not a registered resource!'); - } else if (!this.utils.isObject(params)) { + } else if (params && !this.utils.isObject(params)) { throw new this.errors.IllegalArgumentError(errorPrefix + 'params: Must be an object!', { params: { actual: typeof params, expected: 'object' } }); } else if (!this.utils.isObject(options)) { throw new this.errors.IllegalArgumentError(errorPrefix + 'options: Must be an object!', { options: { actual: typeof options, expected: 'object' } }); @@ -55,7 +55,7 @@ function filter(resourceName, params, options) { _this = this; // Protect against null - params.query = params.query || {}; + params = params || {}; var queryHash = this.utils.toJson(params); @@ -68,6 +68,7 @@ function filter(resourceName, params, options) { } } + params.query = params.query || {}; // The query has been completed, so hit the cache with the query var filtered = this.utils.filter(resource.collection, function (attrs) { var keep = true, diff --git a/test/integration/adapters/http/destroyAll.test.js b/test/integration/adapters/http/destroyAll.test.js index 0322988..2614603 100644 --- a/test/integration/adapters/http/destroyAll.test.js +++ b/test/integration/adapters/http/destroyAll.test.js @@ -8,7 +8,7 @@ describe('DSHttpAdapter.destroyAll(resourceConfig, params, options)', function ( DSHttpAdapter.destroyAll({ baseUrl: 'api', endpoint: 'posts' - }).then(function (data) { + }, {}).then(function (data) { assert.isUndefined(data.data, 'posts should have been found'); }, function (err) { console.error(err.stack); diff --git a/test/integration/adapters/http/findAll.test.js b/test/integration/adapters/http/findAll.test.js index a5da8ac..b62cc65 100644 --- a/test/integration/adapters/http/findAll.test.js +++ b/test/integration/adapters/http/findAll.test.js @@ -8,7 +8,7 @@ describe('DSHttpAdapter.findAll(resourceConfig, params, options)', function () { DSHttpAdapter.findAll({ baseUrl: 'api', endpoint: 'posts' - }).then(function (data) { + }, {}).then(function (data) { assert.deepEqual(data.data, [p1], 'posts should have been found'); }, function (err) { console.error(err.stack); diff --git a/test/integration/datastore/async_methods/findAll.test.js b/test/integration/datastore/async_methods/findAll.test.js index 0e056d5..7149337 100644 --- a/test/integration/datastore/async_methods/findAll.test.js +++ b/test/integration/datastore/async_methods/findAll.test.js @@ -12,12 +12,14 @@ describe('DS.findAll(resourceName, params[, options]): ', function () { }); angular.forEach(TYPES_EXCEPT_OBJECT, function (key) { - DS.findAll('post', key).then(function () { - fail('should have rejected'); - }, function (err) { - assert.isTrue(err instanceof DS.errors.IllegalArgumentError); - assert.equal(err.message, errorPrefix + 'params: Must be an object!'); - }); + if (key) { + DS.findAll('post', key, { cacheResponse: false }).then(function () { + fail('should have rejected'); + }, function (err) { + assert.isTrue(err instanceof DS.errors.IllegalArgumentError); + assert.equal(err.message, errorPrefix + 'params: Must be an object!'); + }); + } }); angular.forEach(TYPES_EXCEPT_OBJECT, function (key) { @@ -112,4 +114,23 @@ describe('DS.findAll(resourceName, params[, options]): ', function () { $httpBackend.flush(); }); + it('"params" argument is optional', function () { + $httpBackend.expectGET(/http:\/\/test\.angular-cache\.com\/posts\??/).respond(200, [p1, p2, p3, p4]); + + DS.findAll('post').then(function (data) { + assert.deepEqual(data, [p1, p2, p3, p4]); + }, function (err) { + console.error(err.message); + fail('Should not have rejected!'); + }); + + $httpBackend.flush(); + + assert.deepEqual(DS.filter('post', {}), [p1, p2, p3, p4], 'The posts are now in the store'); + + assert.equal(lifecycle.beforeInject.callCount, 4, 'beforeInject should have been called'); + assert.equal(lifecycle.afterInject.callCount, 4, 'afterInject should have been called'); + assert.equal(lifecycle.serialize.callCount, 0, 'serialize should have been called'); + assert.equal(lifecycle.deserialize.callCount, 1, 'deserialize should have been called'); + }); }); diff --git a/test/integration/datastore/sync_methods/filter.test.js b/test/integration/datastore/sync_methods/filter.test.js index 8238816..d25d4a8 100644 --- a/test/integration/datastore/sync_methods/filter.test.js +++ b/test/integration/datastore/sync_methods/filter.test.js @@ -5,19 +5,15 @@ describe('DS.filter(resourceName, params[, options])', function () { it('should throw an error when method pre-conditions are not met', function () { assert.throws(function () { - DS.filter('does not exist', {}); + DS.filter('does not exist'); }, DS.errors.RuntimeError, errorPrefix + 'does not exist is not a registered resource!'); angular.forEach(TYPES_EXCEPT_OBJECT, function (key) { - assert.throws(function () { - DS.filter('post', key); - }, DS.errors.IllegalArgumentError, errorPrefix + 'params: Must be an object!'); - }); - - angular.forEach(TYPES_EXCEPT_OBJECT, function (key) { - assert.throws(function () { - DS.filter('post', key); - }, DS.errors.IllegalArgumentError, errorPrefix + 'params: Must be an object!'); + if (key) { + assert.throws(function () { + DS.filter('post', key); + }, DS.errors.IllegalArgumentError, errorPrefix + 'params: Must be an object!'); + } }); DS.inject('post', p1); @@ -66,7 +62,7 @@ describe('DS.filter(resourceName, params[, options])', function () { } }); - DS.filter('post', {}); + DS.filter('post'); }); it('should return an empty array if the query has never been made before', function () { $httpBackend.expectGET('http://test.angular-cache.com/posts?query=%7B%22where%22:%7B%22author%22:%7B%22%3D%3D%22:%22John%22%7D%7D%7D').respond(200, [p1]); From 679426e2ba9203d002e63bfe45973fd8e28c14fb Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Fri, 30 May 2014 22:53:34 -0600 Subject: [PATCH 3/3] Fixes #68 --- CHANGELOG.md | 1 + dist/angular-data.js | 24 +++++----- dist/angular-data.min.js | 4 +- src/datastore/async_methods/findAll.js | 7 ++- src/datastore/sync_methods/inject.js | 17 +++---- .../datastore/async_methods/findAll.test.js | 47 +++++++++++++++++++ 6 files changed, 74 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa93148..e9302c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ##### 0.9.1 - xx May 2014 ###### Backwards compatible bug fixes +- #68 - Async methods should honor methods on a resource definition. - #69 - Failed requests should throw an error, not just return it - #70 - Make `params` and `params.query` optional diff --git a/dist/angular-data.js b/dist/angular-data.js index b67ecab..754fc8f 100644 --- a/dist/angular-data.js +++ b/dist/angular-data.js @@ -2218,12 +2218,11 @@ function processResults(utils, data, resourceName, queryHash) { delete resource.pendingQueries[queryHash]; resource.completedQueries[queryHash] = new Date().getTime(); - // Merge the new values into the cache - this.inject(resourceName, data); - // Update modified timestamp of collection resource.collectionModified = utils.updateTimestamp(resource.collectionModified); - return data; + + // Merge the new values into the cache + return this.inject(resourceName, data); } function _findAll(utils, resourceName, params, options) { @@ -4479,9 +4478,11 @@ function _inject(definition, resource, attrs) { } } + var injected; if (_this.utils.isArray(attrs)) { + injected = []; for (var i = 0; i < attrs.length; i++) { - _inject.call(_this, definition, resource, attrs[i]); + injected.push(_inject.call(_this, definition, resource, attrs[i])); } } else { if (!(definition.idAttribute in attrs)) { @@ -4526,12 +4527,14 @@ function _inject(definition, resource, attrs) { } resource.saved[id] = _this.utils.updateTimestamp(resource.saved[id]); definition.afterInject(definition.name, item); + injected = item; } catch (err) { $log.error(err); $log.error('inject failed!', definition.name, attrs); } } } + return injected; } /** @@ -4595,18 +4598,15 @@ function inject(resourceName, attrs, options) { _this = this; try { + var injected; if (!this.$rootScope.$$phase) { this.$rootScope.$apply(function () { - _inject.apply(_this, [definition, resource, attrs]); + injected = _inject.apply(_this, [definition, resource, attrs]); }); } else { - _inject.apply(_this, [definition, resource, attrs]); - } - if (_this.utils.isArray(attrs)) { - return attrs; - } else { - return this.get(resourceName, attrs[definition.idAttribute]); + injected = _inject.apply(_this, [definition, resource, attrs]); } + return injected; } catch (err) { if (!(err instanceof this.errors.RuntimeError)) { throw new this.errors.UnhandledError(err); diff --git a/dist/angular-data.min.js b/dist/angular-data.min.js index d2dd728..091a48e 100644 --- a/dist/angular-data.min.js +++ b/dist/angular-data.min.js @@ -7,5 +7,5 @@ * * @overview Data store for Angular.js. */ -!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gb&&a.check();)a.report(),b++}function e(a){for(var b in a)return!1;return!0}function f(a){return e(a.added)&&e(a.removed)&&e(a.changed)}function g(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var f in a)f in b||(c[f]=a[f]);return Array.isArray(a)&&a.length!==b.length&&(e.length=a.length),{added:c,removed:d,changed:e}}function h(a,b){var c=b||(Array.isArray(a)?[]:{});for(var d in a)c[d]=a[d];return Array.isArray(a)&&(c.length=a.length),c}function i(a,b,c,d){if(this.closed=!1,this.object=a,this.callback=b,this.target=c,this.token=d,this.reporting=!0,n){var e=this;this.boundInternalCallback=function(a){e.internalCallback(a)}}j(this),this.connect(),this.sync(!0)}function j(a){u&&(t.push(a),i._allObserversCount++)}function k(a,b,c,d){i.call(this,a,b,c,d)}function l(a){this.arr=[],this.callback=a,this.isObserved=!0}function m(a,b,c){for(var d={},e={},f=0;fa&&b.anyChanged);i._allObserversCount=t.length,v=!1}}},u&&(a.Platform.clearObservers=function(){t=[]}),k.prototype=r({__proto__:i.prototype,connect:function(){n&&Object.observe(this.object,this.boundInternalCallback)},sync:function(){n||(this.oldObject=h(this.object))},check:function(a){var b,c;if(n){if(!a)return!1;c={},b=m(this.object,a,c)}else c=this.oldObject,b=g(this.object,this.oldObject);return f(b)?!1:(this.reportArgs=[b.added||{},b.removed||{},b.changed||{}],this.reportArgs.push(function(a){return c[a]}),!0)},disconnect:function(){n?this.object&&Object.unobserve(this.object,this.boundInternalCallback):this.oldObject=void 0}});var x=Object.getPrototypeOf({}),y=Object.getPrototypeOf([]);l.prototype={reset:function(){this.isObserved=!this.isObserved},observe:function(a){if(c(a)&&a!==x&&a!==y){var b=this.arr.indexOf(a);b>=0&&this.arr[b+1]===this.isObserved||(0>b&&(b=this.arr.length,this.arr[b]=a,Object.observe(a,this.callback)),this.arr[b+1]=this.isObserved,this.observe(Object.getPrototypeOf(a)))}},cleanup:function(){for(var a=0,b=0,c=this.isObserved;ba&&(this.arr[a]=d,this.arr[a+1]=c),a+=2):Object.unobserve(d,this.callback),b+=2}this.arr.length=a}};var z={"new":!0,updated:!0,deleted:!0};a.Observer=i,a.Observer.hasObjectObserve=n,a.ObjectObserver=k}((c.Number={isNaN:window.isNaN})?c:c)}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],2:[function(a,b){function c(a,b){return-1!==d(a,b)}var d=a("./indexOf");b.exports=c},{"./indexOf":5}],3:[function(a,b){function c(a,b,c){b=d(b,c);var e=[];if(null==a)return e;for(var f,g=-1,h=a.length;++gc?d+c:c;d>e;){if(a[e]===b)return e;e++}return-1}b.exports=c},{}],6:[function(a,b){function c(a){return null!=a&&""!==a}function d(a,b){return b=b||"",e(a,c).join(b)}var e=a("./filter");b.exports=d},{"./filter":3}],7:[function(a,b){function c(a,b,c){var d=a.length;b=null==b?0:0>b?Math.max(d+b,0):Math.min(b,d),c=null==c?d:0>c?Math.max(d+c,0):Math.min(c,d);for(var e=[];c>b;)e.push(a[b++]);return e}b.exports=c},{}],8:[function(a,b){function c(a,b){if(null==a)return[];if(a.length<2)return a;null==b&&(b=d);var f,g,h;return f=~~(a.length/2),g=c(a.slice(0,f),b),h=c(a.slice(f,a.length),b),e(g,h,b)}function d(a,b){return b>a?-1:a>b?1:0}function e(a,b,c){for(var d=[];a.length&&b.length;)d.push(c(a[0],b[0])<=0?a.shift():b.shift());return a.length&&d.push.apply(d,a),b.length&&d.push.apply(d,b),d}b.exports=c},{}],9:[function(a,b){function c(a,b){var c={};if(null==a)return c;var e,f=-1,g=a.length;if(d(b))for(;++f"in a?d=d&&c[b]>a[">"]:">="in a?d=d&&c[b]>=a[">="]:"<"in a?d=d&&c[b]e?-1:e>d?1:0:e>d?-1:d>e?1:0})}}return this.utils.isNumber(b.query.limit)&&this.utils.isNumber(b.query.skip)?i=this.utils.slice(i,b.query.skip,Math.min(i.length,b.query.skip+b.query.limit)):this.utils.isNumber(b.query.limit)?i=this.utils.slice(i,0,Math.min(i.length,b.query.limit)):this.utils.isNumber(b.query.skip)&&(i=b.query.skip=b?a+1:b},deepFreeze:function b(a){if("function"==typeof Object.freeze){var c,d;Object.freeze(a);for(d in a)c=a[d],a.hasOwnProperty(d)&&"object"==typeof c&&!Object.isFrozen(c)&&b(c)}},diffObjectFromOldObject:function(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var h in a)h in b||(c[h]=a[h]);return{added:c,removed:d,changed:e}}}}]},{"mout/array/contains":2,"mout/array/filter":3,"mout/array/slice":7,"mout/array/sort":8,"mout/array/toLookup":9,"mout/lang/isEmpty":14,"mout/object/deepMixIn":21,"mout/object/forOwn":23,"mout/object/pick":26,"mout/object/set":27,"mout/string/makePath":28,"mout/string/upperCase":29}]},{},[59]); \ No newline at end of file +!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gb&&a.check();)a.report(),b++}function e(a){for(var b in a)return!1;return!0}function f(a){return e(a.added)&&e(a.removed)&&e(a.changed)}function g(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var f in a)f in b||(c[f]=a[f]);return Array.isArray(a)&&a.length!==b.length&&(e.length=a.length),{added:c,removed:d,changed:e}}function h(a,b){var c=b||(Array.isArray(a)?[]:{});for(var d in a)c[d]=a[d];return Array.isArray(a)&&(c.length=a.length),c}function i(a,b,c,d){if(this.closed=!1,this.object=a,this.callback=b,this.target=c,this.token=d,this.reporting=!0,n){var e=this;this.boundInternalCallback=function(a){e.internalCallback(a)}}j(this),this.connect(),this.sync(!0)}function j(a){u&&(t.push(a),i._allObserversCount++)}function k(a,b,c,d){i.call(this,a,b,c,d)}function l(a){this.arr=[],this.callback=a,this.isObserved=!0}function m(a,b,c){for(var d={},e={},f=0;fa&&b.anyChanged);i._allObserversCount=t.length,v=!1}}},u&&(a.Platform.clearObservers=function(){t=[]}),k.prototype=r({__proto__:i.prototype,connect:function(){n&&Object.observe(this.object,this.boundInternalCallback)},sync:function(){n||(this.oldObject=h(this.object))},check:function(a){var b,c;if(n){if(!a)return!1;c={},b=m(this.object,a,c)}else c=this.oldObject,b=g(this.object,this.oldObject);return f(b)?!1:(this.reportArgs=[b.added||{},b.removed||{},b.changed||{}],this.reportArgs.push(function(a){return c[a]}),!0)},disconnect:function(){n?this.object&&Object.unobserve(this.object,this.boundInternalCallback):this.oldObject=void 0}});var x=Object.getPrototypeOf({}),y=Object.getPrototypeOf([]);l.prototype={reset:function(){this.isObserved=!this.isObserved},observe:function(a){if(c(a)&&a!==x&&a!==y){var b=this.arr.indexOf(a);b>=0&&this.arr[b+1]===this.isObserved||(0>b&&(b=this.arr.length,this.arr[b]=a,Object.observe(a,this.callback)),this.arr[b+1]=this.isObserved,this.observe(Object.getPrototypeOf(a)))}},cleanup:function(){for(var a=0,b=0,c=this.isObserved;ba&&(this.arr[a]=d,this.arr[a+1]=c),a+=2):Object.unobserve(d,this.callback),b+=2}this.arr.length=a}};var z={"new":!0,updated:!0,deleted:!0};a.Observer=i,a.Observer.hasObjectObserve=n,a.ObjectObserver=k}((c.Number={isNaN:window.isNaN})?c:c)}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],2:[function(a,b){function c(a,b){return-1!==d(a,b)}var d=a("./indexOf");b.exports=c},{"./indexOf":5}],3:[function(a,b){function c(a,b,c){b=d(b,c);var e=[];if(null==a)return e;for(var f,g=-1,h=a.length;++gc?d+c:c;d>e;){if(a[e]===b)return e;e++}return-1}b.exports=c},{}],6:[function(a,b){function c(a){return null!=a&&""!==a}function d(a,b){return b=b||"",e(a,c).join(b)}var e=a("./filter");b.exports=d},{"./filter":3}],7:[function(a,b){function c(a,b,c){var d=a.length;b=null==b?0:0>b?Math.max(d+b,0):Math.min(b,d),c=null==c?d:0>c?Math.max(d+c,0):Math.min(c,d);for(var e=[];c>b;)e.push(a[b++]);return e}b.exports=c},{}],8:[function(a,b){function c(a,b){if(null==a)return[];if(a.length<2)return a;null==b&&(b=d);var f,g,h;return f=~~(a.length/2),g=c(a.slice(0,f),b),h=c(a.slice(f,a.length),b),e(g,h,b)}function d(a,b){return b>a?-1:a>b?1:0}function e(a,b,c){for(var d=[];a.length&&b.length;)d.push(c(a[0],b[0])<=0?a.shift():b.shift());return a.length&&d.push.apply(d,a),b.length&&d.push.apply(d,b),d}b.exports=c},{}],9:[function(a,b){function c(a,b){var c={};if(null==a)return c;var e,f=-1,g=a.length;if(d(b))for(;++f"in a?d=d&&c[b]>a[">"]:">="in a?d=d&&c[b]>=a[">="]:"<"in a?d=d&&c[b]e?-1:e>d?1:0:e>d?-1:d>e?1:0})}}return this.utils.isNumber(b.query.limit)&&this.utils.isNumber(b.query.skip)?i=this.utils.slice(i,b.query.skip,Math.min(i.length,b.query.skip+b.query.limit)):this.utils.isNumber(b.query.limit)?i=this.utils.slice(i,0,Math.min(i.length,b.query.limit)):this.utils.isNumber(b.query.skip)&&(i=b.query.skip=b?a+1:b},deepFreeze:function b(a){if("function"==typeof Object.freeze){var c,d;Object.freeze(a);for(d in a)c=a[d],a.hasOwnProperty(d)&&"object"==typeof c&&!Object.isFrozen(c)&&b(c)}},diffObjectFromOldObject:function(a,b){var c={},d={},e={};for(var f in b){var g=a[f];(void 0===g||g!==b[f])&&(f in a?g!==b[f]&&(e[f]=g):d[f]=void 0)}for(var h in a)h in b||(c[h]=a[h]);return{added:c,removed:d,changed:e}}}}]},{"mout/array/contains":2,"mout/array/filter":3,"mout/array/slice":7,"mout/array/sort":8,"mout/array/toLookup":9,"mout/lang/isEmpty":14,"mout/object/deepMixIn":21,"mout/object/forOwn":23,"mout/object/pick":26,"mout/object/set":27,"mout/string/makePath":28,"mout/string/upperCase":29}]},{},[59]); \ No newline at end of file diff --git a/src/datastore/async_methods/findAll.js b/src/datastore/async_methods/findAll.js index fb594db..fe3c035 100644 --- a/src/datastore/async_methods/findAll.js +++ b/src/datastore/async_methods/findAll.js @@ -9,12 +9,11 @@ function processResults(utils, data, resourceName, queryHash) { delete resource.pendingQueries[queryHash]; resource.completedQueries[queryHash] = new Date().getTime(); - // Merge the new values into the cache - this.inject(resourceName, data); - // Update modified timestamp of collection resource.collectionModified = utils.updateTimestamp(resource.collectionModified); - return data; + + // Merge the new values into the cache + return this.inject(resourceName, data); } function _findAll(utils, resourceName, params, options) { diff --git a/src/datastore/sync_methods/inject.js b/src/datastore/sync_methods/inject.js index 231ec2e..c59f3ca 100644 --- a/src/datastore/sync_methods/inject.js +++ b/src/datastore/sync_methods/inject.js @@ -22,9 +22,11 @@ function _inject(definition, resource, attrs) { } } + var injected; if (_this.utils.isArray(attrs)) { + injected = []; for (var i = 0; i < attrs.length; i++) { - _inject.call(_this, definition, resource, attrs[i]); + injected.push(_inject.call(_this, definition, resource, attrs[i])); } } else { if (!(definition.idAttribute in attrs)) { @@ -69,12 +71,14 @@ function _inject(definition, resource, attrs) { } resource.saved[id] = _this.utils.updateTimestamp(resource.saved[id]); definition.afterInject(definition.name, item); + injected = item; } catch (err) { $log.error(err); $log.error('inject failed!', definition.name, attrs); } } } + return injected; } /** @@ -138,18 +142,15 @@ function inject(resourceName, attrs, options) { _this = this; try { + var injected; if (!this.$rootScope.$$phase) { this.$rootScope.$apply(function () { - _inject.apply(_this, [definition, resource, attrs]); + injected = _inject.apply(_this, [definition, resource, attrs]); }); } else { - _inject.apply(_this, [definition, resource, attrs]); - } - if (_this.utils.isArray(attrs)) { - return attrs; - } else { - return this.get(resourceName, attrs[definition.idAttribute]); + injected = _inject.apply(_this, [definition, resource, attrs]); } + return injected; } catch (err) { if (!(err instanceof this.errors.RuntimeError)) { throw new this.errors.UnhandledError(err); diff --git a/test/integration/datastore/async_methods/findAll.test.js b/test/integration/datastore/async_methods/findAll.test.js index 7149337..92a681f 100644 --- a/test/integration/datastore/async_methods/findAll.test.js +++ b/test/integration/datastore/async_methods/findAll.test.js @@ -133,4 +133,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 return already injected items', function () { + var u1 = { + id: 1, + name: 'John' + }, + u2 = { + id: 2, + name: 'Sally' + }; + + DS.defineResource({ + name: 'user', + endpoint: 'users', + methods: { + fullName: function () { + return this.first + ' ' + this.last; + } + } + }); + + $httpBackend.expectGET(/http:\/\/test\.angular-cache\.com\/users\??/).respond(200, [u1, u2]); + + DS.findAll('user').then(function (data) { + assert.deepEqual(data, [ + DSUtils.deepMixIn(new DS.definitions.user[DS.definitions.user.class](), u1), + DSUtils.deepMixIn(new DS.definitions.user[DS.definitions.user.class](), u2) + ]); + angular.forEach(data, function (user) { + assert.isTrue(user instanceof DS.definitions.user[DS.definitions.user.class], 'should be an instance of User'); + }); + }, function (err) { + console.error(err.message); + fail('Should not have rejected!'); + }); + + $httpBackend.flush(); + + assert.deepEqual(DS.filter('user'), [ + DSUtils.deepMixIn(new DS.definitions.user[DS.definitions.user.class](), u1), + DSUtils.deepMixIn(new DS.definitions.user[DS.definitions.user.class](), u2) + ], 'The users are now in the store'); + + assert.equal(lifecycle.beforeInject.callCount, 2, 'beforeInject should have been called'); + assert.equal(lifecycle.afterInject.callCount, 2, 'afterInject should have been called'); + assert.equal(lifecycle.serialize.callCount, 0, 'serialize should have been called'); + assert.equal(lifecycle.deserialize.callCount, 1, 'deserialize should have been called'); + }); });