added compatability for ioredis #3

Author: Brian Detering

README.md

@@ -8,6 +8,9 @@ adding Redis as a caching layer.
 
 ```javascript
 const redisClient = require('redis').createClient();
+// the "ioredis" module is also supported
+// const Redis = require('ioredis');
+// const redisClient = new Redis();
 const DataLoader = require('dataloader');
 const RedisDataLoader = require('redis-dataloader')({ redis: redisClient });
 
@@ -90,7 +93,7 @@ All the options available to Facebook Dataloader can be passed in here. An
 additional option called **expire** is also available, and will set a ttl in seconds
 on all keys set in redis if this option is passed.
 
-By default, the "cacheKeyFn" will serialize objects and arrays using [json-stable-stringify](https://github.com/substack/json-stable-stringify) and allow all other values to pass through unchanged.
+The `cacheKeyFn` will default to serialize objects and arrays using [json-stable-stringify](https://github.com/substack/json-stable-stringify) and allow all other values to pass through unchanged.
 
 ### Caching
 
@@ -109,3 +112,10 @@ you may want to disable to the local cache, and just rely on the redis cache ins
 ```
 const loader = new RedisDataLoader('prefix', new DataLoader(), { cache: false });
 ```
+
+## Development
+
+1. Install Dependencies `npm install`
+1. Start Redis `docker-compose stop && docker-compose rm && docker-compose build && docker-compose up -d`
+1. Run Tests `grunt test`
+

gulpfile.js

@@ -1,5 +1,9 @@
 const gulp = require('gulp');
 const mocha = require('gulp-mocha');
 
-gulp.task('default', () => gulp.src('test.js', { read: false }).pipe(mocha()));
-gulp.task('test', () => gulp.src('test.js', { read: false }).pipe(mocha()));
+gulp.task('default', () =>
+  gulp.src('test/**/*.unit.js', { read: false }).pipe(mocha())
+);
+gulp.task('test', () =>
+  gulp.src('test/**/*.unit.js', { read: false }).pipe(mocha())
+);

index.js

@@ -2,9 +2,11 @@ const _ = require('lodash');
 const Promise = require('bluebird');
 const DataLoader = require('dataloader');
 const stringify = require('json-stable-stringify');
+const IORedis = require('ioredis');
 
 module.exports = fig => {
   const redis = fig.redis;
+  const isIORedis = redis instanceof IORedis;
 
   const parse = (resp, opt) =>
     new Promise((resolve, reject) => {
@@ -47,10 +49,13 @@ module.exports = fig => {
             multi.expire(fullKey, opt.expire);
           }
           multi.get(fullKey);
-          multi.exec(
-            (err, replies) =>
-              err ? reject(err) : parse(_.last(replies), opt).then(resolve)
-          );
+          multi.exec((err, replies) => {
+            const lastReply = isIORedis
+              ? _.last(_.last(replies))
+              : _.last(replies);
+
+            return err ? reject(err) : parse(lastReply, opt).then(resolve);
+          });
         })
     );
 
@@ -66,10 +71,11 @@ module.exports = fig => {
     new Promise((resolve, reject) =>
       redis.mget(
         _.map(keys, k => makeKey(keySpace, k, opt.cacheKeyFn)),
-        (err, results) =>
-          err
+        (err, results) => {
+          return err
             ? reject(err)
-            : Promise.map(results, r => parse(r, opt)).then(resolve)
+            : Promise.map(results, r => parse(r, opt)).then(resolve);
+        }
       )
     );
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-dataloader",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "DataLoader Using Redis as a Cache",
   "main": "index.js",
   "scripts": {
@@ -26,6 +26,7 @@
   "dependencies": {
     "bluebird": "^3.5.0",
     "dataloader": "^1.2.0",
+    "ioredis": "^3.1.2",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.2"
   },
@@ -34,6 +35,7 @@
     "chai-as-promised": "^7.1.1",
     "gulp": "^3.9.1",
     "gulp-mocha": "^3.0.1",
+    "ioredis": "^3.1.2",
     "redis": "^2.6.3",
     "sinon": "^1.17.6"
   }