Commit cf28e23d authored by John Crepezzi's avatar John Crepezzi Committed by GitHub
Browse files

Merge pull request #159 from seejohnrun/add_eslint 

Added eslint and fixed an issue from #158
parents 3ed1d775 5939dec1

.eslintrc.json

0 → 100644
+25 −0
Original line number Diff line number Diff line 
{

    "env": {

        "es6": true,

        "node": true

    },

    "extends": "eslint:recommended",

    "rules": {

        "indent": [

            "error",

            2

        ],

        "linebreak-style": [

            "error",

            "unix"

        ],

        "quotes": [

            "error",

            "single"

        ],

        "semi": [

            "error",

            "always"

        ]

    }

}

lib/document_stores/memcached.js

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ MemcachedDocumentStore.connect = function(options) { 
// Save file in a key

MemcachedDocumentStore.prototype.set =

function(key, data, callback, skipExpire) {

  MemcachedDocumentStore.client.set(key, data, function(err, reply) {

  MemcachedDocumentStore.client.set(key, data, function(err) {

    err ? callback(false) : callback(true);

  }, skipExpire ? 0 : this.expire);

};

lib/document_stores/postgres.js

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ PostgresDocumentStore.prototype = { 
        key,

        data,

        that.expireJS && !skipExpire ? that.expireJS + now : null

      ], function (err, result) {

      ], function (err) {

        if (err) {

          winston.error('error persisting value to postgres', { error: err });

          return callback(false);
@@ -50,7 +50,7 @@ PostgresDocumentStore.prototype = { 
          client.query('UPDATE entries SET expiration = $1 WHERE ID = $2', [

            that.expireJS + now,

            result.rows[0].id

          ], function (err, result) {

          ], function (err) {

            if (!err) {

              done();

            }

lib/document_stores/redis.js

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ RedisDocumentStore.connect = function(options) { 
  if (options.password) {

    RedisDocumentStore.client.auth(options.password);

  }

  RedisDocumentStore.client.select(index, function(err, reply) {

  RedisDocumentStore.client.select(index, function(err) {

    if (err) {

      winston.error(

        'error connecting to redis index ' + index,
@@ -46,7 +46,7 @@ RedisDocumentStore.connect = function(options) { 
// Save file in a key

RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) {

  var _this = this;

  RedisDocumentStore.client.set(key, data, function(err, reply) {

  RedisDocumentStore.client.set(key, data, function(err) {

    if (err) {

      callback(false);

    }
@@ -62,7 +62,7 @@ RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) { 
// Expire a key in expire time if set

RedisDocumentStore.prototype.setExpiration = function(key) {

  if (this.expire) {

    RedisDocumentStore.client.expire(key, this.expire, function(err, reply) {

    RedisDocumentStore.client.expire(key, this.expire, function(err) {

      if (err) {

        winston.error('failed to set expiry on key: ' + key);

      }

lib/key_generators/dictionary.js

+4 −6
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ var fs = require('fs'); 


var DictionaryGenerator = function(options) {

  //Options

  if (!options) 

    return done(Error('No options passed to generator'));

  if (!options.path)

    return done(Error('No dictionary path specified in options'));

  if (!options) throw Error('No options passed to generator');

  if (!options.path) throw Error('No dictionary path specified in options');



  //Load dictionary

  fs.readFile(options.path, 'utf8', (err, data) => {