Skip to content

[WIP] Bugfix/list revisions activation suffix #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[WIP] Bugfix/list revisions activation suffix #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fba1c79
FetchRevisions wasn't aware of activationSuffix
Nov 11, 2015
3c2a471
Make tests pass after making fetchRevisions aware of activationSuffix
Nov 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@ module.exports = {
var distDir = this.readConfig('distDir');
var filePattern = this.readConfig('filePattern');
var keyPrefix = this.readConfig('keyPrefix');
var activationSuffix = this.readConfig('activationSuffix');
var filePath = path.join(distDir, filePattern);

this.log('Uploading `' + filePath + '`', { verbose: true });
return this._readFileContents(filePath)
.then(redisDeployClient.upload.bind(redisDeployClient, keyPrefix, revisionKey))
.then(redisDeployClient.upload.bind(redisDeployClient, keyPrefix, activationSuffix, revisionKey))
.then(this._uploadSuccessMessage.bind(this))
.then(function(key) {
return { redisKey: key };
Expand Down Expand Up @@ -106,9 +107,10 @@ module.exports = {
fetchRevisions: function(context) {
var redisDeployClient = this.readConfig('redisDeployClient');
var keyPrefix = this.readConfig('keyPrefix');
var activationSuffix = this.readConfig('activationSuffix');

this.log('Listing revisions for key: `' + keyPrefix + '`');
return Promise.resolve(redisDeployClient.fetchRevisions(keyPrefix))
return Promise.resolve(redisDeployClient.fetchRevisions(keyPrefix, activationSuffix))
.then(function(revisions){
return { revisions: revisions };
})
Expand Down
25 changes: 13 additions & 12 deletions lib/redis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,21 @@ module.exports = CoreObject.extend({
this._allowOverwrite = options.allowOverwrite;
},

upload: function(/*keyPrefix, revisionKey, value*/) {
upload: function(/*keyPrefix, activationSuffix, revisionKey, value*/) {
var args = Array.prototype.slice.call(arguments);

var keyPrefix = args.shift();
var value = args.pop();
var revisionKey = args[0] || 'default';
var redisKey = keyPrefix + ':' + revisionKey;
var keyPrefix = args.shift();
var activationSuffix = args.shift();
var value = args.pop();
var revisionKey = args[0] || 'default';
var redisKey = keyPrefix + ':' + revisionKey;

var maxEntries = this._maxNumberOfRecentUploads;

return Promise.resolve()
.then(this._uploadIfKeyDoesNotExist.bind(this, redisKey, value))
.then(this._updateRecentUploadsList.bind(this, keyPrefix, revisionKey))
.then(this._trimRecentUploadsList.bind(this, keyPrefix, maxEntries))
.then(this._trimRecentUploadsList.bind(this, keyPrefix, activationSuffix, maxEntries))
.then(function() {
return redisKey;
});
Expand All @@ -61,10 +62,10 @@ module.exports = CoreObject.extend({
.then(this._activateRevisionKey.bind(this, currentKey, revisionKey));
},

fetchRevisions: function(keyPrefix) {
fetchRevisions: function(keyPrefix, activationSuffix) {
return Promise.hash({
revisions: this._listRevisions(keyPrefix),
current: this._activeRevision(keyPrefix)
current: this._activeRevision(keyPrefix, activationSuffix)
}).then(function(results) {
return results.revisions.map(function(revision) {
return {
Expand Down Expand Up @@ -115,18 +116,18 @@ module.exports = CoreObject.extend({
return client.zadd(listKey, score, revisionKey);
},

_activeRevision: function(keyPrefix) {
var currentKey = keyPrefix + ':current';
_activeRevision: function(keyPrefix, activationSuffix) {
var currentKey = keyPrefix + ':' + activationSuffix;
return this._client.get(currentKey);
},

_trimRecentUploadsList: function(keyPrefix, maxEntries) {
_trimRecentUploadsList: function(keyPrefix, activationSuffix, maxEntries) {
var client = this._client;
var listKey = keyPrefix + ':revisions';

return Promise.hash({
revisionsToBeRemoved: client.zrange(listKey, 0, -(maxEntries + 1)),
current: this._activeRevision(keyPrefix)
current: this._activeRevision(keyPrefix, activationSuffix)
}).then(function(results) {
var revisions = results.revisionsToBeRemoved;
var current = results.current;
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/index-nodetest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ describe('redis plugin', function() {
revisionKey: '123abc',
redisDeployClient: function(context) {
return {
upload: function(keyPrefix, revisionKey) {
upload: function(keyPrefix, activationSuffix, revisionKey) {
return Promise.resolve(keyPrefix + ':' + revisionKey);
}
};
Expand Down
24 changes: 12 additions & 12 deletions tests/unit/lib/redis-nodetest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('redis', function() {
it('rejects if the key already exists in redis', function() {
var redis = new Redis({}, new FakeRedis());

var promise = redis.upload('key', 'value');
var promise = redis.upload('key', 'suffix', 'value');
return assert.isRejected(promise, /^Value already exists for key: key:default$/);
});

Expand All @@ -41,7 +41,7 @@ describe('redis', function() {
}
})));

var promise = redis.upload('key', 'value');
var promise = redis.upload('key', 'suffix', 'value');
return assert.isFulfilled(promise)
.then(function() {
assert.ok(fileUploaded);
Expand All @@ -59,7 +59,7 @@ describe('redis', function() {
}
})));

var promise = redis.upload('key', 'value');
var promise = redis.upload('key', 'suffix', 'value');
return assert.isFulfilled(promise)
.then(function() {
assert.ok(fileUploaded);
Expand All @@ -73,7 +73,7 @@ describe('redis', function() {
}
})));

var promise = redis.upload('key', 'value');
var promise = redis.upload('key', 'suffix', 'value');
return assert.isFulfilled(promise)
.then(function() {
assert.equal(redis._client.recentRevisions.length, 1);
Expand Down Expand Up @@ -102,7 +102,7 @@ describe('redis', function() {

redis._client.recentRevisions = ['1','2','3','4','5','6','7','8','9','10','11'];

var promise = redis.upload('key', '12', 'value');
var promise = redis.upload('key', 'suffix', '12', 'value');
return assert.isFulfilled(promise)
.then(function() {
assert.equal(redis._client.recentRevisions.length, 10);
Expand All @@ -115,7 +115,7 @@ describe('redis', function() {

var redis = new Redis({}, new FakeRedis(FakeClient.extend({
get: function(key) {
if (key == 'key:current') {
if (key == 'key:suffix') {
return Promise.resolve('1');
}
return Promise.resolve(null);
Expand All @@ -127,7 +127,7 @@ describe('redis', function() {

redis._client.recentRevisions = ['1','2','3','4','5','6','7','8','9','10','11'];

var promise = redis.upload('key', '12', 'value');
var promise = redis.upload('key', 'suffix', '12', 'value');
return assert.isFulfilled(promise)
.then(function() {
assert.equal(redis._client.recentRevisions.length, 11);
Expand All @@ -146,7 +146,7 @@ describe('redis', function() {
}
})));

var promise = redis.upload('key', 'value');
var promise = redis.upload('key', 'suffix', 'value');
return assert.isRejected(promise)
.then(function() {
assert.equal(redisKey, 'key:default');
Expand All @@ -162,7 +162,7 @@ describe('redis', function() {
}
})));

var promise = redis.upload('key', 'tag', 'value');
var promise = redis.upload('key', 'suffix', 'tag', 'value');
return assert.isRejected(promise)
.then(function() {
assert.equal(redisKey, 'key:tag');
Expand All @@ -181,7 +181,7 @@ describe('redis', function() {

redis._client.recentRevisions = ['a', 'b', 'c'];

var promise = redis.activate('key-prefix', 'revision-key');
var promise = redis.activate('key-prefix', 'revision-key', 'key-suffix');
return assert.isRejected(promise)
.then(function(error) {
assert.equal(error, '`revision-key` is not a valid revision key');
Expand All @@ -200,10 +200,10 @@ describe('redis', function() {

redis._client.recentRevisions = ['a', 'b', 'c'];

var promise = redis.activate('key-prefix', 'c', 'current');
var promise = redis.activate('key-prefix', 'c', 'key-suffix');
return assert.isFulfilled(promise)
.then(function() {
assert.equal(redisKey, 'key-prefix:current');
assert.equal(redisKey, 'key-prefix:key-suffix');
assert.equal(redisValue, 'c');
});
});
Expand Down