huge code and test refactor +coverage

Author: Guilherme Oenning

README.md

@@ -54,18 +54,18 @@ html
 
 When visiting `localhost:8080`, you should see this.
 
-![](/examples/images/example0.png)
+![](/images/example0.png)
 
-See [examples/express.js](/examples/express.js) for more examples.
+See [tests/servers/<your web framework>](/tests/servers) for more examples.
 
-![](/examples/images/example1.png)
-![](/examples/images/example2.png)
+![](/images/example1.png)
+![](/images/example2.png)
 
 # Want to help?
 
 Things to do:
 
-- Refactor/Remove TODO comments 
+- Refactor/Remove TODO comments
 - transform testcases into runnable examples (npm run example)
 - storing of client timings on first result postback (there's a todo in the `results` function about where to do this)
 - document more things

examples/express.js

@@ -1,46 +1,16 @@
-module.exports = function(f, profiler) {
-	if(!f) f = function() { return true; };
+module.exports = function(f, handleRequest) {
 	return function(req, res, next) {
-		profiler.configure();
 		var enabled = f(req, res);
 
-		if(req.path.startsWith(profiler.resourcePath)) {
-			if (!enabled) {
-        res.setHeader('Content-Type', 'text/plain; charset=utf-8');
-        res.writeHead(404);
-        res.end('MiniProfiler is disabled');
-        return;
-			}
+		var respondWith = (res, result) => {
+			res.writeHead(result.status, { 'Content-Type': result.type });
+			res.end(result.body);
+		};
 
-			var sp = req.path.split('/');
-			var reqPath = sp[sp.length - 1];
-		
-			if(reqPath == 'results')
-				profiler.results(req, res, (result) => {
-          res.setHeader('Content-Type', result.type);
-          res.writeHead(result.status);
-          res.end(result.body);
-        });
-			else
-				profiler.static(reqPath, res, (result) => {
-          res.setHeader('Content-Type', result.type);
-          res.writeHead(result.status);
-          res.end(result.body);
-        });
-			return;
-		}
-		var id = profiler.startProfiling(req, enabled);
+		handleRequest(enabled, req, res, respondWith).then((handled) => {
+			if (!handled)
+				next();
 
-		//res.locals.miniprofiler = enabled ? req.miniprofiler : {
-		//	include: function() { return ''; }
-		//};
-
-		if (enabled) {
-			res.on('finish', function() {
-				profiler.stopProfiling(req);
-			});
-			res.setHeader('X-MiniProfiler-Ids', `["${id}"]`);
-		}
-		next();
+		}).catch(next);
 	};
-};
+};

examples/hapi.js

@@ -1,50 +1,20 @@
-module.exports = function(f, profiler) {
-	if(!f) f = function() { return true; };
-	var plugin = {
-		register: function(server, options, next) {
-			server.ext('onRequest', function(request, reply) {
-
-				profiler.configure();
-				var enabled = f(request.raw.req, request.raw.res);
-
-				request.raw.req.path = request.path;
-				if(request.path.startsWith(profiler.resourcePath)) {
-					if (!enabled) {
-						request.raw.res.setHeader('Content-Type', 'text/plain; charset=utf-8');
-						request.raw.res.writeHead(404);
-						request.raw.res.end('MiniProfiler is disabled');
-						return;
-					}
-
-					var sp = request.path.split('/');
-					var reqPath = sp[sp.length - 1];
-					if(reqPath == 'results')
-						profiler.results(request.raw.req, request.raw.res, (result) => {
-              return reply(result.body).type(result.type).code(result.status);
-						});
-					else
-						profiler.static(reqPath, request.raw.res, (result) => {
-              return reply(result.body).type(result.type).code(result.status);
-						});
-					return;
-				}
-				var id = profiler.startProfiling(request.raw.req, enabled);
-
-				//res.locals.miniprofiler = enabled ? req.miniprofiler : {
-				//	include: function() { return ''; }
-				//};
+var onHapiRequest = function(f, handleRequest, request, reply) {
+	var enabled = f(request.raw.req, request.raw.res);
 
-				if (enabled) {
-					request.raw.res.on('finish', function() {
-						profiler.stopProfiling(request.raw.req);
-					});
-					request.raw.res.setHeader('X-MiniProfiler-Ids', `["${id}"]`);
-				}
-
-				return reply.continue();
+	var respondWith = (res, result) => {
+		reply(result.body).type(result.type).code(result.status);
+	};
 
-			});
+	handleRequest(enabled, request.raw.req, request.raw.res, respondWith).then((handled) => {
+		if (!handled)
+			reply.continue();
+	});
+};
 
+module.exports = function(f, handleRequest) {
+	var plugin = {
+		register: (server, options, next) => {
+			server.ext('onRequest', onHapiRequest.bind(null, f, handleRequest));
 			next();
 		}
 	};