[deps test] bull 2.x + ioredis [Closes #11]

package.json

@@ -37,14 +37,14 @@
   },
   "homepage": "https://github.com/nextorigin/el-borracho-stats#readme",
   "devDependencies": {
-    "bull": "^1.0.0",
+    "bull": "^2.0.0",
     "chai": "^3.5.0",
     "coveralls": "^2.11.15",
     "iced-coffee-coverage": "^1.0.21",
     "iced-coffee-script": "^108.0.11",
+    "ioredis": "^2.4.2",
     "istanbul": "^0.4.5",
     "mocha": "^3.2.0",
-    "redis": "^2.6.3",
     "sinon": "^1.17.6"
   },
   "peerDependencies": {

src/models/stats.coffee

@@ -33,7 +33,7 @@ class ElBorrachoStats
     callback()
 
   updateLock: (callback) =>
-    @redis.EXPIRE @statistician, @expire, callback
+    @redis.expire @statistician, @expire, callback
 
   unlock: (callback = ->) =>
     await @redis.del @statistician, defer err

test/el-borracho-stats.coffee

@@ -1,7 +1,7 @@
 ElBorrachoStats           = require "../src/models/stats"
 ElBorrachoStatsController = require "../src/el-borracho-stats"
 
-redis      = require "redis"
+redis      = require "ioredis"
 errify     = require "errify"
 mocha      = require "mocha"
 {expect}   = require "chai"
@@ -62,6 +62,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.set key, i * 2 for key, i in statKeys
       multi.exec done
+      return
 
     afterEach (done) ->
       ideally = errify done
@@ -74,6 +75,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.del key for key in cleanup
       multi.exec done
+      return
 
     it "should callback with error if fetch fails", (done) ->
       instance.store.redis.mget = (_, callback) -> callback new Error "fake"
@@ -164,6 +166,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.set key, i * 2 for key, i in statKeys
       multi.exec done
+      return
 
     afterEach (done) ->
       ideally = errify done
@@ -176,6 +179,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.del key for key in cleanup
       multi.exec done
+      return
 
     it "should callback with error if fetch fails", (done) ->
       instance.store.redis.get = (_, callback) -> callback new Error "fake"
@@ -221,6 +225,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.set key, i * 2 for key, i in statKeys
       multi.exec done
+      return
 
     afterEach (done) ->
       ideally = errify done
@@ -233,6 +238,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.del key for key in cleanup
       multi.exec done
+      return
 
     it "should callback with error if fetch fails", (done) ->
       instance.store.redis.mget = (_, callback) -> callback new Error "fake"
@@ -328,6 +334,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.set key, i + 2 for key, i in statKeys
       multi.exec done
+      return
 
     afterEach (done) ->
       ideally = errify done
@@ -340,6 +347,7 @@ describe "ElBorrachoStatsController", ->
       multi = client.multi()
       multi.del key for key in cleanup
       multi.exec done
+      return
 
     it "should callback with error if fetch fails", (done) ->
       instance.store.redis.get = (_, callback) -> callback new Error "fake"

test/stats.coffee

@@ -1,6 +1,6 @@
 ElBorrachoStats = require "../src/models/stats"
 
-redis      = require "redis"
+redis      = require "ioredis"
 errify     = require "errify"
 mocha      = require "mocha"
 {expect}   = require "chai"
@@ -109,9 +109,11 @@ describe "ElBorrachoStats", ->
 
     beforeEach (done) ->
       instance.lock done
+      return
 
     afterEach (done) ->
       instance.unlock done
+      return
 
     describe "##lock", ->
       it "should set the lock in redis", (done) ->
@@ -194,17 +196,18 @@ describe "ElBorrachoStats", ->
         multi = client.multi()
         multi.del key for key in statKeys
         multi.exec done
+        return
 
       it "should throw an error if lock update failed", (done) ->
         handler = dontCatch()
-        _EXPIRE = client.EXPIRE
-        client.EXPIRE = (_, __, callback) -> callback new Error "fake"
+        _expire = client.expire
+        client.expire = (_, __, callback) -> callback new Error "fake"
 
         expectation = (err) ->
           expect(err).to.be.an.instanceof Error
           expect(err.toString()).to.match /fake/
 
-          client.EXPIRE = _EXPIRE
+          client.expire = _expire
 
           handler.restore()
           done()
@@ -320,6 +323,7 @@ describe "ElBorrachoStats", ->
       multi = client.multi()
       multi.del key for key in statKeys
       multi.exec done
+      return
 
     describe "##fetch", ->
       it "should callback with totals for queue", (done) ->

test/worker.coffee

@@ -1,7 +1,7 @@
 ElBorrachoStats           = require "../src/models/stats"
 ElBorrachoStatsWorker     = require "../src/controllers/worker"
 
-redis      = require "redis"
+redis      = require "ioredis"
 Bull       = require "bull"
 errify     = require "errify"
 mocha      = require "mocha"