Stable Version 4.2.0.

Fixes #174
jmdobry · Apr 27, 2015 · cbeb9eb · cbeb9eb
1 parent 8d145d2
commit cbeb9eb
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
+##### 4.2.0 27 April 2015
+
+###### Backwards compatible bug fixes
+- #174 - Cache not being fully emptied if using localStorage and multiple web pages
+
 ##### 4.1.0 30 March 2015
 
-###### Backwards compatible API fixes
+###### Backwards compatible API changes
 - #169 - Official support for ngResource
 
 ##### 4.0.2 22 March 2015

diff --git a/dist/angular-cache.js b/dist/angular-cache.js
@@ -1,6 +1,6 @@
 /*!
  * angular-cache
- * @version 4.1.0 - Homepage <http://jmdobry.github.io/angular-cache/>
+ * @version 4.2.0 - Homepage <http://jmdobry.github.io/angular-cache/>
  * @author Jason Dobry <[email protected]>
  * @copyright (c) 2013-2015 Jason Dobry 
  * @license MIT <https://github.com/jmdobry/angular-cache/blob/master/LICENSE>
@@ -93,7 +93,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _keySet = function (collection) {
 	  var keySet = {},
-	      key;
+	      key = undefined;
 	  for (key in collection) {
 	    if (collection.hasOwnProperty(key)) {
 	      keySet[key] = key;
@@ -201,7 +201,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  };
 
 	  this.peek = function () {
-	    return _this.heap[0];
+	    return _this.heap.length ? _this.heap[0] : undefined;
 	  };
 
 	  this.pop = function () {
@@ -656,6 +656,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            }
 	            $$data = {};
 	          }
+	          $$promises = {};
 	        },
 
 	        removeExpired: function removeExpired() {

diff --git a/dist/angular-cache.min.js b/dist/angular-cache.min.js
diff --git a/dist/angular-cache.min.map b/dist/angular-cache.min.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-cache",
   "description": "angular-cache is a very useful replacement for Angular's $cacheFactory.",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "homepage": "http://jmdobry.github.io/angular-cache/",
   "main": "dist/angular-cache.js",
   "repository": {

diff --git a/src/index.js b/src/index.js
@@ -22,7 +22,7 @@ let _stringifyNumber = number => {
 };
 
 let _keySet = collection => {
-  var keySet = {}, key;
+  let keySet = {}, key;
   for (key in collection) {
     if (collection.hasOwnProperty(key)) {
       keySet[key] = key;
@@ -122,9 +122,7 @@ class BinaryHeap {
       bubbleUp(this.heap, this.weightFunc, this.heap.length - 1);
     };
 
-    this.peek = () => {
-      return this.heap[0];
-    };
+    this.peek = () => this.heap.length ? this.heap[0] : undefined;
 
     this.pop = () => {
       let front = this.heap[0];
@@ -137,8 +135,8 @@ class BinaryHeap {
     };
 
     this.remove = node => {
-      var length = this.heap.length;
-      for (let i = 0; i < length; i++) {
+      let length = this.heap.length;
+      for (var i = 0; i < length; i++) {
         if (this.compareFunc(this.heap[i], node)) {
           let removed = this.heap[i];
           let end = this.heap.pop();
@@ -157,9 +155,7 @@ class BinaryHeap {
       this.heap = [];
     };
 
-    this.size = () => {
-      return this.heap.length;
-    };
+    this.size = () => this.heap.length;
   }
 }
 
@@ -171,7 +167,7 @@ class BinaryHeapProvider {
 
 class CacheFactoryProvider {
   constructor() {
-    var defaults = this.defaults = {
+    let defaults = this.defaults = {
       capacity: Number.MAX_VALUE,
       maxAge: Number.MAX_VALUE,
       deleteOnExpire: 'none',
@@ -321,7 +317,7 @@ class CacheFactoryProvider {
             if (key) {
               let item;
               if ($$storage) {
-                var itemJson = $$storage().getItem(`${this.$$prefix}.data.${key}`);
+                let itemJson = $$storage().getItem(`${this.$$prefix}.data.${key}`);
 
                 if (itemJson) {
                   item = angular.fromJson(itemJson);
@@ -385,7 +381,7 @@ class CacheFactoryProvider {
               let kSet = {};
 
               if (keysJson) {
-                var keys = angular.fromJson(keysJson);
+                let keys = angular.fromJson(keysJson);
 
                 for (var i = 0; i < keys.length; i++) {
                   kSet[keys[i]] = keys[i];
@@ -431,8 +427,8 @@ class CacheFactoryProvider {
               throw new Error('key must be a string!');
             }
 
-            var now = new Date().getTime();
-            var item = {
+            let now = new Date().getTime();
+            let item = {
               key: key,
               value: _isPromiseLike(value) ? value.then(getHandler(storeOnResolve, false), getHandler(storeOnReject, true)) : value,
               created: now,
@@ -446,9 +442,9 @@ class CacheFactoryProvider {
                 $$promises[key] = item.value;
                 return $$promises[key];
               }
-              var keysJson = $$storage().getItem(`${this.$$prefix}.keys`);
-              var keys = keysJson ? angular.fromJson(keysJson) : [];
-              var itemJson = $$storage().getItem(`${this.$$prefix}.data.${key}`);
+              let keysJson = $$storage().getItem(`${this.$$prefix}.keys`);
+              let keys = keysJson ? angular.fromJson(keysJson) : [];
+              let itemJson = $$storage().getItem(`${this.$$prefix}.data.${key}`);
 
               // Remove existing
               if (itemJson) {
@@ -466,7 +462,7 @@ class CacheFactoryProvider {
               });
               // Set item
               $$storage().setItem(`${this.$$prefix}.data.${key}`, JSON.stringify(item));
-              var exists = false;
+              let exists = false;
               for (var i = 0; i < keys.length; i++) {
                 if (keys[i] === key) {
                   exists = true;
@@ -527,7 +523,7 @@ class CacheFactoryProvider {
                 return item.value;
               }
             } else {
-              var value = $$data[key] ? $$data[key].value : undefined;
+              let value = $$data[key] ? $$data[key].value : undefined;
               $$lruHeap.remove($$data[key]);
               $$expiresHeap.remove($$data[key]);
               $$data[key] = null;
@@ -558,6 +554,7 @@ class CacheFactoryProvider {
               }
               $$data = {};
             }
+            $$promises = {};
           },
 
           removeExpired() {
@@ -573,7 +570,7 @@ class CacheFactoryProvider {
 
             if ($$storage) {
               for (key in expired) {
-                var itemJson = $$storage().getItem(`${this.$$prefix}.data.${key}`);
+                let itemJson = $$storage().getItem(`${this.$$prefix}.data.${key}`);
                 if (itemJson) {
                   expired[key] = angular.fromJson(itemJson).value;
                   this.remove(key);
@@ -622,7 +619,7 @@ class CacheFactoryProvider {
             } else {
               this.$$capacity = capacity;
             }
-            var removed = {};
+            let removed = {};
             while ($$lruHeap.size() > this.$$capacity) {
               removed[$$lruHeap.peek().key] = this.remove($$lruHeap.peek().key);
             }