Merge branch 'master' into master

daluf · web-flow · commit fd6283732791 · 2019-08-23T14:27:18.000+02:00
diff --git a/_src/lib/node_cache.coffee b/_src/lib/node_cache.coffee
@@ -7,6 +7,7 @@ module.exports = class NodeCache extends EventEmitter
 		super()
 
 		@_initErrors()
+
 		# container for cached data
 		@data = {}
 
@@ -36,7 +37,7 @@ module.exports = class NodeCache extends EventEmitter
 
 		# generate functions with callbacks (legacy)
 		if (@options.enableLegacyCallbacks)
-			console.warn("WARNING! Callback legacy support will drop in node-cache v6.x")
+			console.warn("WARNING! node-cache legacy callback support will drop in v6.x")
 			[
 				"get",
 				"mget",
@@ -49,16 +50,16 @@ module.exports = class NodeCache extends EventEmitter
 			].forEach((methodKey) =>
 				# reference real function
 				oldMethod = @[methodKey]
-				@[methodKey] = (...args, cb) =>
+				@[methodKey] = (args..., cb) ->
 					# return a callback if cb is defined and a function
 					if (typeof cb is "function")
 						try
-							res = oldMethod(...args)
+							res = oldMethod(args...)
 							cb(null, res)
 						catch err
 							cb(err)
 					else
-						return oldMethod(...args, cb)
+						return oldMethod(args..., cb)
 					return
 				return
 			)
@@ -601,8 +602,7 @@ module.exports = class NodeCache extends EventEmitter
 
 		return
 
-	createErrorMessage: (errMsg) => (args) =>
-		return errMsg.replace("__key", args.type);
+	createErrorMessage: (errMsg) -> (args) -> errMsg.replace("__key", args.type)
 
 	_ERRORS:
 		"ENOTFOUND": "Key `__key` not found"
diff --git a/_src/test/mocha_test.coffee b/_src/test/mocha_test.coffee
@@ -775,7 +775,7 @@ describe "`#{pkg.name}@#{pkg.version}` on `node@#{process.version}`", () ->
 			return
 
 		it "try to mget with a single key", () ->
-			(() => localCache.mget(state.getKeys[0])).should.throw({
+			(() -> localCache.mget(state.getKeys[0])).should.throw({
 				name: "EKEYSTYPE",
 				message: "The keys argument has to be an array."
 			})
@@ -784,7 +784,7 @@ describe "`#{pkg.name}@#{pkg.version}` on `node@#{process.version}`", () ->
 
 		it "mget the sub-list", () ->
 			state.prediction.should.eql localCache.mget state.getKeys
-			state.n++;
+			state.n++
 			return
 
 		it "delete keys in the sub-list", () ->
@@ -818,7 +818,7 @@ describe "`#{pkg.name}@#{pkg.version}` on `node@#{process.version}`", () ->
 			state.keys = [state.key1, state.key2, state.key3, state.key4, state.key5]
 			return
 		
-		describe "has validates expired ttl", () -> 
+		describe "has validates expired ttl", () ->
 			it "set a key with ttl", () ->
 				true.should.eql localCacheTTL.set state.key6, state.val, 0.7
 				return
