lint: use standard style

Author: dougwilson

.eslintignore

@@ -0,0 +1,2 @@
+coverage
+node_modules

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "standard"
+}

.travis.yml

@@ -16,12 +16,14 @@ cache:
 before_install:
   # Setup Node.js version-specific dependencies
   - "test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev istanbul"
+  - "test $(echo $TRAVIS_NODE_VERSION | cut -d'.' -f1) -ge 4 || npm rm --save-dev eslint eslint-config-standard eslint-plugin-promise eslint-plugin-standard"
   # Update Node.js modules
   - "test ! -d node_modules || npm prune"
   - "test ! -d node_modules || npm rebuild"
 script:
   # Run test script, depending on istanbul install
   - "test ! -z $(npm -ps ls istanbul) || npm test"
   - "test   -z $(npm -ps ls istanbul) || npm run-script test-travis"
+  - "test   -z $(npm -ps ls eslint  ) || npm run-script lint"
 after_script:
   - "test -e ./coverage/lcov.info && npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"

index.js

@@ -5,16 +5,16 @@
  * MIT Licensed
  */
 
-'use strict';
+'use strict'
 
 /**
  * Module dependencies.
  */
 
-var createError = require('http-errors');
-var ms = require('ms');
-var onFinished = require('on-finished');
-var onHeaders = require('on-headers');
+var createError = require('http-errors')
+var ms = require('ms')
+var onFinished = require('on-finished')
+var onHeaders = require('on-headers')
 
 /**
  * Timeout:
@@ -27,48 +27,48 @@ var onHeaders = require('on-headers');
  * @api public
  */
 
-module.exports = function timeout(time, options) {
-  var opts = options || {};
+module.exports = function timeout (time, options) {
+  var opts = options || {}
 
   var delay = typeof time === 'string'
     ? ms(time)
-    : Number(time || 5000);
+    : Number(time || 5000)
 
-  var respond = opts.respond === undefined || opts.respond === true;
+  var respond = opts.respond === undefined || opts.respond === true
 
-  return function(req, res, next) {
-    var id = setTimeout(function(){
-      req.timedout = true;
-      req.emit('timeout', delay);
-    }, delay);
+  return function (req, res, next) {
+    var id = setTimeout(function () {
+      req.timedout = true
+      req.emit('timeout', delay)
+    }, delay)
 
     if (respond) {
-      req.on('timeout', onTimeout(delay, next));
+      req.on('timeout', onTimeout(delay, next))
     }
 
-    req.clearTimeout = function(){
-      clearTimeout(id);
-    };
+    req.clearTimeout = function () {
+      clearTimeout(id)
+    }
 
-    req.timedout = false;
+    req.timedout = false
 
     onFinished(res, function () {
-      clearTimeout(id);
-    });
+      clearTimeout(id)
+    })
 
     onHeaders(res, function () {
-      clearTimeout(id);
-    });
+      clearTimeout(id)
+    })
 
-    next();
-  };
-};
+    next()
+  }
+}
 
-function onTimeout(delay, cb) {
-  return function(){
+function onTimeout (delay, cb) {
+  return function () {
     cb(createError(503, 'Response timeout', {
       code: 'ETIMEDOUT',
       timeout: delay
-    }));
-  };
+    }))
+  }
 }

package.json

