Merge pull request #19 from dschmidt/pass-through-database-number

Pass through database number

Author: Aaron Chambers

README.md

@@ -75,6 +75,12 @@ The Redis port. If [url](#url) is defined, then this option is not needed.
 
 *Default:* `6379`
 
+### database
+
+The Redis database number. If [url](#url) is defined, then this option is not needed.
+
+*Default:* `undefined`
+
 ### password
 
 The Redis password. If [url](#url) is defined, then this option is not needed.
@@ -113,9 +119,9 @@ The unique revision number for the version of the file being uploaded to Redis.
 
 ### redisDeployClient
 
-The Redis client to be used to upload files to the Redis store. By default this option will use a new instance of the [Redis][3] client unless another client is provided in the `redisDeployClient` property of the deployment context. This allows for injection of a mock client for testing purposes.
+The Redis client to be used to upload files to the Redis store. By default this option will use a new instance of the [Redis][3] client. This allows for injection of a mock client for testing purposes.
 
-*Default:* `context.redisDeployClient || new Redis(context.config.redis)`
+*Default:* `return new Redis(options)`
 
 ### didDeployMessage
 

index.js

@@ -39,7 +39,10 @@ module.exports = {
           return context.commandOptions.revision || context.revisionKey;
         },
         redisDeployClient: function(context) {
-          return context.redisDeployClient || new Redis(context.config.redis);
+          var options = context.config.redis;
+          var redisLib = context._redisLib;
+
+          return new Redis(options, redisLib);
         }
       },
       configure: function(/* context */) {

lib/redis.js

@@ -2,13 +2,14 @@ var CoreObject = require('core-object');
 var Promise    = require('ember-cli/lib/ext/promise');
 
 module.exports = CoreObject.extend({
-  init: function(options) {
-    if (options.redisClient) {
-      this._client = options.redisClient;
-    } else if (options.url) {
-      this._client = require('then-redis').createClient(options.url);
+  init: function(options, lib) {
+    var redisOptions = options;
+    var redisLib     = lib;
+
+    if (options.url) {
+      redisOptions = options.url;
     } else {
-      var redisOptions = {
+      redisOptions = {
         host: options.host,
         port: options.port
       };
@@ -17,8 +18,17 @@ module.exports = CoreObject.extend({
         redisOptions.password = options.password;
       }
 
-      this._client = require('then-redis').createClient(redisOptions);
+      if (options.database) {
+        redisOptions.database = options.database;
+      }
+    }
+
+    if (!redisLib) {
+      redisLib = require('then-redis');
     }
+
+    this._client = redisLib.createClient(redisOptions);
+
     this._maxNumberOfRecentUploads = 10;
     this._allowOverwrite = options.allowOverwrite;
   },

tests/unit/index-nodetest.js

@@ -2,13 +2,28 @@
 
 var Promise = require('ember-cli/lib/ext/promise');
 var assert  = require('ember-cli/tests/helpers/assert');
+var CoreObject = require('core-object');
 
 var stubProject = {
   name: function(){
     return 'my-project';
   }
 };
 
+var fakeClient = {
+  createClient: function(options) {
+    this.options = options;
+    return {
+      get: function(key) {
+        return Promise.resolve('some-other-value');
+      },
+      set: function() { },
+      lpush: function() { },
+      ltrim: function() { }
+    }
+  }
+};
+
 describe('redis plugin', function() {
   var subject, mockUi;
 
@@ -53,7 +68,8 @@ describe('redis plugin', function() {
         config: {
           redis: {
             host: 'somehost',
-            port: 1234
+            port: 1234,
+            database: 4
           }
         }
       };
@@ -62,6 +78,32 @@ describe('redis plugin', function() {
       assert.ok(true); // didn't throw an error
     });
 
+    it('passes through config options', function () {
+      var plugin = subject.createDeployPlugin({
+        name: 'redis'
+      });
+
+      var context = {
+        ui: mockUi,
+        project: stubProject,
+        config: {
+          redis: {
+            host: 'somehost',
+            port: 1234,
+            database: 4
+          }
+        },
+        _redisLib: fakeClient
+      };
+      plugin.beforeHook(context);
+      plugin.configure(context);
+      plugin.readConfig('redisDeployClient');
+
+      assert.equal(fakeClient.options.host, 'somehost');
+      assert.equal(fakeClient.options.port, 1234);
+      assert.equal(fakeClient.options.database, 4);
+    });
+
     describe('resolving revisionKey from the pipeline', function() {
       it('uses the config data if it already exists', function() {
         var plugin = subject.createDeployPlugin({
@@ -262,11 +304,6 @@ describe('redis plugin', function() {
       });
 
       context = {
-        redisClient: {
-          upload: function(keyPrefix, revisionKey) {
-            return Promise.resolve(keyPrefix + ':' + revisionKey);
-          }
-        },
         ui: mockUi,
         project: stubProject,
         config: {
@@ -276,7 +313,11 @@ describe('redis plugin', function() {
             distDir: 'tests',
             revisionKey: '123abc',
             redisDeployClient: function(context) {
-              return context.redisClient || new Redis(context.config.redis);
+              return {
+                upload: function(keyPrefix, revisionKey) {
+                  return Promise.resolve(keyPrefix + ':' + revisionKey);
+                }
+              };
             }
           }
         }
@@ -300,11 +341,6 @@ describe('redis plugin', function() {
       });
 
       var context = {
-        redisClient: {
-          activate: function() {
-            activateCalled = true;
-          }
-        },
         ui: mockUi,
         project: stubProject,
         config: {
@@ -313,7 +349,13 @@ describe('redis plugin', function() {
             filePattern: 'index.html',
             distDir: 'tests',
             revisionKey: '123abc',
-            redisDeployClient: function(context){ return context.redisClient; }
+            redisDeployClient: function(context){
+              return {
+                activate: function() {
+                  activateCalled = true;
+                }
+              };
+            }
           }
         }
       };
@@ -332,11 +374,6 @@ describe('redis plugin', function() {
       });
 
       var context = {
-        redisClient: {
-          activate: function() {
-            return Promise.reject('some-error');
-          }
-        },
         ui: mockUi,
         project: stubProject,
         config: {
@@ -346,7 +383,11 @@ describe('redis plugin', function() {
             distDir: 'tests',
             revisionKey: '123abc',
             redisDeployClient: function(context) {
-              return context.redisClient || new Redis(context.config.redis);
+              return {
+                activate: function() {
+                  return Promise.reject('some-error');
+                }
+              };
             }
           }
         }