refactor modular

Author: pasupulaphani

lib/logger.js

@@ -2,7 +2,6 @@
 
 const genericPool = require("generic-pool");
 const redis = require("./redis");
-const logger = require("./logger");
 
 const debug = require("debug")("simpleRedisPool");
 
@@ -19,14 +18,14 @@ function RedisPool (name, redisOptions, poolOptions) {
         const client = redis.createClient(redisOptions);
 
         if (["undefined", null, ""].indexOf(this._redisDb) !== -1) {
-          logger.info("Selected Redis DB: ", this._redisDb);
+          debug("Selected Redis DB: ", this._redisDb);
           debug("Selected Redis DB: ", this._redisDb);
           client.select(this._redisDb);
         }
 
         // Handle client connection errors.
         client.on("error", err => {
-          logger.error("Redis pool: ", name, err);
+          debug("Redis pool: ", name, err);
           reject(err);
         });
 
@@ -44,7 +43,7 @@ function RedisPool (name, redisOptions, poolOptions) {
         try {
           // Flush when closing.
           client.end(true);
-          logger.info("Checking pool info after client destroyed. Available count : %s. Pool size: %s", _pool.availableObjectsCount(), _pool.getPoolSize());
+          debug("Checking pool info after client destroyed. Available count : %s. Pool size: %s", _pool.availableObjectsCount(), _pool.getPoolSize());
           resolve();
         } catch (err) {
           throw new Error("error", "Error destroying redis client.");

lib/redis_pool.js

@@ -1,6 +1,5 @@
 const RedisPool = require("./redis_pool");
 const bind = require("./util/bind");
-const logger = require("./logger");
 
 const debug = require("debug")("simpleRedisStore");
 
@@ -27,7 +26,7 @@ function RedisStore (name, redisOptions, poolOptions) {
   }, poolOptions);
 
   const pool = new RedisPool(name, redisOptions, poolOptions);
-  logger.info("Redis store created.", pool.status());
+  debug("Redis store created.", pool.status());
 
   this.getName = bind(pool.getName, pool);
   this.getRedisDB = bind(pool.getDB, pool);
@@ -57,21 +56,18 @@ function RedisStore (name, redisOptions, poolOptions) {
     if (!pattern || pattern === "") {
       pattern = "*";
     }
-    logger.info("clearing redis keys: ", pattern);
-
-    return pool.acquire()
-      .then((conn) => {
-        return conn.keysAsync(pattern)
-          .then((keys) => {
-            if (keys.length > 0) {
-              debug("deleting keys ", keys);
-              return conn.delAsync(keys)
-                .then((result) => {
-                  pool.release(conn);
-                  return result;
-                });
-            }
-          });
+    debug("clearing redis keys: ", pattern);
+
+    return wrapFunc(pool, (conn) => conn.keysAsync(pattern))
+      .then(keys => {
+
+        if (keys.length > 0) {
+          debug("deleting keys ", keys);
+          return wrapFunc(pool, (conn) => conn.delAsync(keys));
+        } else {
+          debug("no keys exists with pattern: ", pattern);
+          return Promise.resolve(true);
+        }
       });
   };
 }

lib/redis_store.js

@@ -185,36 +185,32 @@ describe("redisStore", function () {
 
   describe("keys", function () {
 
-    beforeEach(function (done) {
+    const keyValues = {key1: "value1", key2: "value2"};
+
+    before(function (done) {
       store.deleteAll()
         .then(() => done());
     });
 
-    it("should return all the keys", function (done) {
-
-      const keyValues = {key1: "value1", key2: "value2"};
+    beforeEach(function (done) {
+      Promise.all(Object.keys(keyValues)
+        .map(key => store.set(key, keyValues[key]))
+      ).then(() => done());
+    });
 
-      for (var key in keyValues) {
-        store.set(key, keyValues[key]);
-      }
+    it("should return all the keys", function (done) {
 
       store.keys()
-        .then(function (keys) {
+        .then(keys => {
           keyValues.should.have.keys(keys[0], keys[1]);
           done();
         });
     });
 
     it("should return all the keys matches pattern", function (done) {
 
-      const keyValues = {key1: "value1", key2: "value2"};
-
-      for (var key in keyValues) {
-        store.set(key, keyValues[key]);
-      }
-
       store.keys("key[2]")
-        .then(function (keys) {
+        .then(keys => {
           keys.should.containEql("key2");
           done();
         });
@@ -223,22 +219,21 @@ describe("redisStore", function () {
 
   describe("deleteAll", function () {
 
-    beforeEach(function () {
+    beforeEach(function (done) {
       const keyValues = {key1: "value1", key2: "value2"};
 
-      for (var key in keyValues) {
-        store.set(key, keyValues[key]);
-      }
+      Promise.all(Object.keys(keyValues)
+        .map(key => store.set(key, keyValues[key]))
+      ).then(() => done());
     });
 
     it("should delete all the keys", function (done) {
 
       store.deleteAll()
         .then(function (v) {
           v.should.be.ok();
-        });
-
-      store.keys()
+        })
+        .then(store.keys)
         .then(function (keys) {
           keys.should.be.empty();
           done();
@@ -250,14 +245,26 @@ describe("redisStore", function () {
       store.deleteAll("key[2]")
         .then(function (v) {
           v.should.be.ok();
-        });
-
-      store.keys()
+        })
+        .then(store.keys)
         .then(function (keys) {
           keys.should.be.not.empty();
           keys.should.not.containEql("key2");
           done();
         });
     });
+
+    it("should not delete when nothing matches", function (done) {
+
+      store.deleteAll()
+        .then(function (v) {
+          v.should.be.ok();
+        })
+        .then(() => store.deleteAll("nonExistingKey"))
+        .then(function (v) {
+          v.should.be.ok();
+          done();
+        });
+    });
   });
 });