better eslint rules and provider for pg

Author: Guilherme Oenning

.eslintignore

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

.eslintrc.json

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

examples/express/server.js

@@ -1,54 +1,30 @@
-var miniprofiler = require('../../miniprofiler.js');
-var pg = require('pg');
-var miniprofilerPG = function(pg) {
-	return function (req, res, next) {
-		if (req.miniprofiler.enabled) {
-			var pgQuery = pg.Client.prototype.query
-			pg.Client.prototype.query = function(config, values, callback) {
-				req.miniprofiler.timeQuery('sql', 'SELECT $1::int AS number', pgQuery.bind(this), config, values, callback);
-				pg.Client.prototype.query = pgQuery
-			}
-		}
-		next()
-	}
-}
+var miniprofiler = require('../../miniprofiler.js')
+var pg = require('pg')
 
-var express = require('express');
-var connString = "postgres://postgres:postgres@localhost/async_demo";
+var express = require('express')
+var connString = 'postgres://postgres:postgres@localhost/async_demo'
 
-// Defaults to 'left'. Uncomment this to move to right. Also supports 'bottomLeft', 'bottomRight'.
-/*
-miniprofiler.configure({
-	popupRenderPosition: 'right'
-});
-*/
+var app = express()
+app.use(miniprofiler.profile())
+app.use(miniprofiler.for.pg(pg))
 
-var app = express();
-app.use(miniprofiler.profile());
-app.use(miniprofilerPG(pg));
-
-app.set('view engine', 'pug');
+app.set('view engine', 'pug')
 app.set('views', './examples/views')
 
-app.get('/', function(req, res) {
-	pg.connect(connString, function(err, client, done) {
-		client.query('SELECT $1::int AS number', ['1'], function(err, result) {
-	    done();
-			res.render('home');
-	  });
-	});
-});
+app.get('/', function (req, res) {
+	res.render('home')
+})
 
-app.get('/multi-query', function(req, res) {
-	req.miniprofiler.step('Step 1', function() {
-		req.miniprofiler.step('Step 2', function() {
-			req.miniprofiler.timeQuery('sql', 'SELECT * FROM TEST', function() {
-				req.miniprofiler.timeQuery('sql', 'SELECT * FROM TEST', function() {
-		  		res.render('multi-query');
-				});
-			});
-		});
-	});
-});
+app.get('/multi-query', function (req, res) {
+	pg.connect(connString, function (err, client, done) {
+	  client.query('SELECT pg_sleep(1)', [], function (err, result) {
+	    client.query('SELECT $1::int AS number', ['2'], function (err, result) {
+	      console.log(result)
+	      done()
+	      res.render('multi-query')
+		  })
+	  })
+	})
+})
 
-app.listen(8080);
+app.listen(8080)

miniprofiler.js

@@ -22,6 +22,9 @@ _.templateSettings = {
 exports.configure = configure;
 exports.instrument = addProfilingInstrumentation;
 exports.profile = middleware;
+exports.for = {
+	pg: require('./providers/miniprofiler.pg.js')
+}
 
 // GLOBALS
 var storage = function(id, json) {
@@ -76,10 +79,8 @@ function static(reqPath, res) {
 	});
 }
 
-var util = require('util');
-
 function results(req, res) {
-	proc = function(post) {
+	var proc = function(post) {
 		// todo: store client timings
 		var id = post.id || url.parse(req.url, true).query.id;
 		var s = storage(id);
@@ -212,10 +213,6 @@ function configure(options){
 	configured = true;
 }
 
-function getProfiling(id){
-	return storage(id);
-}
-
 /*
  * Modifies `toInstrument` such that each function has been instrumented for miniprofiler purposes.
  *

package.json

@@ -4,7 +4,7 @@
   "description": "A simple but effective mini-profiler.",
   "main": "miniprofiler.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "lint": "eslint ."
   },
   "repository": {
     "type": "git",
@@ -14,8 +14,11 @@
   "license": "Apache-2.0",
   "readmeFilename": "README.md",
   "devDependencies": {
+    "eslint": "^2.9.0",
     "express": "^4.13.4",
+    "mocha": "^2.4.5",
     "pg": "^4.5.5",
-    "pug": "^2.0.0-alpha6"
+    "pug": "^2.0.0-alpha6",
+    "redis": "^2.6.0-2"
   }
 }

providers/miniprofiler.pg.js

@@ -0,0 +1,13 @@
+var pgQuery;
+
+module.exports = function (pg) {
+	pgQuery = pgQuery || pg.Client.prototype.query
+	return function (req, res, next) {
+    if (req.miniprofiler.enabled) {
+      pg.Client.query = function (config, values, callback) {
+				req.miniprofiler.timeQuery('sql', config.toString(), pgQuery.bind(this), config, values, callback)
+			}
+		}
+		next()
+	}
+}