Use 'activationSuffix' in fetchRevision hooks #61 (@zzarcon)

Author: zzarcon

index.js

@@ -50,9 +50,10 @@ module.exports = {
           return context.commandOptions.revision || (context.revisionData && context.revisionData.revisionKey);
         },
         redisDeployClient: function(context) {
+          var redisLib = context._redisLib;
           var redisOptions = this.pluginConfig;
           redisOptions.port = this.readConfig('port');
-          var redisLib = context._redisLib;
+          redisOptions.activationSuffix = this.readConfig('activationSuffix');
 
           return new Redis(redisOptions, redisLib);
         },
@@ -135,6 +136,7 @@ module.exports = {
       fetchInitialRevisions: function(/* context */) {
         var redisDeployClient = this.readConfig('redisDeployClient');
         var keyPrefix = this.readConfig('keyPrefix');
+        
         this.log('Listing initial revisions for key: `' + keyPrefix + '`', { verbose: true });
         return Promise.resolve(redisDeployClient.fetchRevisions(keyPrefix))
           .then(function(revisions) {

lib/redis.js

@@ -32,6 +32,7 @@ module.exports = CoreObject.extend({
 
     this._maxRecentUploads = options.maxRecentUploads;
     this._allowOverwrite   = options.allowOverwrite;
+    this._activationSuffix = options.activationSuffix || 'current';
   },
 
   upload: function(/*keyPrefix, revisionKey, value*/) {
@@ -42,7 +43,6 @@ module.exports = CoreObject.extend({
     var revisionKey = args[0] || 'default';
     var revisionData = args[1];
     var redisKey    = keyPrefix + ':' + revisionKey;
-
     var maxEntries = this._maxRecentUploads;
     var _this = this;
 
@@ -92,7 +92,7 @@ module.exports = CoreObject.extend({
   },
 
   activeRevision: function(keyPrefix) {
-    var currentKey = keyPrefix + ':current';
+    var currentKey = keyPrefix + ':' + this._activationSuffix;
     return this._client.get(currentKey);
   },
 

tests/unit/lib/redis-nodetest.js

@@ -374,5 +374,21 @@ describe('redis', function() {
           ]);
         });
     });
+
+    it('uses activationSuffix in order to get the right activeRevision', function() {
+      var redis = new Redis({
+        activationSuffix: 'active-key'
+      }, new FakeRedis(FakeClient.extend({
+        get: function(key) {
+          return Promise.resolve(key);
+        }
+      })));
+
+      var promise = redis.activeRevision('key-prefix');
+      return assert.isFulfilled(promise)
+        .then(function(result) {
+          assert.equal(result, 'key-prefix:active-key');
+        });
+    });
   });
 });