From 655d817ea591806159f3591a33837618ccca74cd Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Thu, 26 Feb 2015 23:23:25 -0700 Subject: [PATCH] Stable Version 2.2.1. Fixes #311 --- CHANGELOG.md | 5 +++++ README.md | 2 +- dist/js-data-angular.js | 11 ++++++++--- dist/js-data-angular.min.js | 4 ++-- dist/js-data-angular.min.map | 2 +- package.json | 2 +- src/index.js | 9 +++++++-- test/adapters/http/find.test.js | 13 +++++++++++++ 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49b5fc1..0d1d71e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +##### 2.2.1 - 25 February 2015 + +###### Backwards compatible bug fixes +- #311 - Does not properly throw error in find() (like other adapters) when the item cannot be found + ##### 2.2.0 - 24 February 2015 ###### Backwards compatible API changes diff --git a/README.md b/README.md index d068848..4113c4a 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Js-data-angular is Angular-data 2.0, with [js-data](http://www.js-data.io) as th | Branch | Master | | ------ | ------ | | Bower | [![Bower version](https://badge.fury.io/bo/js-data-angular.png)](http://badge.fury.io/bo/js-data-angular) | -| NPM | [![NPM version](https://badge.fury.io/js/js-data-angular.png)](http://badge.fury.io/js/js-data-angular) | +| NPM | [![NPM](https://nodei.co/npm/js-data-angular.png?downloads=true&stars=true)](https://nodei.co/npm/js-data-angular/) | | Build Status | [![Build Status](https://travis-ci.org/js-data/js-data-angular.png?branch=master)](https://travis-ci.org/js-data/js-data-angular) | | Code Climate | [![Code Climate](https://codeclimate.com/github/js-data/js-data-angular.png)](https://codeclimate.com/github/js-data/js-data-angular) | | Dependency Status | [![Dependency Status](https://gemnasium.com/js-data/js-data-angular.png)](https://gemnasium.com/js-data/js-data-angular) | diff --git a/dist/js-data-angular.js b/dist/js-data-angular.js index 1140241..4b0db6b 100644 --- a/dist/js-data-angular.js +++ b/dist/js-data-angular.js @@ -1,7 +1,7 @@ /** * @author Jason Dobry * @file js-data-angular.js -* @version 2.2.0 - Homepage +* @version 2.2.1 - Homepage * @copyright (c) 2014 Jason Dobry * @license MIT * @@ -30,7 +30,7 @@ var DSUtils = JSData.DSUtils; - var deepMixIn = JSData.DSUtils.deepMixIn; + var deepMixIn = DSUtils.deepMixIn; var httpLoaded = false; var adapters = [ @@ -362,7 +362,12 @@ _this.getPath('find', resourceConfig, id, options), options ).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + var item = (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + if (!item) { + return JSData.DSUtils.Promise.reject(new Error('Not Found!')); + } else { + return item; + } }); }; diff --git a/dist/js-data-angular.min.js b/dist/js-data-angular.min.js index 46fa68e..20e146f 100644 --- a/dist/js-data-angular.min.js +++ b/dist/js-data-angular.min.js @@ -1,12 +1,12 @@ /** * @author Jason Dobry * @file js-data-angular.min.js -* @version 2.2.0 - Homepage +* @version 2.2.1 - Homepage * @copyright (c) 2014 Jason Dobry * @license MIT * * @overview Angular wrapper for js-data. */ -!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);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g=200&&a.status<300?(e.defaults.log&&e.defaults.log(b,a),a):(e.defaults.error&&e.defaults.error("FAILED: "+b,a),d.reject(a))}var e=this,f=new Date;a=k(a,e.defaults.httpConfig),e.defaults.forceTrailingSlash&&"/"!==a.url[a.url.length-1]&&(a.url+="/"),a.method=a.method.toUpperCase(),"object"==typeof a.data&&(a.data=j.removeCircular(a.data));var g=a.suffix||e.defaults.suffix;return g&&a.url.substr(a.url.length-g.length)!==g&&(a.url+=g),b(a).then(c,c)};var e=new f(a.defaults);return c.registerAdapter("http",e,{"default":!0}),e}]}),c.module("js-data").run(["DS","DSHttpAdapter",function(a,b){a.registerAdapter("http",b,{"default":!0})}])}}(window,window.angular)},{"js-data":"js-data"}]},{},[1]); +!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);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g=200&&a.status<300?(e.defaults.log&&e.defaults.log(b,a),a):(e.defaults.error&&e.defaults.error("FAILED: "+b,a),d.reject(a))}var e=this,f=new Date;a=k(a,e.defaults.httpConfig),e.defaults.forceTrailingSlash&&"/"!==a.url[a.url.length-1]&&(a.url+="/"),a.method=a.method.toUpperCase(),"object"==typeof a.data&&(a.data=j.removeCircular(a.data));var g=a.suffix||e.defaults.suffix;return g&&a.url.substr(a.url.length-g.length)!==g&&(a.url+=g),b(a).then(c,c)};var e=new f(a.defaults);return c.registerAdapter("http",e,{"default":!0}),e}]}),c.module("js-data").run(["DS","DSHttpAdapter",function(a,b){a.registerAdapter("http",b,{"default":!0})}])}}(window,window.angular)},{"js-data":"js-data"}]},{},[1]); //# sourceMappingURL=js-data-angular.min.map \ No newline at end of file diff --git a/dist/js-data-angular.min.map b/dist/js-data-angular.min.map index b488a97..099c622 100644 --- a/dist/js-data-angular.min.map +++ b/dist/js-data-angular.min.map @@ -1 +1 @@ -{"version":3,"file":"js-data-angular.min.js","sources":["js-data-angular.js"],"names":["e","t","n","r","s","o","u","a","require","i","f","Error","code","l","exports","call","length",1,"window","angular","undefined","Defaults","DSHttpAdapter","options","this","defaults","deepMixIn","registerAdapter","adapter","Adapter","project","name","httpLoaded","loaded","module","provider","_this","$get","JSData","DSUtils","adapters","class","functionsToWrap","value","DSErrors","load","QPromise","executor","deferred","$q","defer","bind","resolve","reject","err","promise","args","Array","prototype","slice","arguments","$rootScope","store","DS","originals","all","when","Promise","j","registered","k","$$phase","apply","$apply","Object","observe","$watch","Platform","performMicrotaskCheckpoint","deps","push","bindAll","resourceName","params","scope","expr","cb","definitions","NER","isObject","IA","isString","lastModified","items","filter","set","bindOne","id","resolveId","isNumber","item","get","defaultsPrototype","queryTransform","resource","basePath","forceTrailingSlash","httpConfig","log","console","b","info","error","deserialize","data","serialize","dsHttpAdapterPrototype","getPath","method","resourceConfig","getEndpoint","makePath","GET","url","config","HTTP","POST","attrs","copy","PUT","DEL","find","suffix","then","findAll","create","update","updateAll","destroy","destroyAll","$http","logResponse","str","start","toUTCString","toUpperCase","status","Date","getTime","removeCircular","substr","default","run","js-data"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"js-data-angular.min.js","sources":["js-data-angular.js"],"names":["e","t","n","r","s","o","u","a","require","i","f","Error","code","l","exports","call","length",1,"window","angular","undefined","Defaults","DSHttpAdapter","options","this","defaults","deepMixIn","registerAdapter","adapter","Adapter","project","name","httpLoaded","loaded","module","provider","_this","$get","JSData","DSUtils","adapters","class","functionsToWrap","value","DSErrors","load","QPromise","executor","deferred","$q","defer","bind","resolve","reject","err","promise","args","Array","prototype","slice","arguments","$rootScope","store","DS","originals","all","when","Promise","j","registered","k","$$phase","apply","$apply","Object","observe","$watch","Platform","performMicrotaskCheckpoint","deps","push","bindAll","resourceName","params","scope","expr","cb","definitions","NER","isObject","IA","isString","lastModified","items","filter","set","bindOne","id","resolveId","isNumber","item","get","defaultsPrototype","queryTransform","resource","basePath","forceTrailingSlash","httpConfig","log","console","b","info","error","deserialize","data","serialize","dsHttpAdapterPrototype","getPath","method","resourceConfig","getEndpoint","makePath","GET","url","config","HTTP","POST","attrs","copy","PUT","DEL","find","suffix","then","findAll","create","update","updateAll","destroy","destroyAll","$http","logResponse","str","start","toUTCString","toUpperCase","status","Date","getTime","removeCircular","substr","default","run","js-data"],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 0b60466..6299628 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "js-data-angular", "description": "Angular wrapper for js-data.", - "version": "2.2.0", + "version": "2.2.1", "homepage": "http://www.js-data.io/docs/js-data-angular", "repository": { "type": "git", diff --git a/src/index.js b/src/index.js index 550bb2f..5c79398 100644 --- a/src/index.js +++ b/src/index.js @@ -20,7 +20,7 @@ var DSUtils = JSData.DSUtils; - var deepMixIn = JSData.DSUtils.deepMixIn; + var deepMixIn = DSUtils.deepMixIn; var httpLoaded = false; var adapters = [ @@ -352,7 +352,12 @@ _this.getPath('find', resourceConfig, id, options), options ).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + var item = (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + if (!item) { + return JSData.DSUtils.Promise.reject(new Error('Not Found!')); + } else { + return item; + } }); }; diff --git a/test/adapters/http/find.test.js b/test/adapters/http/find.test.js index ba03ce2..ad99d9d 100644 --- a/test/adapters/http/find.test.js +++ b/test/adapters/http/find.test.js @@ -28,6 +28,19 @@ describe('DSHttpAdapter.find', function () { assert.equal(lifecycle.queryTransform.callCount, 0, 'queryTransform should not have been called'); }); + it('should error if the item is undefined', function () { + $httpBackend.expectGET('http://test.angular-cache.com/posts/1').respond(200); + + DSHttpAdapter.find(Post, 1).then(function () { + fail('should not have reached this'); + }).catch(function (err) { + assert.equal(err.message, 'Not Found!'); + return true; + }); + + $httpBackend.flush(); + }); + it('should use default configs', function () { $httpBackend.expectGET('http://test.angular-cache.com/posts/1?test=test', { Authorization: 'test',