Stable Version 3.0.0-beta.3

Fixed #106

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 3.0.0-beta.3 03 March 2014
+
+###### Backwards compatible bug fixes
+- Fixed duplicate keys when using localStorage #106
+
 ##### 3.0.0-beta.2 25 February 2014
 
 ###### Backwards compatible bug fixes

README.md

@@ -1,7 +1,7 @@
 ## angular-cache
 __A very useful replacement for Angular's $cacheFactory.__
 
-__Version:__ 3.0.0-beta.1
+__Version:__ 3.0.0-beta.3
 
 Documentation for 3.x.x can be found at [angular-data.codetrain.io](http://angular-data.codetrain.io).
 

bower.json

@@ -2,7 +2,7 @@
   "author": "Jason Dobry",
   "name": "angular-cache",
   "description": "angular-cache is a very useful replacement for Angular's $cacheFactory.",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.3",
   "homepage": "https://github.com/jmdobry/angular-cache",
   "repository": {
     "type": "git",

dist/angular-cache.js

@@ -1,7 +1,7 @@
 /**
  * @author Jason Dobry <jason.dobry@gmail.com>
  * @file angular-cache.js
- * @version 3.0.0-beta.2 - Homepage <https://github.com/jmdobry/angular-cache>
+ * @version 3.0.0-beta.3 - Homepage <https://github.com/jmdobry/angular-cache>
  * @copyright (c) 2013 Jason Dobry <http://www.pseudobry.com>
  * @license MIT <https://github.com/jmdobry/angular-cache/blob/master/LICENSE>
  *
@@ -1024,7 +1024,7 @@ module.exports = function put(key, value) {
 			key: key,
 			value: value,
 			created: now,
-			accessed: now,
+			accessed: now
 		};
 
 	item.expires = item.created + this.$$maxAge;
@@ -1050,7 +1050,16 @@ module.exports = function put(key, value) {
 		});
 		// Set item
 		this.$$storage.setItem(this.$$prefix + '.data.' + key, angular.toJson(item));
-		keys.push(key);
+		var exists = false;
+		for (var i = 0; i < keys.length; i++) {
+			if (keys[i] === key) {
+				exists = true;
+				break;
+			}
+		}
+		if (!exists) {
+			keys.push(key);
+		}
 		this.$$storage.setItem(this.$$prefix + '.keys', angular.toJson(keys));
 	} else {
 		// Remove existing
@@ -1654,7 +1663,7 @@ module.exports = function setRecycleFreq(recycleFreq) {
 },{}],18:[function(require,module,exports){
 var defaults = require('../defaults'),
 	DSCache = require('../DSCache'),
-	version = '3.0.0-beta.2';
+	version = '3.0.0-beta.3';
 
 /**
  * @doc function
@@ -2235,7 +2244,7 @@ module.exports = {
 	 * @id angular-cache
 	 * @name Overview
 	 * @description
-	 * __Version:__ 3.0.0-beta.2
+	 * __Version:__ 3.0.0-beta.3
 	 *
 	 * ## Install
 	 *
@@ -2255,7 +2264,7 @@ module.exports = {
 	 * also consumable by Browserify and you should be able to `require('angular-cache')`. The `main` file is `src/index.js`.
 	 *
 	 * #### Manual download
-	 * Download angular-cache.3.0.0-beta.2.js from the [Releases](https://github.com/jmdobry/angular-cache/releases)
+	 * Download angular-cache.3.0.0-beta.3.js from the [Releases](https://github.com/jmdobry/angular-cache/releases)
 	 * section of the angular-cache GitHub project.
 	 *
 	 * ## Load into Angular

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-cache",
   "description": "angular-cache is a very useful replacement for Angular's $cacheFactory.",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.3",
   "homepage": "http://jmdobry.github.io/angular-cache",
   "main": "src/index.js",
   "repository": {

src/DSCache/put.js

@@ -49,7 +49,7 @@ module.exports = function put(key, value) {
 			key: key,
 			value: value,
 			created: now,
-			accessed: now,
+			accessed: now
 		};
 
 	item.expires = item.created + this.$$maxAge;
@@ -75,7 +75,16 @@ module.exports = function put(key, value) {
 		});
 		// Set item
 		this.$$storage.setItem(this.$$prefix + '.data.' + key, angular.toJson(item));
-		keys.push(key);
+		var exists = false;
+		for (var i = 0; i < keys.length; i++) {
+			if (keys[i] === key) {
+				exists = true;
+				break;
+			}
+		}
+		if (!exists) {
+			keys.push(key);
+		}
 		this.$$storage.setItem(this.$$prefix + '.keys', angular.toJson(keys));
 	} else {
 		// Remove existing

test/unit/DSCache/index.keys.test.js

@@ -5,8 +5,53 @@ describe('DSCache.keys()', function () {
 		var cache = TestDSCacheFactory('DSCache.keys.cache');
 
 		cache.put(itemKeys[0], itemKeys[0]);
+		assert.deepEqual(cache.keys(), [itemKeys[0]]);
+
+		cache.put(itemKeys[0], itemKeys[2]);
+		assert.deepEqual(cache.keys(), [itemKeys[0]]);
+		assert.deepEqual(cache.get(itemKeys[0]), itemKeys[2]);
+
 		cache.put(itemKeys[1], itemKeys[1]);
+		assert.deepEqual(cache.keys(), [itemKeys[0], itemKeys[1]]);
+
+		cache.put(itemKeys[2], itemKeys[2]);
+		assert.deepEqual(cache.keys(), [itemKeys[0], itemKeys[1], itemKeys[2]]);
+
+		var keys = cache.keys();
+
+		assert.equal(keys[0], itemKeys[0]);
+		assert.equal(keys[1], itemKeys[1]);
+		assert.equal(keys[2], itemKeys[2]);
+
+		cache.remove(itemKeys[0]);
+		cache.remove(itemKeys[1]);
+		cache.remove(itemKeys[2]);
+
+		keys = cache.keys();
+
+		assert.equal(keys.length, 0);
+		assert.deepEqual(keys, []);
+	});
+	it('should return the array of keys of all items in the cache when using localStorage.', function () {
+		var itemKeys = ['item1', 'item2', 'item3'];
+
+		var cache = TestDSCacheFactory('DSCache.keys.cache', {
+			storageMode: 'localStorage',
+			storageImpl: $window.localStorage
+		});
+
+		cache.put(itemKeys[0], itemKeys[0]);
+		assert.deepEqual(cache.keys(), [itemKeys[0]]);
+
+		cache.put(itemKeys[0], itemKeys[2]);
+		assert.deepEqual(cache.keys(), [itemKeys[0]]);
+		assert.deepEqual(cache.get(itemKeys[0]), itemKeys[2]);
+
+		cache.put(itemKeys[1], itemKeys[1]);
+		assert.deepEqual(cache.keys(), [itemKeys[0], itemKeys[1]]);
+
 		cache.put(itemKeys[2], itemKeys[2]);
+		assert.deepEqual(cache.keys(), [itemKeys[0], itemKeys[1], itemKeys[2]]);
 
 		var keys = cache.keys();
 
@@ -21,5 +66,6 @@ describe('DSCache.keys()', function () {
 		keys = cache.keys();
 
 		assert.equal(keys.length, 0);
+		assert.deepEqual(keys, []);
 	});
 });