Merge branch 'release/0.3.1'

Author: Jonathan Muller

index.js

@@ -180,6 +180,7 @@ function redisStore(args) {
       cb = options;
       options = {};
     }
+    options = options || {};
     options.parse = true;
 
     var compress = (options.compress || options.compress === false) ? options.compress : redisOptions.compress;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cache-manager-redis",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Redis store for the node-cache-manager",
   "main": "index.js",
   "scripts": {

test/lib/redis-store-spec.js

@@ -471,9 +471,18 @@ describe('wrap function', function () {
     }, 100);
   }
 
-  var userId = 123;
+  // Simulate retrieving a user from a database with Promise
+  function getUserPromise(id) {
+    return new Promise(function (resolve) {
+      setTimeout(function () {
+        resolve({ id: id });
+      }, 100);
+    });
+  }
 
   it('should be able to cache objects', function (done) {
+    var userId = 123;
+
     // First call to wrap should run the code
     redisCache.wrap('wrap-user', function (cb) {
       getUser(userId, cb);
@@ -489,4 +498,26 @@ describe('wrap function', function () {
       });
     });
   });
+
+  it('should work with promises', function () {
+    var userId = 123;
+
+    // First call to wrap should run the code
+    return redisCache
+      .wrap('wrap-promise', function () {
+        return getUserPromise(userId);
+      })
+      .then(function (user) {
+        assert.equal(user.id, userId);
+
+        // Second call to wrap should retrieve from cache
+        return redisCache
+          .wrap('wrap-promise', function () {
+            return getUserPromise(userId+1);
+          })
+          .then(function (user) {
+            assert.equal(user.id, userId);
+          });
+      });
+  });
 });

test/lib/redis-store-zlib-spec.js

@@ -283,6 +283,66 @@ describe('Compression Tests', function () {
       });
     });
   });
+
+  describe('wrap function', function () {
+
+    // Simulate retrieving a user from a database
+    function getUser(id, cb) {
+      setTimeout(function () {
+        cb(null, { id: id });
+      }, 100);
+    }
+
+    // Simulate retrieving a user from a database with Promise
+    function getUserPromise(id) {
+      return new Promise(function (resolve) {
+        setTimeout(function () {
+          resolve({ id: id });
+        }, 100);
+      });
+    }
+
+    it('should be able to cache objects', function (done) {
+      var userId = 123;
+
+      // First call to wrap should run the code
+      redisCompressCache.wrap('wrap-compress', function (cb) {
+        getUser(userId, cb);
+      }, function (err, user) {
+        assert.equal(user.id, userId);
+
+        // Second call to wrap should retrieve from cache
+        redisCompressCache.wrap('wrap-compress', function (cb) {
+          getUser(userId+1, cb);
+        }, function (err, user) {
+          assert.equal(user.id, userId);
+          done();
+        });
+      });
+    });
+
+    it('should work with promises', function () {
+      var userId = 123;
+
+      // First call to wrap should run the code
+      return redisCompressCache
+        .wrap('wrap-compress-promise', function () {
+          return getUserPromise(userId);
+        })
+        .then(function (user) {
+          assert.equal(user.id, userId);
+
+          // Second call to wrap should retrieve from cache
+          return redisCompressCache
+            .wrap('wrap-compress-promise', function () {
+              return getUserPromise(userId+1);
+            })
+            .then(function (user) {
+              assert.equal(user.id, userId);
+            });
+        });
+    });
+  });
 });