Directory handler path function result. Closes #1574

docs/README.md

@@ -1,7 +1,8 @@
 ## Current Documentation
-  [v5.0.x](https://github.com/spumko/hapi/blob/master/docs/Reference.md)  
+  [v5.1.x](https://github.com/spumko/hapi/blob/master/docs/Reference.md)  
 
 ## Previous Documentation
+  [v5.0.x](https://github.com/spumko/hapi/blob/v5.0.0/docs/Reference.md)  
   [v4.1.x](https://github.com/spumko/hapi/blob/v4.1.0/docs/Reference.md)  
   [v4.0.x](https://github.com/spumko/hapi/blob/v4.0.0/docs/Reference.md)  
   [v3.1.x](https://github.com/spumko/hapi/blob/v3.1.0/docs/Reference.md)  

docs/Reference.md

@@ -1,4 +1,4 @@
-# 5.0.x API Reference
+# 5.1.x API Reference
 
 - [`Hapi.Server`](#hapiserver)
     - [`new Server([host], [port], [options])`](#new-serverhost-port-options)
@@ -401,7 +401,8 @@ The following options are available when adding a route:
           Value can be:
             - a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
             - an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
-            - a function with the signature `function(request)` which returns the path string.
+            - a function with the signature `function(request)` which returns the path string or an array of path strings. If the function returns an
+              error, the error is passed back to the client in the response.
         - `index` - optional boolean, determines if 'index.html' will be served if found in the folder when requesting a directory. Defaults to `true`.
         - `listing` - optional boolean, determines if directory listing is generated when a directory is requested without an index document.
           Defaults to `false`.

lib/directory.js

@@ -51,7 +51,20 @@ exports.handler = function (route, options) {
 
         var paths = normalized;
         if (typeof settings.path === 'function') {
-            paths = [normalize(settings.path.call(null, request))];
+            var result = settings.path.call(null, request);
+            if (result instanceof Error) {
+                return reply(result);
+            }
+
+            if (Array.isArray(result)) {
+                paths = result.map(normalize);
+            }
+            else if (typeof result === 'string') {
+                paths = [normalize(result)];
+            }
+            else {
+                return reply(Boom.badImplementation('Invalid path function'));
+            }
         }
 
         // Append parameter

package.json

@@ -2,7 +2,7 @@
   "name": "hapi",
   "description": "HTTP Server framework",
   "homepage": "http://hapijs.com",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/spumko/hapi"

test/directory.js

@@ -3,6 +3,7 @@
 var Fs = require('fs');
 var Path = require('path');
 var Lab = require('lab');
+var Boom = require('boom');
 var Hapi = require('..');
 
 
@@ -84,6 +85,19 @@ describe('Directory', function () {
         });
     });
 
+    it('returns a file when requesting a file from multi directory function response', function (done) {
+
+        var server = new Hapi.Server({ files: { relativeTo: __dirname } });
+        server.route({ method: 'GET', path: '/multiple/{path*}', handler: { directory: { path: function () { return ['./', '../'] }, listing: true } } });
+
+        server.inject('/multiple/package.json', function (res) {
+
+            expect(res.statusCode).to.equal(200);
+            expect(res.payload).to.contain('name": "hapi"');
+            done();
+        });
+    });
+
     it('returns the correct file when requesting a file from a child directory', function (done) {
 
         var server = new Hapi.Server({ files: { relativeTo: __dirname } });
@@ -556,4 +570,39 @@ describe('Directory', function () {
             done();
         });
     });
+
+    it('returns error when path function returns error', function (done) {
+
+        var path = function () {
+
+            return Boom.badRequest('Really?!');
+        };
+
+        var server = new Hapi.Server();
+        server.route({ method: 'GET', path: '/test/{path*}', handler: { directory: { path: path } } });
+
+        server.inject('/test/index.html', function (res) {
+
+            expect(res.statusCode).to.equal(400);
+            expect(res.result.message).to.equal('Really?!');
+            done();
+        });
+    });
+
+    it('returns error when path function returns invalid response', function (done) {
+
+        var path = function () {
+
+            return 5;
+        };
+
+        var server = new Hapi.Server({ debug: false });
+        server.route({ method: 'GET', path: '/test/{path*}', handler: { directory: { path: path } } });
+
+        server.inject('/test/index.html', function (res) {
+
+            expect(res.statusCode).to.equal(500);
+            done();
+        });
+    });
 });