Merge pull request hapijs#1856 from jas/handler-view-runtime-options

Allow view options override on handler object

docs/Reference.md

@@ -467,6 +467,7 @@ The following options are available when adding a route:
                 - `params` - maps to `request.params`.
                 - `query` - maps to `request.query`.
                 - `pre` - maps to `request.pre`.
+            - `options` - optional object used to override the server's [`views`](#server.config.views) configuration.
 
 - `config` - additional route configuration (the `config` options allows splitting the route information from its implementation):
     - `handler` - an alternative location for the route handler function. Same as the `handler` option in the parent level. Can only

lib/schema.js

@@ -345,7 +345,8 @@ internals['view handler'] = Joi.alternatives([
     Joi.string(),
     Joi.object({
         template: Joi.string(),
-        context: Joi.object()
+        context: Joi.object(),
+        options: Joi.object()
     })
 ]);
 

lib/views.js

@@ -364,7 +364,8 @@ exports.handler = function (route, options) {
 
     var settings = {                                // Shallow copy to allow making dynamic changes to context
         template: options.template,
-        context: options.context
+        context: options.context,
+        options: options.options
     };
 
     return function (request, reply) {
@@ -379,7 +380,7 @@ exports.handler = function (route, options) {
             };
         }
 
-        reply.view(settings.template, context);
+        reply.view(settings.template, context, settings.options);
     };
 };
 

test/templates/valid/options.html

@@ -0,0 +1 @@
+hello

test/views.js

@@ -495,6 +495,26 @@ describe('Views', function () {
             });
         });
 
+        it('handles custom options', function (done) {
+
+            var options = {
+                views: {
+                    engines: { html: require('handlebars') },
+                    path: __dirname + '/templates',
+                    layoutPath: __dirname + '/templates/layout'
+                }
+            };
+
+            var server = new Hapi.Server(options);
+
+            server.route({ method: 'GET', path: '/', handler: { view: { template: 'valid/options', options: { layout: 'elsewhere' } } } });
+            server.inject('/', function (res) {
+
+                expect(res.result).to.contain('+hello');
+                done();
+            });
+        });
+
         it('includes prerequisites in the default view context', function (done) {
 
             var pre = function (request, reply) {