@@ -15,6 +15,10 @@
     "on-headers": "~1.0.1"
   },
   "devDependencies": {
+    "eslint": "3.10.2",
+    "eslint-config-standard": "6.2.1",
+    "eslint-plugin-promise": "3.4.0",
+    "eslint-plugin-standard": "2.0.1",
     "istanbul": "0.4.5",
     "mocha": "2.5.3",
     "supertest": "1.1.0"
@@ -28,6 +32,7 @@
     "node": ">= 0.8"
   },
   "scripts": {
+    "lint": "eslint .",
     "test": "mocha --reporter spec --bail --check-leaks test/",
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
     "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot --check-leaks test/"

test/.eslintrc

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

test/test.js

@@ -1,10 +1,10 @@
 
-var assert = require('assert');
-var http = require('http');
-var request = require('supertest');
-var timeout = require('..');
+var assert = require('assert')
+var http = require('http')
+var request = require('supertest')
+var timeout = require('..')
 
-describe('timeout()', function(){
+describe('timeout()', function () {
   it('should have a default timeout', function (done) {
     this.timeout(10000)
     var server = createServer()
@@ -27,9 +27,9 @@ describe('timeout()', function(){
     .expect(503, /45ms/, done)
   })
 
-  describe('when below the timeout', function(){
-    it('should do nothing', function(done){
-      var server = createServer(null, function(req, res){
+  describe('when below the timeout', function () {
+    it('should do nothing', function (done) {
+      var server = createServer(null, function (req, res) {
         res.end('Hello')
       })
       request(server)
@@ -38,10 +38,10 @@ describe('timeout()', function(){
     })
   })
 
-  describe('when above the timeout', function(){
-    describe('with no response made', function(){
-      it('should respond with 503 Request timeout', function(done){
-        var server = createServer(null, null, function(req, res){
+  describe('when above the timeout', function () {
+    describe('with no response made', function () {
+      it('should respond with 503 Request timeout', function (done) {
+        var server = createServer(null, null, function (req, res) {
           assert.ok(req.timedout)
           res.end('Hello')
         })
@@ -51,8 +51,8 @@ describe('timeout()', function(){
         .expect(503, done)
       })
 
-      it('should pass the error to next()', function(done){
-        var server = createServer(null, null, function(req, res){
+      it('should pass the error to next()', function (done) {
+        var server = createServer(null, null, function (req, res) {
           assert.ok(req.timedout)
           res.end('Hello')
         })
@@ -63,11 +63,11 @@ describe('timeout()', function(){
       })
     })
 
-    describe('with a partial response', function(){
-      it('should do nothing', function(done){
+    describe('with a partial response', function () {
+      it('should do nothing', function (done) {
         var server = createServer(null,
-          function(req, res){ res.write('Hello') },
-          function(req, res){
+          function (req, res) { res.write('Hello') },
+          function (req, res) {
             assert.ok(!req.timedout)
             res.end(' World')
           })
@@ -79,9 +79,9 @@ describe('timeout()', function(){
     })
   })
 
-  describe('options', function(){
-    it('can disable auto response', function(done){
-      var server = createServer({respond: false}, null, function(req, res){
+  describe('options', function () {
+    it('can disable auto response', function (done) {
+      var server = createServer({respond: false}, null, function (req, res) {
         res.end('Timedout ' + req.timedout)
       })
 
@@ -91,11 +91,11 @@ describe('timeout()', function(){
     })
   })
 
-  describe('req.clearTimeout()', function(){
-    it('should revert this behavior', function(done){
+  describe('req.clearTimeout()', function () {
+    it('should revert this behavior', function (done) {
       var server = createServer(null,
-        function(req, res){ req.clearTimeout() },
-        function(req, res){
+        function (req, res) { req.clearTimeout() },
+        function (req, res) {
           assert.ok(!req.timedout)
           res.end('Hello')
         })
@@ -106,80 +106,79 @@ describe('timeout()', function(){
     })
   })
 
-  describe('destroy()', function(){
-    it('req should clear timer', function(done){
+  describe('destroy()', function () {
+    it('req should clear timer', function (done) {
       var server = createServer(null,
-        function(req, res){ req.destroy() },
-        function(req, res){
+        function (req, res) { req.destroy() },
+        function (req, res) {
           assert.equal(error.code, 'ECONNRESET')
           assert.ok(!req.timedout)
           done()
         })
-      var error;
+      var error
 
       request(server)
       .get('/')
-      .end(function(err){
+      .end(function (err) {
         error = err
-      });
+      })
     })
 
-    it('res should clear timer', function(done){
+    it('res should clear timer', function (done) {
       var server = createServer(null,
-        function(req, res){ res.destroy() },
-        function(req, res){
+        function (req, res) { res.destroy() },
+        function (req, res) {
           assert.equal(error.code, 'ECONNRESET')
           assert.ok(!req.timedout)
           done()
         })
-      var error;
+      var error
 
       request(server)
       .get('/')
-      .end(function(err){
+      .end(function (err) {
         error = err
-      });
+      })
     })
 
-    it('socket should clear timer', function(done){
+    it('socket should clear timer', function (done) {
       var server = createServer(null,
-        function(req, res){ req.socket.destroy() },
-        function(req, res){
+        function (req, res) { req.socket.destroy() },
+        function (req, res) {
           assert.equal(error.code, 'ECONNRESET')
           assert.ok(!req.timedout)
           done()
         })
-      var error;
+      var error
 
       request(server)
       .get('/')
-      .end(function(err){
+      .end(function (err) {
         error = err
-      });
+      })
     })
   })
 
-  describe('when request aborted', function(){
-    it('should clear timeout', function(done){
+  describe('when request aborted', function () {
+    it('should clear timeout', function (done) {
       var aborted = false
       var server = createServer(null,
-        function(req, res){
-          req.on('aborted', function(){ aborted = true })
+        function (req, res) {
+          req.on('aborted', function () { aborted = true })
           test.abort()
         },
-        function(req, res){
+        function (req, res) {
           assert.ok(aborted)
           assert.ok(!req.timedout)
           done()
         })
-      var error
       var test = request(server).post('/')
       test.write('0')
     })
   })
 })
 
-function createServer(options, before, after) {
+function createServer (options, before, after) {
   var _ms = 100
 
   if (typeof options !== 'object') {
@@ -202,7 +201,7 @@ function createServer(options, before, after) {
       }
 
       if (after) {
-        setTimeout(function(){
+        setTimeout(function () {
           after(req, res)
         }, (_ms + 100))
       }