more tests; modularize dependent pkgs

Author: pasupulaphani

lib/redis.js

@@ -1,75 +1,86 @@
-const RedisPool = require("./redis_pool");
-const bind = require("./util/bind");
+const RedisPool = require("simple-redis-pool");
 
 const debug = require("debug")("simpleRedisStore");
 
-function wrapFunc (pool, func) {
-  return pool.acquire()
-    .then((conn) => func(conn)
-        .then((result) => {
-          pool.release(conn);
+var RedisStore = module.exports = function (name, redisOptions, poolOptions) {
+
+  // set default pool options
+  poolOptions = Object.assign({
+    acquireTimeoutMillis: 50
+  }, poolOptions || {});
+
+  this.name = name;
+  this.redisOptions = redisOptions;
+  this.poolOptions = poolOptions;
+  this.pool = new RedisPool(name, redisOptions, poolOptions);
+  debug("Redis store created.", this.pool.status());
+
+  this.getName = this.pool.getName;
+  this.getRedisDB = this.pool.getRedisDB;
+  this.getPoolStatus = this.pool.status;
+};
+
+RedisStore.prototype.executeCmd = function (cmd) {
+  return this.pool.acquire()
+    .then(conn => cmd(conn)
+        .then(result => {
+          this.pool.release(conn);
           return result;
         })
         .catch(err => {
-          pool.release(conn);
+          this.pool.release(conn);
           throw err;
         }));
-}
-
-function RedisStore (name, redisOptions, poolOptions) {
-
-  if (!poolOptions) {
-    poolOptions = {};
-  }
-  poolOptions = Object.assign({
-    acquireTimeoutMillis: 50
-  }, poolOptions);
+};
 
-  const pool = new RedisPool(name, redisOptions, poolOptions);
-  debug("Redis store created.", pool.status());
+RedisStore.prototype.get = function (key) {
+  return this.executeCmd(conn => conn.getAsync(key));
+};
 
-  this.getName = bind(pool.getName, pool);
-  this.getRedisDB = bind(pool.getDB, pool);
-  this.getPoolStatus = bind(pool.status, pool);
+RedisStore.prototype.set = function (key, value, ttlInSeconds) {
 
-  this.get = (key) => wrapFunc(pool, (conn) => conn.getAsync(key));
-
-  this.set = (key, value) => wrapFunc(pool, (conn) => conn.setAsync(key, value));
-
-  this.setex = (key, value, ttlInSeconds) => wrapFunc(pool, (conn) => conn.setexAsync(key, ttlInSeconds, value));
-
-  this.del = (key) => wrapFunc(pool, (conn) => conn.delAsync(key));
-
-  this.expire = (key, ttlInSeconds) => wrapFunc(pool, (conn) => conn.expireAsync(key, ttlInSeconds));
-
-  this.ttlInSeconds = (key) => wrapFunc(pool, (conn) => conn.ttlAsync(key));
+  if (ttlInSeconds) {
+    return this.executeCmd(conn => conn.setexAsync(key, ttlInSeconds, value));
+  } else {
+    return this.executeCmd(conn => conn.setAsync(key, value));
+  }
+};
 
-  this.keys = (pattern) => {
-    if (!pattern || pattern === "") {
-      pattern = "*";
-    }
+RedisStore.prototype.del = function (keys) {
+  return this.executeCmd(conn => conn.delAsync(keys));
+};
 
-    return wrapFunc(pool, (conn) => conn.keysAsync(pattern));
-  };
+RedisStore.prototype.expire = function (key, ttlInSeconds) {
+  return this.executeCmd(conn => conn.expireAsync(key, ttlInSeconds));
+};
 
-  this.deleteAll = (pattern) => {
-    if (!pattern || pattern === "") {
-      pattern = "*";
-    }
-    debug("clearing redis keys: ", pattern);
+RedisStore.prototype.ttlInSeconds = function (key) {
+  return this.executeCmd(conn => conn.ttlAsync(key));
+};
 
-    return wrapFunc(pool, (conn) => conn.keysAsync(pattern))
-      .then(keys => {
+RedisStore.prototype.keys = function (pattern) {
+  if (!pattern || pattern === "") {
+    pattern = "*";
+  }
 
-        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);
-        }
-      });
-  };
-}
+  return this.executeCmd(conn => conn.keysAsync(pattern));
+};
 
-module.exports = RedisStore;
+RedisStore.prototype.deleteAll = function (pattern) {
+  if (!pattern || pattern === "") {
+    pattern = "*";
+  }
+  debug("clearing redis keys: ", pattern);
+
+  return this.keys(pattern)
+    .then(keys => {
+
+      if (keys.length > 0) {
+        debug("deleting keys ", keys);
+        return this.del(keys);
+      } else {
+        debug("no keys exists with pattern: ", pattern);
+        return Promise.resolve(true);
+      }
+    });
+};

lib/redis_pool.js

@@ -33,12 +33,11 @@
     "coveralls": "npm run cover -- --report lcovonly && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
   },
   "dependencies": {
-    "bluebird": "^3.4.6",
     "debug": "^2.2.0",
-    "generic-pool": "^3.1.1",
-    "redis": "^2.6.2"
+    "simple-redis-pool": "^1.0.0"
   },
   "devDependencies": {
+    "bluebird": "^3.4.6",
     "coveralls": "^2.11.14",
     "eslint": "^3.9.1",
     "istanbul": "^0.4.5",