Merge branch 'release/2.1.3'

Author: noamshemesh

.travis.yml

@@ -2,10 +2,12 @@ language: node_js
 node_js:
   - "0.10"
   - "0.12"
-  - "4.2"
+  - "4"
+  - "5"
 services:
-  - redis-server  
+  - redis-server
 install:
 - npm install
 script:
 - make test
+

Readme.md

@@ -5,6 +5,8 @@
 [![Build Status](https://travis-ci.org/tj/node-ratelimiter.svg)](https://travis-ci.org/tj/node-ratelimiter)
 
 ## Release Notes
+[v2.1.3](https://github.com/tj/node-ratelimiter/tree/v2.1.3) - [#22](/../../pull/22) by [@coderhaoxin](https://github.com/coderhaoxin) - Dev dependencies versions bump
+
 [v2.1.2](https://github.com/tj/node-ratelimiter/tree/v2.1.2) - [#17](/../../pull/17) by [@waleedsamy](https://github.com/waleedsamy) - Add Travis CI support
 
 [v2.1.1](https://github.com/tj/node-ratelimiter/tree/v2.1.1) - [#13](/../../pull/13) by [@kwizzn](https://github.com/kwizzn) - Fixes out-of-sync TTLs after running decr()

index.js

@@ -68,7 +68,7 @@ Limiter.prototype.get = function (fn) {
   function create() {
     var ex = (Date.now() + duration) / 1000 | 0;
 
-	  db.multi()
+    db.multi()
       .set([count, max, 'PX', duration, 'NX'])
       .set([limit, max, 'PX', duration, 'NX'])
       .set([reset, ex, 'PX', duration, 'NX'])
@@ -116,15 +116,15 @@ Limiter.prototype.get = function (fn) {
   }
 
   function mget() {
-	  db.watch([count], function (err) {
-		  if (err) return fn(err);
-		  db.mget([count, limit, reset], function (err, res) {
-			  if (err) return fn(err);
-			  if (!res[0] && res[0] !== 0) return create();
-
-			  decr(res);
-		  });
-	  });
+    db.watch([count], function (err) {
+      if (err) return fn(err);
+      db.mget([count, limit, reset], function (err, res) {
+        if (err) return fn(err);
+        if (!res[0] && res[0] !== 0) return create();
+
+        decr(res);
+      });
+    });
   }
 
   mget();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ratelimiter",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "repository": "visionmedia/node-ratelimiter",
   "description": "abstract rate limiter backed by redis",
   "keywords": [
@@ -11,9 +11,9 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "ioredis": "1.9.0",
+    "ioredis": "1.15.1",
     "mocha": "*",
-    "redis": "0.10.2",
+    "redis": "2.6.0-1",
     "should": "*"
   },
   "license": "MIT",