Fixed #3: Error trying to get an item from storage

Author: jherax

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.0.1
+
+### Fixes
+
+1. Fixed [#3](https://github.com/jherax/proxy-storage/issues/3): Error trying to get an item from storage.
+
 # 2.0.0
 
 ### Breaking changes

README.md

@@ -49,8 +49,8 @@ $ yarn add proxy-storage
 `proxy-storage` can be included directly from a CDN in your page:
 
 ```html
-<!-- last version: 2.0.0 -->
-<script src="https://cdn.rawgit.com/jherax/proxy-storage/2.0.0/dist/proxy-storage.min.js"></script>
+<!-- last version: 2.0.1 -->
+<script src="https://cdn.rawgit.com/jherax/proxy-storage/2.0.1/dist/proxy-storage.min.js"></script>
 ``` 
 
 In the above case, the [library](#api) is included into the namespace `proxyStorage` as a global object.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "proxy-storage",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Storage mechanism that implements the Web Storage interface",
   "author": "David Rivera <jherax@gmail.com>",
   "main": "dist/proxy-storage.js",

src/web-storage.js

@@ -44,6 +44,24 @@ function executeInterceptors(command, ...args) {
   }, value);
 }
 
+/**
+ * @private
+ *
+ * Try to parse a value
+ *
+ * @param  {string} value: the value to parse
+ * @return {any}
+ */
+function tryParse(value) {
+  let parsed;
+  try {
+    parsed = JSON.parse(value);
+  } catch (e) {
+    parsed = value;
+  }
+  return parsed;
+}
+
 /**
  * @private
  *
@@ -55,12 +73,7 @@ function executeInterceptors(command, ...args) {
  */
 function copyKeys(instance, storage) {
   Object.keys(storage).forEach((key) => {
-    let value = storage[key];
-    try {
-      instance[key] = JSON.parse(value);
-    } catch (e) {
-      instance[key] = value;
-    }
+    instance[key] = tryParse(storage[key]);
   });
 }
 
@@ -161,7 +174,10 @@ class WebStorage {
     checkEmpty(key);
     let value = proxy[this.__storage__].getItem(key);
     if (value === undefined) value = null;
-    else value = JSON.parse(value);
+    else {
+      value = tryParse(value);
+      this[key] = value;
+    }
     let v = executeInterceptors('getItem', key, value);
     if (v !== undefined) value = v;
     return value;