fix tests

.eslintrc

@@ -11,7 +11,7 @@
         "max-depth": [1, 3],
         "complexity": [2, 7],
         "max-params": [1, 3],
-        "max-nested-callbacks": [2, 2],
+        "max-nested-callbacks": [2, 3],
         "consistent-this": [1, "self"],
         "no-extra-bind": 1,
         "space-after-keywords": [2, "always"],

lib/index.js

@@ -21,7 +21,7 @@ var data = {
 
 /* adding arrays, to hold the policies */
 _applyPoints.forEach(function (applyPoint) {
-    data[applyPoint] = [];
+    data[applyPoint] = {};
 });
 
 var runPolicies = function (policies, request, reply) {
@@ -74,7 +74,12 @@ var loadPolicies = function (server, options, next) {
     var match = null;
     var re = /(.+)\.js$/;
 
-    var addPolicy = function addPolicy(filename, addPolicyNext) {
+    var policyFiles = fs.readdirSync(options.policyDirectory);
+    if (policyFiles.length === 0) {
+        return next();
+    }
+
+    function addPolicy(filename, addPolicyNext) {
 
         // Only looking for .js files in the policies folder
         match = filename.match(re);
@@ -112,19 +117,15 @@ var loadPolicies = function (server, options, next) {
         }
 
         addPolicyNext();
-    };
-
-    var policyFiles = fs.readdirSync(options.policyDirectory);
-    if (policyFiles.length === 0) {
-        return next();
     }
+
     async.eachSeries(policyFiles, addPolicy, function (err) {
 
         next(err);
     });
 };
 
-var reset = function () {
+var reset = function reset() {
 
     data = {
         names: [],
@@ -133,7 +134,7 @@ var reset = function () {
 
     /* adding arrays to hold the policies */
     _applyPoints.forEach(function (applyPoint) {
-        data[applyPoint] = [];
+        data[applyPoint] = {};
     });
 };
 
@@ -143,7 +144,6 @@ exports.register = function register(server, options, next) {
     server.expose('data', data);
     server.expose('reset', reset);
 
-
     options.defaultApplyPoint = options.defaultApplyPoint || 'onPreHandler'; // default application point
 
     if (options.policyDirectory !== undefined) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mrhorse",
-    "version": "0.0.3",
+    "version": "1.0.0",
     "description": "Apply policies to hapi routes",
     "main": "index",
     "scripts": {
@@ -14,7 +14,7 @@
         "hapi",
         "policy"
     ],
-    "author": "Mark Bradshaw <mark.bradshaw@gmail.com> and Brad Olson <brad.olson@movedbylight.com>",
+    "author": "Mark Bradshaw <mark.bradshaw@gmail.com>, Brad Olson <brad.olson@movedbylight.com>, Pavel Polyakov",
     "license": "MIT",
     "bugs": {
         "url": "https://github.com/mark-bradshaw/mrhorse/issues"
@@ -33,4 +33,4 @@
         "hapi": "^8.0.0",
         "lab": "^5.1.0"
     }
-}
+}

test/fixtures/incorrectApplyPoint.js

@@ -3,6 +3,6 @@ var incorrectApplyPoint = function(request, reply, callback) {
     callback(null, false, 'custom');
 };
 
-incorrectApplyPoint.applyPoint='onIncorrect';
+incorrectApplyPoint.applyPoint = 'onIncorrect'; // invalid hapi event name
 
-module.exports = incorrectApplyPoint;
+module.exports = incorrectApplyPoint;

test/index.js

@@ -1,8 +1,11 @@
+/* eslint-disable */
+
 var Code = require('code');
 var fs = require('fs');
 var Hapi = require('hapi');
 var Lab = require('lab');
 var lab = exports.lab = Lab.script();
+var util = require('util');
 
 var mrhorse = require('..');
 
@@ -37,9 +40,9 @@ lab.experiment('Non standard setups', function (done) {
 
         server.register({
                 register: require('..'),
-                options : {}
+                options: {}
             },
-            function (err) {
+            function () {
 
                 Code.expect(server.plugins.mrhorse).to.be.an.object();
                 Code.expect(server.plugins.mrhorse.data.names.length).to.equal(0);
@@ -51,38 +54,63 @@ lab.experiment('Non standard setups', function (done) {
 
         try {
             fs.mkdirSync(__dirname + '/emptypolicies');
-
-        } catch (err) {
+        }
+        catch (err) {
             console.log(err);
         }
 
         server.register({
                 register: require('..'),
-                options : {
+                options: {
                     policyDirectory: __dirname + '/emptypolicies'
                 }
             },
-            function (err) {
+            function () {
 
                 Code.expect(server.plugins.mrhorse).to.be.an.object();
                 Code.expect(server.plugins.mrhorse.data.names.length).to.equal(0);
+
+                // cleanup
                 try {
                     fs.rmdirSync(__dirname + '/emptypolicies');
-                } catch (err2) {
-                    console.log(err2);
+                }
+                catch (err) {
+                    console.log(err);
                 }
 
                 done();
-
-
             });
     });
 
+    lab.test('accepts an alternate default apply point', function(done) {
+
+        server.register({
+            register: require('..'),
+            options : {
+                policyDirectory: __dirname + '/policies',
+                defaultApplyPoint: 'onPostHandler'
+            }
+        }, function (err) {
+
+            if (err) {
+                console.log(err);
+            }
+
+            Code.expect(server.plugins.mrhorse.data.setHandlers.onPostHandler).to.equal(true);
+            Code.expect(Object.keys(server.plugins.mrhorse.data.onPostHandler).length).to.equal(7);
+
+            server.plugins.mrhorse.reset();
+
+            done();
+        });
+    })
+
     lab.test('incorrect applyPoint', function (done) {
 
+        // pull this bad policy in to the policies folder.
         try {
             fs.mkdirSync(__dirname + '/incorrect-policies');
-            fs.writeFileSync(__dirname+'/incorrect-policies/incorrectApplyPoint.js', fs.readFileSync(__dirname+'/fixtures/incorrectApplyPoint.js'));
+            fs.writeFileSync(__dirname + '/incorrect-policies/incorrectApplyPoint.js', fs.readFileSync(__dirname + '/fixtures/incorrectApplyPoint.js'));
         } catch (err) {
             console.log(err);
         }
@@ -96,6 +124,9 @@ lab.experiment('Non standard setups', function (done) {
             function (err) {
 
                 Code.expect(err.toString()).to.equal('Error: Trying to set incorrect applyPoint for the policy: onIncorrect');
+
+                // cleanup
+                server.plugins.mrhorse.reset();
                 try {
                     fs.unlinkSync(__dirname + '/incorrect-policies/incorrectApplyPoint.js');
                     fs.rmdirSync(__dirname + '/incorrect-policies');
@@ -234,7 +265,7 @@ lab.experiment('Normal setup', function (done) {
             register: require('..'),
             options : {
                 policyDirectory: __dirname + '/policies',
-                applyPoint: 'onPreHandler'
+                defaultApplyPoint: 'onPreHandler'
             }
         }, function (err) {
 
@@ -344,4 +375,4 @@ lab.experiment('Normal setup', function (done) {
             done();
         });
     });
-});
+});