Merge 5e9f337 into 4973fce

.eslintrc

@@ -5,12 +5,8 @@
     "node": true,
     "jest": true
   },
-  "parserOptions": {
-    "ecmaVersion": 2018
-  },
   "rules": {
-    "no-multi-assign": 1,
-    "func-names": 1,
-    "no-underscore-dangle": 1
+    "arrow-parens": ["error", "as-needed"],
+    "no-underscore-dangle": 0
   }
 }

.prettierrc

@@ -2,5 +2,6 @@
   "trailingComma": "none",
   "tabWidth": 2,
   "semi": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "arrowParens": "avoid"
 }

docs/redisCache.js.html

@@ -113,7 +113,7 @@ <h1>redisCache.js</h1>
 let options = {}
 let store = null
 
-const getNumber = num => !Number.isNaN(num) &amp;&amp; num >= 0 ? num : null
+const getNumber = (num) => (!Number.isNaN(num) &amp;&amp; num >= 0 ? num : null)
 
 /**
  * @param    {object}   options
@@ -182,7 +182,7 @@ <h1>redisCache.js</h1>
  * Sets the ttlInSeconds
  * @returns {number} ttl
  */
-exports.setTtlInSeconds = ttl => {
+exports.setTtlInSeconds = (ttl) => {
   options.ttlInSeconds = getNumber(ttl)
   return options.ttlInSeconds
 }
@@ -216,7 +216,7 @@ <h1>redisCache.js</h1>
  * @param {string} key - key for the value stored
  * @returns {any} value or null when the key is missing
  */
-exports.get = key => this.getStore().get(key)
+exports.get = (key) => this.getStore().get(key)
 
 /**
  * Returns all keys matching pattern
@@ -247,9 +247,7 @@ <h1>redisCache.js</h1>
  * @property {number} opts.ttlInSeconds - time to live in seconds
  * @returns {string} 'OK' if successful
  */
-exports.wrap = async (key, fn, {
-  ttlInSeconds
-} = {}) => {
+exports.wrap = async (key, fn, { ttlInSeconds } = {}) => {
   const ttl = getNumber(ttlInSeconds) || options.ttlInSeconds
 
   if (ttl &amp;&amp; ttl === 0) {

lib/redisCache.js

@@ -8,7 +8,7 @@ const NotInitialisedError = require('./NotInitialisedError')
 let options = {}
 let store = null
 
-const getNumber = (num) => (!Number.isNaN(num) && num >= 0 ? num : null)
+const getNumber = num => (!Number.isNaN(num) && num >= 0 ? num : 0)
 
 /**
  * @param    {object}   options
@@ -32,7 +32,7 @@ exports.init = ({
     redisOptions,
     poolOptions,
     logger: createLogger(logger),
-    ttlInSeconds
+    ttlInSeconds: getNumber(ttlInSeconds)
   }
 
   store = new RedisStore(options)
@@ -77,7 +77,7 @@ exports.getTtlInSeconds = () => options.ttlInSeconds
  * Sets the ttlInSeconds
  * @returns {number} ttl
  */
-exports.setTtlInSeconds = (ttl) => {
+exports.setTtlInSeconds = ttl => {
   options.ttlInSeconds = getNumber(ttl)
   return options.ttlInSeconds
 }
@@ -111,7 +111,7 @@ exports.getset = async (key, value, ttlInSeconds) => {
  * @param {string} key - key for the value stored
  * @returns {any} value or null when the key is missing
  */
-exports.get = (key) => this.getStore().get(key)
+exports.get = key => this.getStore().get(key)
 
 /**
  * Returns all keys matching pattern
@@ -145,7 +145,7 @@ exports.deleteAll = (pattern = '*') => this.getStore().deleteAll(pattern)
 exports.wrap = async (key, fn, { ttlInSeconds } = {}) => {
   const ttl = getNumber(ttlInSeconds) || options.ttlInSeconds
 
-  if (ttl && ttl === 0) {
+  if (ttl === 0) {
     debug(`Not caching, invalid ttl: ${ttlInSeconds}`)
     return fn()
   }

lib/redisCache.test.js

@@ -8,6 +8,7 @@ const {
   getPoolOptions,
   getRedisOptions,
   getset,
+  getStore,
   getTtlInSeconds,
   keys,
   set,
@@ -22,17 +23,9 @@ describe('redisCache', () => {
     host: process.env.REDIS_HOST || '127.0.0.1',
     auth_pass: process.env.REDIS_AUTH
   }
-  const poolOptions = {
-    min: 2,
-    max: 4
-  }
+  const poolOptions = { min: 2, max: 4 }
   const ttlInSeconds = 10
-  const options = {
-    name,
-    redisOptions,
-    poolOptions,
-    ttlInSeconds
-  }
+  const options = { name, redisOptions, poolOptions, ttlInSeconds }
   init(options)
 
   const key = 'chuck-norris'
@@ -69,6 +62,12 @@ describe('redisCache', () => {
     })
   })
 
+  describe('getStore', () => {
+    test('returns store', () => {
+      expect(getStore()).not.toBeNull()
+    })
+  })
+
   describe('status', () => {
     test('get store stats', () => {
       const { name: statusName, size, available, pending } = status()
@@ -126,6 +125,10 @@ describe('redisCache', () => {
 
     beforeAll(() => deleteAll())
 
+    afterEach(() => {
+      setTtlInSeconds(ttlInSeconds)
+    })
+
     test("set if key doesn't exist", async () => {
       const localKey = genRandomStr()
 
@@ -146,6 +149,7 @@ describe('redisCache', () => {
 
     test('do nothing when ttlInSeconds=0', async () => {
       const localKey = genRandomStr()
+      setTtlInSeconds(0)
 
       const result = await wrap(localKey, fn, {
         ttlInSeconds: 0
@@ -154,8 +158,9 @@ describe('redisCache', () => {
       expect(result).toBe(newValue)
     })
 
-    test('do nothing when ttlInSeconds=0', async () => {
+    test('do nothing when ttlInSeconds < 0', async () => {
       const localKey = genRandomStr()
+      setTtlInSeconds(0)
 
       const result = await wrap(localKey, fn, {
         ttlInSeconds: -1
@@ -166,6 +171,7 @@ describe('redisCache', () => {
 
     test('do nothing when ttlInSeconds is invalid', async () => {
       const localKey = genRandomStr()
+      setTtlInSeconds('NOT_NUMBER')
 
       const result = await wrap(localKey, fn, {
         ttlInSeconds: 'NOT_NUMBER'
@@ -176,14 +182,11 @@ describe('redisCache', () => {
   })
 
   describe('keys', () => {
-    const keyValues = {
-      key1: 'value1',
-      'test:key2': 'value2'
-    }
+    const keyValues = { key1: 'value1', 'test:key2': 'value2' }
 
     beforeAll(() => deleteAll())
     beforeEach(() =>
-      Promise.all(Object.keys(keyValues).map((k) => set(k, keyValues[k])))
+      Promise.all(Object.keys(keyValues).map(k => set(k, keyValues[k])))
     )
 
     test('return all the keys', async () =>
@@ -203,14 +206,11 @@ describe('redisCache', () => {
   })
 
   describe('del', () => {
-    const keyValues = {
-      key1: 'value1',
-      key2: 'value2'
-    }
+    const keyValues = { key1: 'value1', key2: 'value2' }
 
     beforeEach(async () => {
       await deleteAll()
-      await Promise.all(Object.keys(keyValues).map((k) => set(k, keyValues[k])))
+      await Promise.all(Object.keys(keyValues).map(k => set(k, keyValues[k])))
     })
 
     test('delete keys array', async () => {
@@ -230,13 +230,10 @@ describe('redisCache', () => {
   })
 
   describe('deleteAll', () => {
-    const keyValues = {
-      key1: 'value1',
-      key2: 'value2'
-    }
+    const keyValues = { key1: 'value1', key2: 'value2' }
 
     beforeEach(() =>
-      Promise.all(Object.keys(keyValues).map((k) => set(k, keyValues[k])))
+      Promise.all(Object.keys(keyValues).map(k => set(k, keyValues[k])))
     )
 
     test('delete all the keys', async () => {