Switch from jshint to eslint

Author: guyellis

.jshintignore renamed to .eslintignore

@@ -0,0 +1,33 @@
+{
+  "env": {
+    "node": true
+  },
+  "rules": {
+    "no-bitwise": true,
+    "camelcase": true,
+    "curly": true,
+    "eqeqeq": true,
+    "forin": true,
+    "freeze": true,
+    "immed": true,
+    "indent": [2,2],
+    "no-shadow": false,
+    "latedef": true,
+    "newcap": true,
+    "noarg": true,
+    "noempty": true,
+    "nonew": true,
+    "strict": true,
+    "quotes": "single",
+    "max-depth": 3,
+    "trailing": true,
+    "max-statements": 15,
+    "max-len": [2,100,4],
+    "eqnull": true,
+    "funcscope": true,
+    "undef": true,
+    "unused": true,
+    "node": true,
+    "no-underscore-dangle": false
+  }
+}

.eslintrc

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./lib/multi');
+module.exports = require('./lib/multi');

.jshintrc

@@ -6,4 +6,4 @@ module.exports = function(options) {
 
   return new NodeCache(options);
 
-};
+};

index.js

@@ -1,13 +1,12 @@
 'use strict';
 
-var MultiCache;
+
 var createCache = require('./create-cache');
 var async = require('async');
 var _ = require('lodash');
 var MultiError = require('./cache-lib/multi-error');
 
