feat: add drop method

Author: Blackheart340

package.json

@@ -65,6 +65,7 @@
     "cz-conventional-changelog": "^1.2.0",
     "eslint-config-unity": "^1.0.1",
     "husky": "^0.11.9",
+    "mock-webstorage": "^1.0.3",
     "nyc": "^8.4.0",
     "rimraf": "^2.5.4",
     "sinon": "^1.17.6",
@@ -81,6 +82,7 @@
     "failFast": false,
     "tap": false,
     "require": [
+      "./test/setup.js",
       "babel-register",
       "babel-polyfill"
     ],

src/factory.js

@@ -35,10 +35,13 @@ export default function factory(localforage) {
     }
 
     async function get(bin, key, validate = true) {
-        const isValid = validate && cacheBins[bin] ? await cacheBins[EXPIRE_BIN].getItem(getExpireKey(bin, key)) > Date.now() : true;
+        const expired = await cacheBins[EXPIRE_BIN].getItem(getExpireKey(bin, key));
+        const isValid = validate && cacheBins[bin] ? expired > Date.now() : true;
+
         if (!isValid) {
             await cacheBins[EXPIRE_BIN].removeItem(getExpireKey(bin, key));
         }
+
         return isValid ? await cacheBins[bin].getItem(key) : null; // localForage return null if item doesn't exist
     }
 
@@ -62,10 +65,21 @@ export default function factory(localforage) {
         return {
             get,
             set,
-            remove
+            remove,
+            drop
         };
     }
 
+    function drop(bins) {
+
+        if (!Array.isArray(bins)) {
+            bins = [ bins ];
+        }
+
+        bins.map(bin => {
+            return cacheBins[bin].clear();
+        });
+    }
+
     return createCache;
 }
-

test/cache.spec.js

@@ -1,38 +1,38 @@
 import test from 'ava';
-import factory from '../src/factory'
+import createCache from '../src/'
 import UnityCacheError from '../src/error';
-import localforageStub from './localforage.stub';
 
 test.beforeEach(t => {
-    t.context.cache = factory(localforageStub)(['store', 'store2']);
+    t.context.cache = createCache(['store', 'store2', 'drop_store']);
 });
 
 test('set/get val with default expiration period', async t => {
-    await t.context.cache.set('store', 'key', 'val');
-    const cachedVal = await t.context.cache.get('store', 'key');
+    await t.context.cache.set('store', 'key-not-expired', 'val');
+    const cachedVal = await t.context.cache.get('store', 'key-not-expired');
     t.is(cachedVal, 'val');
 });
 
 test('set/get val with set expiration period', async t => {
-    await t.context.cache.set('store', 'key', 'val', 1000);
-    const cachedVal = await t.context.cache.get('store', 'key');
-    t.is(cachedVal, 'val');
+    await t.context.cache.set('store', 'key2', 'val2', 1000);
+    const cachedVal = await t.context.cache.get('store', 'key2');
+    t.is(cachedVal, 'val2');
 });
 
 test('set/get expired val', async t => {
-    await t.context.cache.set('store', 'key', 'val', 0);
-    const cachedVal = await t.context.cache.get('store', 'key');
+    await t.context.cache.set('store', 'key-expired', 'val', 0);
+    const cachedVal = await t.context.cache.get('store', 'key-expired');
+
     t.is(cachedVal, null);
 });
 
 test('set/get expired val without validation', async t => {
-    await t.context.cache.set('store', 'key', 'val');
-    const cachedVal = await t.context.cache.get('store', 'key', false);
+    await t.context.cache.set('store', 'key-expired-2', 'val', 0);
+    const cachedVal = await t.context.cache.get('store', 'key-expired-2', false);
     t.is(cachedVal, 'val');
 });
 
 test('get non-existent val', async t => {
-    const cachedVal = await t.context.cache.get('store', 'key');
+    const cachedVal = await t.context.cache.get('store', 'key-non-exist');
     t.is(cachedVal, null);
 });
 
@@ -50,17 +50,21 @@ test('remove val', async t => {
 });
 
 test('remove non-existent key', async t => {
-    t.doesNotThrow(async () => await t.context.cache.remove('store', 'key-not-exist'));
+    t.notThrows(async () => await t.context.cache.remove('store', 'key-not-exist'));
 });
 
 test('remove val on non-existent store', async t => {
     t.throws(t.context.cache.remove('store-not-exist', 'key'), Error);
 });
 
 test('illegal store name', async t => {
-    t.throws(() => factory(localforageStub)(['with spaces']), UnityCacheError);
+    t.throws(() => createCache(['with spaces']), UnityCacheError);
 });
 
 test('does not throw on cache params', async t => {
-    t.doesNotThrow(() => factory(localforageStub)(['store'], 'test', 'test database', 'localStorage'));
+    t.notThrows(() => createCache(['store'], 'test', 'test database', 'localStorageWrapper'));
+});
+
+test('drop store', async t => {
+    t.notThrows(async () => await t.context.cache.drop([ 'drop_store' ]));
 });

test/localforage.stub.js

@@ -0,0 +1,3 @@
+var MockWebStorage = require('mock-webstorage');
+
+global.localStorage = new MockWebStorage();