Closes hapijs#1208

Author: Eran Hammer

lib/files.js

@@ -14,7 +14,7 @@ var internals = {};
 exports.fileHandler = function (route, options) {
 
     var settings = (typeof options !== 'object' ? { path: options } : Utils.clone(options));                        // options can be reused
-    Utils.assert(typeof settings.path !== 'string' || settings.path[settings.path.length - 1] !== '/', 'File path cannot end with a \'/\'');
+    Utils.assert(typeof settings.path !== 'string' || settings.path[settings.path.length - 1] !== '/', 'File path cannot end with a \'/\':', route.path);
 
     var absolutePath = internals.absolutePath(route);
 
@@ -53,8 +53,8 @@ exports.fileHandler = function (route, options) {
 
 exports.directoryHandler = function (route, options) {
 
-    Utils.assert(route.path[route.path.length - 1] === '}', 'The route path must end with a parameter');
-    Utils.assert(route.params.length >= 1, 'The route path must include at least one parameter');
+    Utils.assert(route.path[route.path.length - 1] === '}', 'The route path must end with a parameter:', route.path);
+    Utils.assert(route.params.length >= 1, 'The route path must include at least one parameter:', route.path);
 
     var settings = Utils.clone(options);                                // options can be reused
     var absolutePath = internals.absolutePath(route);
@@ -82,7 +82,7 @@ exports.directoryHandler = function (route, options) {
     if (Array.isArray(settings.path)) {
         settings.path.forEach(function (path) {
 
-            Utils.assert(path && typeof path === 'string', 'Directory path array must only contain strings');
+            Utils.assert(path && typeof path === 'string', 'Directory path array must only contain strings:', route.path);
             normalized.push(normalize(path));
         });
     }
@@ -127,8 +127,6 @@ exports.directoryHandler = function (route, options) {
 
 internals.absolutePath = function (route) {
 
-    var relativeTo = route.server.settings.files && route.server.settings.files.relativeTo;
-    Utils.assert(relativeTo && (relativeTo[0] === '/' || ['cwd', 'routes'].indexOf(relativeTo) !== -1), 'Invalid server files.relativeTo configuration');
 
     // Plugin
 
@@ -138,6 +136,7 @@ internals.absolutePath = function (route) {
 
     // 'cwd'
 
+    var relativeTo = route.server.settings.files.relativeTo;
     if (relativeTo === 'cwd') {
         return '.';
     }

lib/schema.js

@@ -79,7 +79,10 @@ internals.serverSchema = {
         request: Joi.array()
     }).allow(false),
     files: Joi.object({
-        relativeTo: Joi.string()
+        relativeTo: [
+            Joi.string().valid('cwd', 'routes').required(),
+            Joi.string().regex(/^\//).required()
+        ]
     }).allow(false, true),
     json: Joi.object({
         replacer: [Joi.func().allow(null), Joi.array()],