express dependency splitted into it's own module

Author: goenning

examples/express.js

@@ -6,12 +6,10 @@ var express = require('express');
 var connString = 'postgres://postgres:postgres@localhost/miniprofiler';
 
 var app = express();
-app.use(miniprofiler.profile());
+app.use(miniprofiler.express());
 app.use(miniprofiler.for.pg(pg));
 app.use(miniprofiler.for.redis(redis));
 
-	var redisClient = redis.createClient();
-
 app.set('view engine', 'pug');
 app.set('views', './examples/views');
 
@@ -30,6 +28,7 @@ app.get('/js-sleep', function(req, res) {
 });
 
 app.get('/redis-set-get', function(req, res) {
+	var redisClient = redis.createClient();
   redisClient.set('customer', '[email protected]', function() {
     redisClient.get('customer', function(err, reply) {
       res.render('home');
@@ -47,6 +46,7 @@ app.get('/pg-sleep', function(req, res) {
 });
 
 app.get('/all', function(req, res) {
+	var redisClient = redis.createClient();
   req.miniprofiler.step('Waiting 1 second', function() {
 
     pg.connect(connString, function(err, pgClient, done) {

lib/middlewares/express.js

@@ -0,0 +1,37 @@
+module.exports = function(f, profiler) {
+	if(!f) f = function() { return true; };
+	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');
+        res.writeHead(404);
+        res.end('MiniProfiler is disabled.');
+        return;
+			}
+
+			var sp = req.path.split('/');
+			var reqPath = sp[sp.length - 1];
+			if(reqPath == 'results')
+				profiler.results(req, res);
+			else
+				profiler.static(reqPath, res);
+			return;
+		}
+		var id = profiler.startProfiling(req, enabled);
+
+		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();
+	};
+};

lib/miniprofiler.js

@@ -21,9 +21,23 @@ _.templateSettings = {
 	interpolate: /\{(.+?)\}/g
 };
 
+var shared = function() {
+	return {
+		configure,
+		startProfiling,
+		stopProfiling,
+		results,
+		static,
+		resourcePath
+	};
+};
+
 // EXPORTS
 exports.configure = configure;
-exports.profile = middleware;
+exports.express = function(f) {
+	return require('./middlewares/express.js')(f, shared());
+};
+
 exports.for = {
 	pg: require('./providers/miniprofiler.pg.js'),
 	redis: require('./providers/miniprofiler.redis.js')
@@ -147,44 +161,6 @@ var includes = {
 	share: _.template(fs.readFileSync(path.join(includesDir, 'share.html')).toString())
 };
 
-function middleware(f) {
-	if(!f) f = function() { return true; };
-	return function(req, res, next) {
-		if(!configured) configure();
-		var enabled = f(req, res);
-
-		if(req.path.startsWith(resourcePath)) {
-			if (!enabled) {
-        res.setHeader('Content-Type', 'text/plain');
-        res.writeHead(404);
-        res.end('MiniProfiler is disabled.');
-        return;
-			}
-
-			var sp = req.path.split('/');
-			var reqPath = sp[sp.length - 1];
-			if(reqPath == 'results')
-				results(req, res);
-			else
-				static(reqPath, res);
-			return;
-		}
-		var id = startProfiling(req, enabled);
-
-		res.locals.miniprofiler = enabled ? req.miniprofiler : {
-			include: function() { return ''; }
-		};
-
-		if (enabled) {
-			res.on('finish', function() {
-				stopProfiling(req);
-			});
-			res.setHeader('X-MiniProfiler-Ids', `["${id}"]`);
-		}
-		next();
-	};
-}
-
 function include(id) {
 	// not profiling
 	if(!id) {

tests/server/default.js

@@ -3,7 +3,7 @@ var express = require('express');
 
 var app = express();
 
-app.use(miniprofiler.profile());
+app.use(miniprofiler.express());
 
 app.get('/', (req, res) => {
 	res.send();

tests/server/unprofiled.js

@@ -7,7 +7,7 @@ var disableMiniProfiler = (req) => {
   return false;
 };
 
-app.use(miniprofiler.profile(disableMiniProfiler));
+app.use(miniprofiler.express(disableMiniProfiler));
 
 app.get('/', (req, res) => {
 	res.send();