Merge branch 'release/v0.3.1'

jesucarr · Apr 20, 2015 · 190e41c · 190e41c
2 parents 3db2383 + 81a0092
commit 190e41c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tokenbucket",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A flexible rate limiter using different variations of the Token Bucket algorithm, with hierarchy support, and optional persistence in Redis. Useful for limiting API requests, or other tasks that need to be throttled.",
   "keywords": [
     "rate limiter",
@@ -30,7 +30,7 @@
     "coveralls": "gulp coveralls"
   },
   "dependencies": {
-    "bluebird": "2.9.14",
+    "bluebird": "2.9.24",
     "redis": "^0.12.1"
   },
   "devDependencies": {

diff --git a/test/tokenbucket.spec.coffee b/test/tokenbucket.spec.coffee
@@ -14,7 +14,10 @@ bucket = null
 clock = null
 
 # Helper function that checks that the removal happened inmediately or after the supposed time, and that it leaves the right amount of tokens
-checkRemoval = ({tokensRemove, time, tokensLeft, done, clock, parentTokensLeft}) ->
+checkRemoval = ({tokensRemove, time, tokensLeft, done, clock, parentTokensLeft, nextTickScheduler}) ->
+  if nextTickScheduler
+    Promise.setScheduler (fn) ->
+      process.nextTick fn
   bucket.removeTokens(tokensRemove)
     .then (remainingTokens) ->
       expect(bucket.tokensLeft, 'bucket.tokensLeft').eql tokensLeft if tokensLeft?
@@ -408,6 +411,7 @@ describe 'a tokenbucket with parent bucket', ->
           time: 1000
           clock: clock
           done: done
+          nextTickScheduler: true
 
       describe 'when after waiting for the parent doesn\t have enough tokens any more', ->
         it 'waits to get enough tokens', (done) ->