Small fix for locastorage and deserialize.

Author: jmdobry

dist/angular-data.js

@@ -2127,7 +2127,11 @@ function DSLocalStorageAdapterProvider() {
         var deferred = $q.defer();
         try {
           var item = localStorage.getItem(key);
-          deferred.resolve(item ? angular.fromJson(item) : undefined);
+          if (item) {
+            deferred.resolve(angular.fromJson(item));
+          } else {
+            deferred.reject('Not Found!');
+          }
         } catch (err) {
           deferred.reject(err);
         }
@@ -4300,7 +4304,7 @@ Defaults.prototype.serialize = function (resourceName, data) {
  * @returns {*} By default returns `data.data`.
  */
 Defaults.prototype.deserialize = function (resourceName, data) {
-  return data.data;
+  return data ? (data.data ? data.data : data) : data;
 };
 
 /**

dist/angular-data.min.js

@@ -89,7 +89,7 @@ beforeEach(function () {
   };
   lifecycle.deserialize = function (resourceName, data) {
     lifecycle.deserialize.callCount += 1;
-    return data.data;
+    return data ? (data.data ? data.data : data) : data;;
   };
   lifecycle.queryTransform = function (resourceName, query) {
     lifecycle.queryTransform.callCount += 1;

karma.start.js

@@ -36,7 +36,11 @@ function DSLocalStorageAdapterProvider() {
         var deferred = $q.defer();
         try {
           var item = localStorage.getItem(key);
-          deferred.resolve(item ? angular.fromJson(item) : undefined);
+          if (item) {
+            deferred.resolve(angular.fromJson(item));
+          } else {
+            deferred.reject('Not Found!');
+          }
         } catch (err) {
           deferred.reject(err);
         }

src/adapters/localStorage.js

@@ -569,7 +569,7 @@ Defaults.prototype.serialize = function (resourceName, data) {
  * @returns {*} By default returns `data.data`.
  */
 Defaults.prototype.deserialize = function (resourceName, data) {
-  return data.data;
+  return data ? (data.data ? data.data : data) : data;
 };
 
 /**

src/datastore/index.js

@@ -180,4 +180,19 @@ describe('DS.find(resourceName, id[, options]): ', function () {
 
     $httpBackend.flush();
   });
+  it('should use a different adapter', function (done) {
+    var Person = DS.defineResource({
+      name: 'person',
+      defaultAdapter: 'DSLocalStorageAdapter'
+    });
+
+    Person.find(5).then(function () {
+      done('Should not have succeeded.');
+    }, function (err) {
+      assert.equal(err, 'Not Found!');
+      done();
+    });
+
+    $rootScope.$apply();
+  });
 });