lint: use standard style

Author: dougwilson

.eslintignore

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

.eslintrc

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

.travis.yml

@@ -17,12 +17,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

@@ -15,8 +15,8 @@
  */
 
 var accepts = require('accepts')
-var escapeHtml = require('escape-html');
-var fs = require('fs');
+var escapeHtml = require('escape-html')
+var fs = require('fs')
 var path = require('path')
 var util = require('util')
 
@@ -25,17 +25,17 @@ var util = require('util')
  * @private
  */
 
-var TEMPLATE = fs.readFileSync(path.join(__dirname, '/public/error.html'), 'utf8')
+var DOUBLE_SPACE_REGEXP = /\x20{2}/g
+var NEW_LINE_REGEXP = /\n/g
 var STYLESHEET = fs.readFileSync(path.join(__dirname, '/public/style.css'), 'utf8')
-var doubleSpaceGlobalRegExp = /  /g
+var TEMPLATE = fs.readFileSync(path.join(__dirname, '/public/error.html'), 'utf8')
 var inspect = util.inspect
-var newLineGlobalRegExp = /\n/g
 var toString = Object.prototype.toString
 
 /* istanbul ignore next */
 var defer = typeof setImmediate === 'function'
   ? setImmediate
-  : function(fn){ process.nextTick(fn.bind.apply(fn, arguments)) }
+  : function (fn) { process.nextTick(fn.bind.apply(fn, arguments)) }
 
 /**
  * Error handler:
@@ -62,7 +62,7 @@ var defer = typeof setImmediate === 'function'
  * @api public
  */
 
-exports = module.exports = function errorHandler(options) {
+exports = module.exports = function errorHandler (options) {
   // get environment
   var env = process.env.NODE_ENV || 'development'
 
@@ -83,7 +83,7 @@ exports = module.exports = function errorHandler(options) {
     log = logerror
   }
 
-  return function errorHandler(err, req, res, next){
+  return function errorHandler (err, req, res, next) {
     // respect err.statusCode
     if (err.statusCode) {
       res.statusCode = err.statusCode
@@ -139,42 +139,42 @@ exports = module.exports = function errorHandler(options) {
       res.end(body)
     // json
     } else if (type === 'json') {
-      var error = { message: err.message, stack: err.stack };
-      for (var prop in err) error[prop] = err[prop];
+      var error = { message: err.message, stack: err.stack }
+      for (var prop in err) error[prop] = err[prop]
       var json = JSON.stringify({ error: error }, null, 2)
       res.setHeader('Content-Type', 'application/json; charset=utf-8')
-      res.end(json);
+      res.end(json)
     // plain text
     } else {
       res.setHeader('Content-Type', 'text/plain; charset=utf-8')
       res.end(str)
     }
-  };
-};
+  }
+}
 
 /**
  * Template title, framework authors may override this value.
  */
 
-exports.title = 'Connect';
+exports.title = 'Connect'
 
 /**
  * Escape a block of HTML, preserving whitespace.
  * @api private
  */
 
-function escapeHtmlBlock(str) {
+function escapeHtmlBlock (str) {
   return escapeHtml(str)
-  .replace(doubleSpaceGlobalRegExp, '  ')
-  .replace(newLineGlobalRegExp, '<br>')
+  .replace(DOUBLE_SPACE_REGEXP, ' &nbsp;')
+  .replace(NEW_LINE_REGEXP, '<br>')
 }
 
 /**
  * Stringify a value.
  * @api private
  */
 
-function stringify(val) {
+function stringify (val) {
   var stack = val.stack
 
   if (stack) {
@@ -193,6 +193,6 @@ function stringify(val) {
  * @api private
  */
 
-function logerror(err, str) {
-  console.error(str)
+function logerror (err, str) {
+  console.error(str || err.stack)
 }

package.json

@@ -14,6 +14,10 @@
   },
   "devDependencies": {
     "after": "0.8.2",
+    "eslint": "3.10.2",
+    "eslint-config-standard": "6.2.1",
+    "eslint-plugin-promise": "3.3.2",
+    "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 spec --check-leaks test/"

test/.eslintrc

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

test/test.js

@@ -113,10 +113,10 @@ describe('errorHandler()', function () {
     var server
 
     before(function () {
-        error = new Error('boom!')
-        error.description = 'it went this way'
-        server = createServer(error)
-    });
+      error = new Error('boom!')
+      error.description = 'it went this way'
+      server = createServer(error)
+    })
 
     describe('when "Accept: text/html"', function () {
       it('should return a html response', function (done) {
@@ -201,9 +201,9 @@ describe('errorHandler()', function () {
     it('should not die', function (done) {
       request(server)
       .get('/')
-      .expect(200, done);
-    });
-  });
+      .expect(200, done)
+    })
+  })
 
   describe('console', function () {
     var _consoleerror
@@ -376,7 +376,7 @@ describe('errorHandler(options)', function () {
         var error = new Error('boom!')
         var server = createServer(error, {log: log})
 
-        function log(err, str, req, res) {
+        function log (err, str, req, res) {
           assert.equal(err, error)
           assert.equal(str, error.stack.toString())
           assert.equal(req.url, '/')
@@ -393,7 +393,7 @@ describe('errorHandler(options)', function () {
   })
 })
 
-function createServer(error, options) {
+function createServer (error, options) {
   var _errorHandler = errorHandler(options)
 
   return http.createServer(function (req, res) {
@@ -404,7 +404,7 @@ function createServer(error, options) {
   })
 }
 
-function alterEnvironment(key, value) {
+function alterEnvironment (key, value) {
   var prev
 
   before(function () {