better names and coverage fix for travis

Author: goenning

.travis.yml

@@ -14,8 +14,6 @@ before_script:
 
 after_script:
   - npm run coverage
-  - npm run update-coveralls
-  - npm run check-coverage
 
 notifications:
   email:

docker-compose.yml

@@ -15,4 +15,17 @@ test:
     - redis
     - postgres:pg
   working_dir: /usr/src/miniprofiler
-  command: npm run mocha
+  command: npm run mocha
+
+coverage:
+  image: node
+  volumes:
+    - .:/usr/src/miniprofiler
+  links:
+    - redis
+    - postgres:pg
+  working_dir: /usr/src/miniprofiler
+  command:
+    - npm run mocha-coverage
+    - npm run check-coverage
+    - npm run update-coveralls

lib/middlewares/express.js

@@ -1,10 +1,10 @@
 module.exports = {
-  instrument: function(provider) {
+  buildMiddleware: function(provider) {
     return function(req, res, next) {
       provider(req, res, next);
     };
   },
-  middleware: function(f, handleRequest) {
+  mainMiddleware: function(f, handleRequest) {
     return function(req, res, next) {
       var enabled = f(req, res);
 

lib/middlewares/hapi.js

@@ -12,7 +12,7 @@ var onHapiRequest = function(f, handleRequest, request, reply) {
 };
 
 module.exports = {
-  instrument: function(provider, name) {
+  buildMiddleware: function(provider, name) {
     var plugin = {
       register: (server, options, next) => {
         server.ext('onRequest', function(request, reply) {
@@ -31,7 +31,7 @@ module.exports = {
 
     return plugin;
   },
-  middleware: function(f, handleRequest) {
+  mainMiddleware: function(f, handleRequest) {
     var plugin = {
       register: (server, options, next) => {
         server.ext('onRequest', onHapiRequest.bind(null, f, handleRequest));

lib/middlewares/koa.js

@@ -1,13 +1,13 @@
 module.exports = {
-  instrument: function(provider) {
+  buildMiddleware: function(provider) {
     return function *(next) {
       yield new Promise((resolve, reject) => {
         provider(this.req, this.res, resolve);
       });
       yield next;
     };
   },
-  middleware: function(f, handleRequest) {
+  mainMiddleware: function(f, handleRequest) {
     return function *(next) {
       var enabled = f(this.req, this.res);
 

lib/miniprofiler.js

@@ -31,20 +31,18 @@ exports.configure = configure;
 
 for (let framework of ['koa', 'express', 'hapi']) {
   let func = require(`./middlewares/${framework}.js`);
-  func.name = framework;
+
   exports[framework] = function(f) {
 		if(!f) f = () => { return true; };
-    return func.middleware(f, handleRequest);
+    return func.mainMiddleware(f, handleRequest);
   };
 
   exports[framework].for = {
-    pg: function(pg) {
-      var provider = require('./providers/miniprofiler.pg.js')(pg);
-      return func.instrument(provider, 'pg');
+    pg: (pg) => {
+      return func.buildMiddleware(require('./providers/miniprofiler.pg.js')(pg), 'pg');
     },
-    redis: function(redis) {
-      var provider = require('./providers/miniprofiler.redis.js')(redis);
-      return func.instrument(provider, 'redis');
+    redis: (redis) => {
+      return func.buildMiddleware(require('./providers/miniprofiler.redis.js')(redis), 'redis');
     }
   };
 }

package.json

@@ -7,8 +7,10 @@
     "lint": "eslint .",
     "stop-services": "docker-compose stop",
     "test": "docker-compose up test",
+    "coverage": "docker-compose up coverage",
+
     "mocha": "mocha tests/ -c",
-    "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- tests/ -R spec",
+    "mocha-coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- tests/ -R spec",
     "check-coverage": "istanbul check-coverage --statements 70 --branches 70 --functions 70 --lines 70",
     "update-coveralls": "cat coverage/lcov.info | node ./node_modules/coveralls/bin/coveralls.js"
   },