moving underscore to npm dependency, some eslint fixes, code coverage config

Author: goenning

.eslintignore

@@ -1,2 +1,2 @@
-underscore-min.js
 ui
+coverage

.eslintrc.json

@@ -1,7 +1,9 @@
 {
   "extends": "eslint:recommended",
   "env": {
-    "node":  true
+    "node":  true,
+    "es6": true,
+    "mocha": true
   },
   "rules": {
     "semi": [2, "always"]

examples/express/server.js

@@ -1,4 +1,4 @@
-var miniprofiler = require('../../miniprofiler.js');
+var miniprofiler = require('../../lib/miniprofiler.js');
 var pg = require('pg');
 
 var express = require('express');
@@ -18,9 +18,7 @@ app.get('/', function (req, res) {
 app.get('/multi-query', function (req, res) {
 	pg.connect(connString, function (err, client, done) {
 		client.query('SELECT pg_sleep(1)', [], function (err, result) {
-			console.log(result);
 			client.query('SELECT $1::int AS number', ['2'], function (err, result) {
-				console.log(result);
 				done();
 				res.render('multi-query');
 			});

examples/http/server.js

@@ -1,11 +1,12 @@
 var http = require('http');
-var miniprofiler = require('../../miniprofiler.js');
+var miniprofiler = require('../../lib/miniprofiler.js');
+
+var profile = miniprofiler.profile();
 
 http.createServer(function (req, res) {
-  var profile = miniprofiler.profile();
-  profile(req, res, function(){
-    req.miniprofiler.step('a', function(){
-  	   res.end('home');
-    })
-  })
+  profile(req, res, function() {
+    req.miniprofiler.step('Step 1', function(){
+      res.end('home');
+    });
+  });
 }).listen(8080);

miniprofiler.js lib/miniprofiler.jsminiprofiler.js renamed to lib/miniprofiler.js

@@ -4,11 +4,11 @@
  *  Apache License, Version 2.0
  *
  *  Kevin Montrose, 2013 @kevin-montrose
- *  Matt Jibson, 2013 @mjibson
+ *  Matt Jibson, 2013 @mjibsonF
  *  Guilherme Oenning, 2016 @goenning
  */
 
-var _ = require('./underscore-min.js');
+var _ = require('underscore');
 var fs = require('fs');
 var os = require('os');
 var path = require('path');
@@ -56,7 +56,7 @@ var popupShowTimeWithChildren = false;
 var popupRenderPosition = 'left';
 var configured = false;
 
-var includesDir = path.join(path.dirname(module.filename), 'ui');
+var includesDir = path.join(path.dirname(module.filename), '../ui');
 var resourcePath = '/mini-profiler-resources/';
 var version = '';
 

providers/miniprofiler.pg.js lib/providers/miniprofiler.pg.jsproviders/miniprofiler.pg.js renamed to lib/providers/miniprofiler.pg.js

@@ -2,10 +2,11 @@
   "name": "miniprofiler",
   "version": "0.0.8",
   "description": "A simple but effective mini-profiler.",
-  "main": "miniprofiler.js",
+  "main": "lib/miniprofiler.js",
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha tests/"
+    "test": "mocha tests/",
+    "coverage": "istanbul cover node_modules/mocha/bin/_mocha tests/"
   },
   "repository": {
     "type": "git",
@@ -14,10 +15,14 @@
   "author": "",
   "license": "Apache-2.0",
   "readmeFilename": "README.md",
+  "dependencies": {
+    "underscore": "1.5.2"
+  },
   "devDependencies": {
     "chai": "^3.5.0",
     "eslint": "^2.9.0",
     "express": "^4.13.4",
+    "istanbul": "^0.4.3",
     "mocha": "^2.4.5",
     "pg": "^4.5.5",
     "pug": "^2.0.0-alpha6",

package.json

@@ -1,15 +1,14 @@
 var expect = require('chai').expect;
-var miniprofiler = require('../miniprofiler.js');
-var server = require('./demo-server.js');
+var server = require('./demo-express-server.js');
 
 describe('MiniProfiler Tests', function() {
   before(server.start);
   after(server.stop);
 
   it('Unprofiled route should not return Profiler ID', function(done) {
-    server.get('/unprofiled', (err, response, body) => {
+    server.get('/unprofiled', (err, response) => {
       expect(response.headers).to.not.include.keys('x-miniprofiler-ids');
-      done()
-    })
+      done();
+    });
   });
 });

tests/basic.js

@@ -1,13 +1,13 @@
-var miniprofiler = require('../miniprofiler.js');
+var miniprofiler = require('../lib/miniprofiler.js');
 var express = require('express');
 var request = require('request');
 
 var app = express();
 var server;
 
-var enableMiniProfiler = (req, res) => {
-  return req.url != '/unprofiled'
-}
+var enableMiniProfiler = (req) => {
+  return req.url != '/unprofiled';
+};
 
 app.use(miniprofiler.profile(enableMiniProfiler));
 
@@ -17,14 +17,14 @@ app.get('/', (req, res) => {
 
 app.get('/step', (req, res) => {
   req.miniprofiler.step('Step 1', () => {
-  	res.send();
+    res.send();
   });
 });
 
 app.get('/step-two', (req, res) => {
   req.miniprofiler.step('Step 1', () => {
     req.miniprofiler.step('Step 2', () => {
-    	res.send();
+      res.send();
     });
   });
 });

tests/demo-server.js tests/demo-express-server.jstests/demo-server.js renamed to tests/demo-express-server.js

@@ -1,18 +1,17 @@
 var expect = require('chai').expect;
-var miniprofiler = require('../miniprofiler.js');
-var server = require('./demo-server.js');
+var server = require('./demo-express-server.js');
 
 describe('MiniProfiler Step Tests', function() {
   before(server.start);
   after(server.stop);
 
   it('Index route should not profile any step', function(done) {
-    server.get('/', (err, response, body) => {
+    server.get('/', (err, response) => {
       var ids = JSON.parse(response.headers['x-miniprofiler-ids']);
       expect(ids).to.have.lengthOf(1);
 
       server.post('/mini-profiler-resources/results', { id: ids[0], popup: 1 }, (err, response, body) => {
-        var result = JSON.parse(body)
+        var result = JSON.parse(body);
         expect(result.Id).to.equal(ids[0]);
         expect(result.Name).to.equal('/');
         expect(result.Root.Children).to.be.empty;
@@ -23,12 +22,12 @@ describe('MiniProfiler Step Tests', function() {
   });
 
   it('step route should profile one step', function(done) {
-    server.get('/step', (err, response, body) => {
+    server.get('/step', (err, response) => {
       var ids = JSON.parse(response.headers['x-miniprofiler-ids']);
       expect(ids).to.have.lengthOf(1);
 
       server.post('/mini-profiler-resources/results', { id: ids[0], popup: 1 }, (err, response, body) => {
-        var result = JSON.parse(body)
+        var result = JSON.parse(body);
         expect(result.Id).to.equal(ids[0]);
         expect(result.Name).to.equal('/step');
         expect(result.Root.Children).to.have.lengthOf(1);
@@ -42,12 +41,12 @@ describe('MiniProfiler Step Tests', function() {
   });
 
   it('step-two route should profile two nested step', function(done) {
-    server.get('/step-two', (err, response, body) => {
+    server.get('/step-two', (err, response) => {
       var ids = JSON.parse(response.headers['x-miniprofiler-ids']);
       expect(ids).to.have.lengthOf(1);
 
       server.post('/mini-profiler-resources/results', { id: ids[0], popup: 1 }, (err, response, body) => {
-        var result = JSON.parse(body)
+        var result = JSON.parse(body);
         expect(result.Id).to.equal(ids[0]);
         expect(result.Name).to.equal('/step-two');
         expect(result.Root.Children).to.have.lengthOf(1);