Skip to content

Commit d09d50d

Browse files
lukemelialukemelia
committed
Use template strings
1 parent 62bfd5a commit d09d50d

File tree

2 files changed

+30
-32
lines changed

2 files changed

+30
-32
lines changed

‎index.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ module.exports = {
2929
return context.distDir;
3030
},
3131
keyPrefix(context){
32-
return context.project.name() + ':index';
32+
return `${context.project.name()}:index`;
3333
},
3434
activationSuffix: 'current',
3535
activeContentSuffix: 'current-content',
3636
didDeployMessage(context){
3737
var revisionKey = context.revisionData && context.revisionData.revisionKey;
3838
var activatedRevisionKey = context.revisionData && context.revisionData.activatedRevisionKey;
3939
if (revisionKey && !activatedRevisionKey) {
40-
return "Deployed but did not activate revision " + revisionKey + ". "
41-
+ "To activate, run: "
42-
+ "ember deploy:activate " + context.deployTarget + " --revision=" + revisionKey + "\n";
40+
return `Deployed but did not activate revision ${revisionKey}. `
41+
+ `To activate, run: `
42+
+ `ember deploy:activate ${context.deployTarget} --revision=${revisionKey}` + "\n";
4343
}
4444
},
4545
revisionKey(context) {
@@ -74,7 +74,7 @@ module.exports = {
7474
var redisUrlRegexp = new RegExp('^redis://');
7575

7676
if (!this.pluginConfig.url.match(redisUrlRegexp)) {
77-
throw new Error('Your Redis URL appears to be missing the "redis://" protocol. Update your URL to: redis://' + this.pluginConfig.url);
77+
throw new Error(`Your Redis URL appears to be missing the "redis://" protocol. Update your URL to: redis://${this.pluginConfig.url}`);
7878
}
7979
}
8080

@@ -91,7 +91,7 @@ module.exports = {
9191
let keyPrefix = this.readConfig('keyPrefix');
9292
let filePath = path.join(distDir, filePattern);
9393

94-
this.log('Uploading `' + filePath + '`', { verbose: true });
94+
this.log(`Uploading \`${filePath}\``, { verbose: true });
9595
try {
9696
let fileContents = await this._readFileContents(filePath);
9797
let key = await redisDeployClient.upload(keyPrefix, revisionKey, this.readConfig('revisionData'), fileContents);
@@ -122,10 +122,10 @@ module.exports = {
122122
let activationSuffix = this.readConfig('activationSuffix');
123123
let activeContentSuffix = this.readConfig('activeContentSuffix');
124124

125-
this.log('Activating revision `' + revisionKey + '`', { verbose: true });
125+
this.log(`Activating revision \`${revisionKey}\``, { verbose: true });
126126
try {
127127
await redisDeployClient.activate(keyPrefix, revisionKey, activationSuffix, activeContentSuffix);
128-
this.log('✔ Activated revision `' + revisionKey + '`', {});
128+
this.log(`✔ Activated revision \`${revisionKey}\``, {});
129129
return {
130130
revisionData: {
131131
activatedRevisionKey: revisionKey
@@ -148,7 +148,7 @@ module.exports = {
148148
let redisDeployClient = this.readConfig('redisDeployClient');
149149
let keyPrefix = this.readConfig('keyPrefix');
150150

151-
this.log('Listing initial revisions for key: `' + keyPrefix + '`', { verbose: true });
151+
this.log(`Listing initial revisions for key: \`${keyPrefix}\``, { verbose: true });
152152
try {
153153
let initialRevisions = await redisDeployClient.fetchRevisions(keyPrefix);
154154
return {
@@ -164,7 +164,7 @@ module.exports = {
164164
let redisDeployClient = this.readConfig('redisDeployClient');
165165
let keyPrefix = this.readConfig('keyPrefix');
166166

167-
this.log('Listing revisions for key: `' + keyPrefix + '`');
167+
this.log(`Listing revisions for key: \`${keyPrefix}\``);
168168
try {
169169
let revisions = await redisDeployClient.fetchRevisions(keyPrefix);
170170
return {
@@ -182,7 +182,7 @@ module.exports = {
182182
},
183183

184184
_logUploadSuccessMessage(key) {
185-
this.log('Uploaded with key `' + key + '`', { verbose: true });
185+
this.log(`Uploaded with key \`${key}\``, { verbose: true });
186186
},
187187

188188
_logErrorMessage(error) {

‎lib/redis.js‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = CoreObject.extend({
4343
let value = args.pop();
4444
let revisionKey = args[0] || 'default';
4545
let revisionData = args[1];
46-
let redisKey = keyPrefix + ':' + revisionKey;
46+
let redisKey = `${keyPrefix}:${revisionKey}`;
4747
let maxEntries = this._maxRecentUploads;
4848

4949
await this._uploadIfKeyDoesNotExist(redisKey, value);
@@ -89,7 +89,7 @@ module.exports = CoreObject.extend({
8989
return;
9090
}
9191
let dataKeys = revisions.map(function(revision) {
92-
return keyPrefix + ':revision-data:' + revision;
92+
return `${keyPrefix}:revision-data:${revision}`;
9393
});
9494

9595
let data = this._client.mget(dataKeys);
@@ -102,21 +102,20 @@ module.exports = CoreObject.extend({
102102
},
103103

104104
_listRevisions(keyPrefix) {
105-
var client = this._client;
106-
var listKey = keyPrefix + ':revisions';
105+
let client = this._client;
106+
let listKey = `${keyPrefix}:revisions`;
107107
return client.zrevrange(listKey, 0, -1);
108108
},
109109

110110
_validateRevisionKey(revisionKey, revisions) {
111111
if (revisions.indexOf(revisionKey) === -1) {
112-
throw new Error('`' + revisionKey + '` is not a valid revision key');
112+
throw new Error(`\`${revisionKey}\` is not a valid revision key`);
113113
}
114114
return;
115115
},
116116

117117
_activateRevisionKey(keyPrefix, revisionKey, activationSuffix) {
118-
var currentKey = keyPrefix + ':' + activationSuffix;
119-
118+
let currentKey = `${keyPrefix}:${activationSuffix}`;
120119
return this._client.set(currentKey, revisionKey);
121120
},
122121

@@ -128,59 +127,58 @@ module.exports = CoreObject.extend({
128127
return this._activateRevisionKey(keyPrefix, revisionKey, activationSuffix);
129128
},
130129

131-
async _copyRevisionAndActivateRevisionKey(
132-
keyPrefix, revisionKey, activationSuffix, activeContentSuffix) {
130+
async _copyRevisionAndActivateRevisionKey(keyPrefix, revisionKey, activationSuffix, activeContentSuffix) {
133131
let client = this._client;
134-
let activeContentKey = keyPrefix + ':' + activeContentSuffix;
135-
let revisionContentKey = keyPrefix + ':' + revisionKey;
132+
let activeContentKey = `${keyPrefix}:${activeContentSuffix}`;
133+
let revisionContentKey = `${keyPrefix}:${revisionKey}`;
136134

137135
let value = await client.get(revisionContentKey);
138136
await client.set(activeContentKey, value);
139137
await this._activateRevisionKey(keyPrefix, revisionKey, activationSuffix);
140138
},
141139

142140
async _uploadIfKeyDoesNotExist(redisKey, value) {
143-
var client = this._client;
144-
var allowOverwrite = !!this._allowOverwrite;
141+
let client = this._client;
142+
let allowOverwrite = !!this._allowOverwrite;
145143

146144
let existingValue = await client.get(redisKey);
147145
if (existingValue && !allowOverwrite) {
148-
throw new Error('Value already exists for key: ' + redisKey);
146+
throw new Error(`Value already exists for key: ${redisKey}`);
149147
}
150148
return client.set(redisKey, value);
151149
},
152150

153151
async _uploadRevisionData(keyPrefix, revisionKey, revisionData) {
154152
let client = this._client;
155-
let redisKey = keyPrefix + ':revision-data:' + revisionKey;
153+
let redisKey = `${keyPrefix}:revision-data:${revisionKey}`;
156154
await client.set(redisKey, JSON.stringify(revisionData));
157155
},
158156

159157
async _updateRecentUploadsList(keyPrefix, revisionKey) {
160158
let client = this._client;
161159
let score = new Date().getTime();
162-
let listKey = keyPrefix + ':revisions';
160+
let listKey = `${keyPrefix}:revisions`;
163161
await client.zadd(listKey, score, revisionKey);
164162
},
165163

166164
async _trimRecentUploadsList(keyPrefix, maxEntries) {
167165
let client = this._client;
168-
let listKey = keyPrefix + ':revisions';
166+
let listKey = `${keyPrefix}:revisions`;
169167

170168
let results = await RSVP.hash({
171169
revisionsToBeRemoved: client.zrange(listKey, 0, -(maxEntries + 1)),
172170
current: this.activeRevision(keyPrefix)
173171
});
174-
var revisions = results.revisionsToBeRemoved;
175-
var current = results.current;
172+
let revisions = results.revisionsToBeRemoved;
173+
let current = results.current;
176174
if (!revisions) {
177175
return;
178176
}
179177
let promises = [];
180178
revisions.forEach(function(revision) {
181179
if (revision !== current) {
182-
promises.push(client.del(keyPrefix + ":" + revision));
183-
promises.push(client.del(keyPrefix + ":revision-data:" + revision));
180+
promises.push(client.del(`${keyPrefix}:${revision}`));
181+
promises.push(client.del(`${keyPrefix}:revision-data:${revision}`));
184182
promises.push(client.zrem(listKey, revision));
185183
}
186184
});

0 commit comments

Comments
 (0)