use underscore instead of utils

Author: goenning

.eslintrc.json

@@ -7,6 +7,7 @@
   },
   "rules": {
     "semi": [2, "always"],
-    "no-unused-vars": ["error", { "vars": "all", "args": "none" }]
+    "no-unused-vars": ["error", { "vars": "all", "args": "none" }],
+    "quotes": ["error", "single", { "avoidEscape": true } ]
   }
 }

lib/miniprofiler.js

@@ -14,7 +14,6 @@ var os = require('os');
 var path = require('path');
 var qs = require('querystring');
 var url = require('url');
-var utils = require('./utils.js');
 var uuid = require('node-uuid');
 var debug = require('debug')('miniprofiler');
 
@@ -72,13 +71,15 @@ var contentTypes = {
 };
 function static(reqPath, res) {
 	fs.readFile(path.join(includesDir, reqPath), function(err, data) {
-		if(err) {
+		if (err) {
+			debug(err);
+			res.setHeader('Content-Type', 'text/html');
 			res.writeHead(404);
-			res.end(JSON.stringify(err));
+			res.end('Resource unavailable.');
 			return;
 		}
 		var rs = reqPath.split('.');
-		res.setHeader("Content-Type", contentTypes[rs[rs.length - 1]]);
+		res.setHeader('Content-Type', contentTypes[rs[rs.length - 1]]);
 		res.writeHead(200);
 		res.end(data);
 	});
@@ -89,11 +90,11 @@ function results(req, res) {
 		// todo: store client timings
 		var id = post.id || url.parse(req.url, true).query.id;
 		var s = storage(id);
-		if (post.popup == "1")
+		if (post.popup == '1')
 			res.end(s);
 		else {
 			var j = JSON.parse(s);
-			res.setHeader("Content-Type", "text/html");
+			res.setHeader('Content-Type', 'text/html');
 			res.end(includes.share({
 				name: j.Name,
 				duration: j.DurationMilliseconds,
@@ -155,7 +156,7 @@ function middleware(f) {
 			res.on('finish', function() {
 				stopProfiling(req);
 			});
-			res.setHeader("X-MiniProfiler-Ids", '["' + id + '"]');
+			res.setHeader('X-MiniProfiler-Ids', '["' + id + '"]');
 		}
 		next();
 	};
@@ -223,7 +224,7 @@ function addProfilingInstrumentation(toInstrument) {
 		throw new Error('toInstrument must be set');
 	}
 
-	if(!utils.isObject(toInstrument)) {
+	if(!_.isObject(toInstrument)) {
 		throw new Error('toInstrument must be an object');
 	}
 
@@ -361,7 +362,7 @@ function timeQuery(extension, type, query, executeFunction) {
 	var customTiming = {
 		id: uuid.v4(),
 		executeType: type,
-		commandString: utils.htmlEscape(query),
+		commandString: _.escape(query),
 		startTime: time,
 		startDate: startDate,
 		callStack: new Error().stack
@@ -370,7 +371,7 @@ function timeQuery(extension, type, query, executeFunction) {
 
 	for(var i = 0; i < params.length; i++){
 		var param = params[i];
-		if(utils.isFunction(params[i])){
+		if(_.isFunction(params[i])){
 			params[i] = function() {
 				customTiming.stopTime = process.hrtime();
 
@@ -503,7 +504,7 @@ function instrument(func, defaultName) {
 		if(args) {
 			for(var i = 0; i < args.length; i++){
 				var arg = args[i];
-				if(arg && utils.isFunction(arg)){
+				if(arg && _.isFunction(arg)){
 					args[i] = instrument(arg, name+' arg #'+i);
 				}
 			}
@@ -549,13 +550,13 @@ function addProfilingImpl(toInstrument) {
 			continue;
 		}
 
-		if(utils.isObject(toWrap)) {
+		if(_.isObject(toWrap)) {
 			addProfilingImpl(toWrap);
 
 			continue;
 		}
 
-		if(utils.isFunction(toWrap)) {
+		if(_.isFunction(toWrap)) {
 			var wrappedFunc = instrument(toWrap, prop);
 
 			toInstrument[prop] = wrappedFunc;

lib/utils.js

@@ -21,12 +21,12 @@
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "eslint": "^2.9.0",
+    "eslint": "^2.10.2",
     "express": "^4.13.4",
     "istanbul": "^0.4.3",
     "mocha": "^2.4.5",
     "pg": "^4.5.5",
-    "pug": "^2.0.0-alpha6",
+    "pug": "^2.0.0-alpha7",
     "redis": "^2.6.0-2",
     "request": "^2.72.0"
   }

package.json

@@ -21,4 +21,13 @@ describe('MiniProfiler Static Assets Tests', function() {
     });
   });
 
+  it('Unknown file should return 404', function(done) {
+    server.get('/mini-profiler-resources/unkown.js', (err, response, body) => {
+      expect(response.statusCode).to.be.equal(404);
+      expect(response.headers['content-type']).to.be.equal('text/html');
+      expect(body).to.be.equal('Resource unavailable.');
+      done();
+    });
+  });
+
 });