-module.exports = MultiCache = (function(){
-
+var MultiCache = (function(){
   function MultiCache(localCache, remoteCache, options) {
     this.options = options != null ? options : {};
     if(!this.options.disabled) {
@@ -38,24 +37,24 @@ module.exports = MultiCache = (function(){
     }
 
     if(self._useLocalCache(options)) {
-      self.localCache.get(keys, function(err,value){
+      self.localCache.get(keys, function(err, value){
         if(err) {
-          return callback(err,value);
+          return callback(err, value);
         }
         if(!_.isEmpty(value) || !self._useRemoteCache(options)) {
           return callback(err, value);
         }
 
-        self.remoteCache.get(keys, function(err,value){
+        self.remoteCache.get(keys, function(err, value){
           if(err) {
-            return callback(err,value);
+            return callback(err, value);
           }
           if(options && options.setLocal && !_.isEmpty(value)) {
             self.localCache.set(keys, value, {localCache: true, remoteCache: false}, function(){
               return callback(err, value);
             });
           } else {
-            return callback(err,value);
+            return callback(err, value);
           }
         });
 
@@ -84,18 +83,19 @@ module.exports = MultiCache = (function(){
         }
       }
     }
-    return this._set(key, value, ttl, options, callback);
-  };
 
-  MultiCache.prototype._set = function(key, value, ttl, options, callback) {
     if(this.options.disabled) {
       if(callback) {
         return callback(null);
       } else {
-        return;
+        return undefined;
       }
     }
 
+    return this._set(key, value, ttl, options, callback);
+  };
+
+  MultiCache.prototype._set = function(key, value, ttl, options, callback) {
     var setters = this._useMethods(options, 'set');
 
     if(setters.length === 0) {
@@ -163,3 +163,4 @@ module.exports = MultiCache = (function(){
   return MultiCache;
 })();
 
+module.exports = MultiCache;

lib/cache-lib/node-cache.js

@@ -5,21 +5,21 @@
   "main": "index.js",
   "public": true,
   "publishConfig": {
-    "registry":"http://registry.npmjs.org/"
+    "registry": "http://registry.npmjs.org/"
   },
   "scripts": {
     "pre-commit-update": "node_modules/.bin/npm-update-outdated",
     "test": "mocha --recursive",
-    "posttest": "jshint .",
-    "jshint": "jshint .",
+    "posttest": "eslint .",
+    "lint": "eslint .",
     "check-coverage": "istanbul check-coverage --statements 100 --branches 100 --functions 100 --lines 100 ./coverage/coverage.json",
     "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- --recursive",
     "pre-commit-stash-save": "git stash --keep-index",
     "post-commit-stash-pop": "git stash pop"
   },
   "pre-commit": [
     "pre-commit-update",
-    "jshint",
+    "lint",
     "pre-commit-stash-save",
     "coverage",
     "post-commit-stash-pop",
@@ -49,12 +49,12 @@
     "redis": "0.12.1"
   },
   "devDependencies": {
+    "eslint": "^0.19.0",
     "istanbul": "^0.3.13",
-    "jshint": "^2.6.3",
     "mocha": "^2.2.4",
     "npm-update-outdated": "^0.1.4",
     "pre-commit": "^1.0.6",
-    "sinon" : "^1.14.1"
+    "sinon": "^1.14.1"
   },
   "engines": {
     "node": ">= 0.10.0"

lib/multi.js

@@ -0,0 +1,5 @@
+{
+  "env": {
+    "mocha": true
+  }
+}

package.json

@@ -3,7 +3,7 @@
 var assert = require('assert');
 var MultiError = require('../../../lib/cache-lib/multi-error');
 
-describe('Multi-Error',function(){
+describe('Multi-Error', function(){
 
   it('should create with params', function(done){
     var multiError = new MultiError();

test/.eslintrc

@@ -65,4 +65,4 @@ describe('redis plugin', function(){
       done();
     });
   });
-});
+});

test/.jshintrc

@@ -4,7 +4,7 @@ var assert = require('assert');
 var nodeCache = require('../../../lib/cache-lib/node-cache')();
 var redis = require('../../../lib/cache-lib/redis')();
 
-describe('Validate API',function(){
+describe('Validate API', function(){
 
   it('should validate end points of APIs', function(done){
     var apis = [nodeCache, redis];

test/lib/cache-lib/test.multi-error.js

@@ -3,7 +3,7 @@
 var createCache = require('../../lib/create-cache');
 var assert = require('assert');
 
-describe('Multi Cache',function(){
+describe('Multi Cache', function(){
 
   it('should be null if the cache type is not supported', function(done){
     var cache = createCache('this cache does not exist');

test/lib/cache-lib/test.redis.js

@@ -4,7 +4,7 @@ var MultiCache = require('../..');
 var assert = require('assert');
 var _ = require('lodash');
 
-describe('Multi Cache',function(){
+describe('Multi Cache', function(){
   var testRemoteOnly = {
     useLocalCache: false,
     useRemoteCache: true

test/lib/cache-lib/test.validate-api.js

@@ -6,27 +6,35 @@ var assert = require('assert');
 var _ = require('lodash');
 var sinon = require('sinon');
 
-describe('Multi Cache',function(){
-  var localCacheName = 'node-cache';
-  var remoteCacheName = 'node-cache';
-  var testRemoteOnly = {
-    useLocalCache: false,
-    useRemoteCache: true
-  };
-  var testLocalOnly = {
-    useLocalCache: true,
-    useRemoteCache: false
-  };
-  var testBothActive = {
-    useLocalCache: true,
-    useRemoteCache: true
-  };
-  var testBothInactive = { 
-    useLocalCache: false,
-    useRemoteCache: false
-  };
-
-  describe('Class creation',function() {
+describe('Multi Cache', function(){
+  var localCacheName,
+      remoteCacheName,
+      testRemoteOnly,
+      testLocalOnly,
+      testBothActive,
+      testBothInactive;
+  before(function(){
+    localCacheName = 'node-cache';
+    remoteCacheName = 'node-cache';
+    testRemoteOnly = {
+      useLocalCache: false,
+      useRemoteCache: true
+    };
+    testLocalOnly = {
+      useLocalCache: true,
+      useRemoteCache: false
+    };
+    testBothActive = {
+      useLocalCache: true,
+      useRemoteCache: true
+    };
+    testBothInactive = {
+      useLocalCache: false,
+      useRemoteCache: false
+    };
+  });
+
+  describe('Class creation', function() {
 
     it('should create a Multi-Cache without options', function (done) {
       var multiCache = new MultiCache(localCacheName, remoteCacheName);
@@ -78,7 +86,7 @@ describe('Multi Cache',function(){
 
   });
 
-  describe('Setting',function() {
+  describe('Setting', function() {
 
     it('should set an object in the local cache only', function (done) {
       var multiCache = new MultiCache(localCacheName, remoteCacheName, testLocalOnly);
@@ -107,7 +115,7 @@ describe('Multi Cache',function(){
         assert(!_.isEmpty(result));
         multiCache.get('myKey', testLocalOnly, function (err, value) {
           assert(!err);
-          assert.equal(undefined, value); 
+          assert.equal(undefined, value);
           // Test that key/value is in remoteCache
           multiCache.get('myKey', testRemoteOnly, function (err, value) {
             assert(!err);
@@ -188,7 +196,7 @@ describe('Multi Cache',function(){
         assert(!_.isEmpty(result));
         multiCache.get('myKey', testBothInactive, function (err, value) {
           assert(typeof err === 'object');
-          assert.equal(undefined, value); 
+          assert.equal(undefined, value);
           assert.equal('local or remote must be specified when getting from cache', err.message);
           done();
         });
@@ -197,13 +205,13 @@ describe('Multi Cache',function(){
 
   });
 
-  describe('Disabled',function() {
+  describe('Disabled', function() {
 
     it('should noop on set when disabled with callback', function (done) {
       var multiCache = new MultiCache(localCacheName, remoteCacheName, {disabled: true});
       multiCache.set('myKey', 'myValue', function (err, result) {
         assert(!err);
-        assert.equal(undefined,result);
+        assert.equal(undefined, result);
         done();
       });
     });
@@ -225,15 +233,15 @@ describe('Multi Cache',function(){
     it('should noop on del when disabled', function (done) {
       var multiCache = new MultiCache(localCacheName, remoteCacheName, {disabled: true});
       multiCache.del('myKey', function (err, result) {
-        assert.equal(undefined,err);
-        assert.equal(undefined,result);
+        assert.equal(undefined, err);
+        assert.equal(undefined, result);
         done();
       });
     });
 
   });
 
-  describe('Getting',function() {
+  describe('Getting', function() {
 
     it('should get an object from the remote cache if local is empty', function (done) {
       var multiCache = new MultiCache(localCacheName, remoteCacheName);
@@ -307,7 +315,7 @@ describe('Multi Cache',function(){
 
   });
 
-  describe('Deleting',function() {
+  describe('Deleting', function() {
 
     it('should delete an object in the local cache only', function (done) {
       var multiCache = new MultiCache(localCacheName, remoteCacheName);
@@ -405,7 +413,7 @@ describe('Multi Cache',function(){
     });
   });
 
-  describe('Complex objects',function() {
+  describe('Complex objects', function() {
 
     it('should set and get complex objects', function (done) {
       var multiCache = new MultiCache(localCacheName, remoteCacheName);