linter and test fix

Author: goenning

.travis.yml

@@ -3,3 +3,6 @@ node_js:
   - "4"
   - "5"
   - "stable"
+
+before_script:
+  - npm run lint

README.md

@@ -21,13 +21,9 @@ Then see [examples/express/server.js](/examples/express/server.js) for example u
 
 Things to do:
 
-- remove dependency from express and connect
+- support major web frameworks like: Express, Hapi, koa.js, Sails.js
+- add examples for every web frameworks
 - storing of client timings on first result postback (there's a todo in the `results` function about where to do this)
 - document more things
-- better unit test code coverage for everything
-- add examples for every web frameworks
-- add examples for every provider
-- add more providers (mongodb, mysql, redis)
-- remove old ids from global storage (when?)
+- add providers for pg, mongodb, mysql, redis and more
 - add eslint to travis
-- better eslint (https://github.com/NodeRedis/node_redis/blob/master/.eslintrc)

examples/express/server.js

@@ -22,10 +22,10 @@ app.get('/js-sleep', function(req, res) {
 		setTimeout(function() {
 			res.render('home');
 		}, ms());
-	}
+	};
 
 	req.miniprofiler.timeQuery('custom', 'Sleeping...', waitBeforeRender, function() {
-		return 300
+		return 300;
 	});
 });
 

lib/miniprofiler.js

@@ -243,12 +243,13 @@ function startProfiling(request, enabled) {
 	};
 
 	if (enabled) {
+		currentRequestExtension.id = uuid.v4();
 		currentRequestExtension.startDate = Date.now();
 		currentRequestExtension.startTime = process.hrtime();
 		currentRequestExtension.stopTime = null;
 		currentRequestExtension.stepGraph = makeStep(request.path, currentRequestExtension.startTime, null);
-		currentRequestExtension.id = uuid.v4();
 		currentRequestExtension.customTimings = {};
+		debug(`Profiling started for ${request.path} with id ${currentRequestExtension.id}`);
 	}
 	currentRequestExtension.timeQuery = function() {
 		var args = Array.prototype.slice.call(arguments, enabled ? 0 : 3);
@@ -284,6 +285,7 @@ function stopProfiling(request){
 
 	var extension = request.miniprofiler;
 	var time = process.hrtime();
+	debug(`Profiling stopped for ${request.path} with id ${extension.id}`);
 	if(extension.stepGraph.parent != null){
 		throw new Error('profiling ended while still in a function, was left in ['+extension.stepGraph.name+']');
 	}
@@ -346,7 +348,7 @@ function step(name, request, call) {
  *  to have ended the query.
  */
 function timeQuery(extension, type, query, executeFunction) {
-  debug(`timeQuery "${type}" with command "${query}"`);
+  debug(`Started timed query "${type}" with command "${query}"`);
 
 	var time = process.hrtime();
 	var startDate = Date.now();
@@ -367,21 +369,17 @@ function timeQuery(extension, type, query, executeFunction) {
 	};
 	extension.stepGraph.customTimings[type].push(customTiming);
 
-	//Do we need this?
-	/*
 	for(var i = 0; i < params.length; i++){
-		var param = params[i];
 		if(_.isFunction(params[i])){
+			var param = params[i];
 			params[i] = function() {
-				//customTiming.stopTime = process.hrtime();
-
+				debug(`Stopped timed query "${type}" with command "${query}"`);
+				customTiming.stopTime = process.hrtime();
 				var ret = param.apply(this, arguments);
-
 				return ret;
 			};
 		}
 	}
-	*/
 
 	var ret = executeFunction.apply(this, params);
 

tests/basic-test.js

@@ -25,9 +25,10 @@ describe('MiniProfiler Tests', function() {
         expect(result.Root.Children).to.be.empty;
         expect(result.Root.CustomTimings).to.have.property('custom');
         expect(result.Root.CustomTimings.custom).to.have.lengthOf(1);
-        expect(result.Root.CustomTimings.custom[0].ExecuteType).to.be.equal('custom')
-        expect(result.Root.CustomTimings.custom[0].CommandString).to.be.equal('Sleeping...')
-        expect(result.Root.CustomTimings.custom[0].DurationMilliseconds).to.be.above(result.DurationMilliseconds);
+
+        expect(result.Root.CustomTimings.custom[0].ExecuteType).to.be.equal('custom');
+        expect(result.Root.CustomTimings.custom[0].CommandString).to.be.equal('Sleeping...');
+        expect(result.Root.CustomTimings.custom[0].DurationMilliseconds).to.be.below(result.DurationMilliseconds);
         done();
       });
     });

tests/server/default.js

@@ -24,15 +24,9 @@ app.get('/step-two', (req, res) => {
 });
 
 app.get('/js-sleep', function(req, res) {
-	var waitBeforeRender = function(ms) {
-		setTimeout(function() {
-    	res.send();
-		}, ms());
-	}
-
-	req.miniprofiler.timeQuery('custom', 'Sleeping...', waitBeforeRender, function() {
-		return 300
-	});
+	req.miniprofiler.timeQuery('custom', 'Sleeping...', setTimeout, function() {
+		res.send();
+	}, 300);
 });
 
 module.exports = require('./base.js')(app);