Merge pull request #3 from lukemelia/support-url-config

Allow configuration of redis using a url property instead of host/port/etc

Author: Aaron Chambers

lib/redis.js

@@ -3,18 +3,24 @@ var Promise    = require('ember-cli/lib/ext/promise');
 
 module.exports = CoreObject.extend({
   init: function(options) {
-    var redisOptions = {
-      host: options.host,
-      port: options.port
-    };
+    if (options.redisClient) {
+      this._client = options.redisClient;
+    } else if (options.url) {
+      this._client = require('then-redis').createClient(options.url);
+    } else {
+      var redisOptions = {
+        host: options.host,
+        port: options.port
+      };
 
-    if (options.password) {
-      redisOptions.password = options.password;
-    }
-
-    this._client = options.redisClient || require('then-redis').createClient(redisOptions);
+      if (options.password) {
+        redisOptions.password = options.password;
+      }
 
+      this._client = require('then-redis').createClient(redisOptions);
+    }
     this._maxNumberOfRecentUploads = 10;
+    this._allowOverwrite = options.allowOverwrite;
   },
 
   upload: function(/*key, tag, value*/) {
@@ -38,13 +44,14 @@ module.exports = CoreObject.extend({
 
   _uploadIfKeyDoesNotExist: function(redisKey, value) {
     var client = this._client;
+    var allowOverwrite = !!this._allowOverwrite;
 
     return Promise.resolve()
       .then(function() {
         return client.get(redisKey);
       })
       .then(function(value) {
-        if (value) {
+        if (value && !allowOverwrite) {
           return Promise.reject('Value already exists for key: ' + redisKey);
         }
       })

lib/utilities/validate-config.js

@@ -4,6 +4,15 @@ var chalk  = require('chalk');
 var yellow = chalk.yellow;
 var blue   = chalk.blue;
 
+function applyDefaultConfigIfNecessary(config, prop, defaultConfig, ui){
+  if (!config[prop]) {
+    var value = defaultConfig[prop];
+    config[prop] = value;
+    ui.write(blue('|    '));
+    ui.writeLine(yellow('- Missing config: `' + prop + '`, using default: `' + value + '`'));
+  }
+}
+
 module.exports = function(ui, config) {
   ui.write(blue('|    '));
   ui.writeLine(blue('- validating config'));
@@ -14,14 +23,12 @@ module.exports = function(ui, config) {
     filePattern: 'dist/index.html'
   };
 
-  ['host', 'port', 'filePattern'].forEach(function(prop) {
-    if (!config[prop]) {
-      var value = defaultConfig[prop];
-      config[prop] = value;
-      ui.write(blue('|    '));
-      ui.writeLine(yellow('- Missing config: `' + prop + '`, using default: `' + value + '`'));
-    }
-  });
+  if (!config.url) {
+    ['host', 'port'].forEach(function(prop) {
+      applyDefaultConfigIfNecessary(config, prop, defaultConfig, ui);
+    });
+  }
+  applyDefaultConfigIfNecessary(config, 'filePattern', defaultConfig, ui);
 
   return Promise.resolve();
 }

tests/unit/lib/redis-nodetest.js

@@ -50,6 +50,30 @@ describe('redis', function() {
         });
     });
 
+    it('uploads the contents if the key already exists but allowOverwrite is true', function() {
+      var fileUploaded = false;
+
+      var redis = new Redis({
+        allowOverwrite: true,
+        redisClient: {
+          get: function(key) {
+            return Promise.resolve('some-other-value');
+          },
+          set: function(key, value) {
+            fileUploaded = true;
+          },
+          lpush: function() { },
+          ltrim: function() { }
+        }
+      });
+
+      var promise = redis.upload('key', 'value');
+      return assert.isFulfilled(promise)
+        .then(function() {
+          assert.ok(fileUploaded);
+        });
+    });
+
     it('updates the list of recent uploads once upload is successful', function() {
       var recentUploads = [];
 

tests/unit/lib/utilities/validate-config-nodetest.js

@@ -10,8 +10,6 @@ describe('validate-config', function() {
   });
 
   beforeEach(function() {
-    config = { };
-
     mockUi = {
       messages: [],
       write: function() { },
@@ -21,30 +19,70 @@ describe('validate-config', function() {
     };
   });
 
-  it('warns about missing optional config', function() {
-    return assert.isFulfilled(subject(mockUi, config))
-      .then(function() {
-        var messages = mockUi.messages.reduce(function(previous, current) {
-          if (/- Missing config:\s.*, using default:\s/.test(current)) {
-            previous.push(current);
-          }
+  describe('without providing config', function () {
+    beforeEach(function() {
+      config = { };
+    });
+    it('warns about missing optional config', function() {
+      return assert.isFulfilled(subject(mockUi, config))
+        .then(function() {
+          var messages = mockUi.messages.reduce(function(previous, current) {
+            if (/- Missing config:\s.*, using default:\s/.test(current)) {
+              previous.push(current);
+            }
 
-          return previous;
-        }, []);
+            return previous;
+          }, []);
 
-        assert.equal(messages.length, 3);
-      });
-  });
+          assert.equal(messages.length, 3);
+        });
+    });
 
-  it('adds default config to the config object', function() {
-    return assert.isFulfilled(subject(mockUi, config))
-      .then(function() {
-        assert.isDefined(config.host);
-        assert.isDefined(config.port);
-      });
+    it('adds default config to the config object', function() {
+      return assert.isFulfilled(subject(mockUi, config))
+        .then(function() {
+          assert.isDefined(config.host);
+          assert.isDefined(config.port);
+        });
+    });
+
+    it('resolves', function() {
+      return assert.isFulfilled(subject(mockUi, config));
+    })
   });
 
-  it('resolves if config is ok', function() {
-    return assert.isFulfilled(subject(mockUi, config));
-  })
+  describe('with a url provided', function () {
+    beforeEach(function() {
+      config = {
+        url: 'redis://localhost:6379'
+      };
+    });
+    it('only warns about missing optional filePattern', function() {
+      return assert.isFulfilled(subject(mockUi, config))
+        .then(function() {
+          var messages = mockUi.messages.reduce(function(previous, current) {
+            if (/- Missing config:\s.*, using default:\s/.test(current)) {
+              previous.push(current);
+            }
+
+            return previous;
+          }, []);
+
+          assert.equal(messages.length, 1);
+        });
+    });
+
+    it('does not add default config to the config object', function() {
+      return assert.isFulfilled(subject(mockUi, config))
+        .then(function() {
+          assert.isUndefined(config.host);
+          assert.isUndefined(config.port);
+          assert.isDefined(config.filePattern);
+        });
+    });
+
+    it('resolves', function() {
+      return assert.isFulfilled(subject(mockUi, config));
+    })
+  });
 });