Merge pull request #28 from stropitek/master

Simpler and safer handling of non-valid jsons
tsironis · Feb 25, 2016 · 791a95b · 791a95b
2 parents 0e21574 + a1f6662
commit 791a95b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/lockr.js b/lockr.js
@@ -67,15 +67,11 @@
     try {
       value = JSON.parse(localStorage.getItem(query_key));
     } catch (e) {
-        try {
             if(localStorage[query_key]) {
-                value = JSON.parse('{"data":"' + localStorage.getItem(query_key) + '"}');
+              value = {data: localStorage.getItem(query_key)};
             } else{
                 value = null;
             }
-        } catch (e) {
-            if (console) console.warn("Lockr could not load the item with key " + key);
-        }
     }
     if(value === null) {
       return missing;

diff --git a/lockr.min.js b/lockr.min.js
diff --git a/specs/lockrSpecs.js b/specs/lockrSpecs.js
@@ -71,16 +71,21 @@ describe('Lockr.get', function () {
     expect(contents).toContain([2, 3]);
   });
 
-  describe('with wrong data', function() {
+  describe('with pre-existing data', function() {
     beforeEach(function() {
       localStorage.setItem('wrong', ',fluffy,truffly,commas,hell');
+      localStorage.setItem('unescaped', 'a " double-quote');
     });
 
-    it('cleans wrong data', function () {
+    it("if it's not a json we get as-is", function () {
       var wrongData = Lockr.get("wrong");
-
       expect(wrongData).toBe(',fluffy,truffly,commas,hell');
     });
+
+    it('works with unescaped characters', function () {
+      var unescaped = Lockr.get('unescaped');
+      expect(unescaped).toBe('a " double-quote');
+    });
   });
 });