Better context injection

config/manifest.js

@@ -57,19 +57,24 @@ internals.manifest = {
             plugin: 'vision'
         },
 
-        // Views loader 
+        // views and default context
         {
             plugin: {
-                register: 'visionary',
+                register: './lib/views',
                 options: {
-                    engines: {
-                        hbs: 'handlebars'
+                    views:{
+                        engines: {
+                            hbs: 'handlebars'
+                        },
+                        path: './app/templates',
+                        layoutPath: './app/templates/layouts',
+                        helpersPath: './app/templates/helpers',
+                        partialsPath: './app/templates/partials',
+                        layout: 'default'
                     },
-                    path: './app/templates',
-                    layoutPath: './app/templates/layouts',
-                    helpersPath: './app/templates/helpers',
-                    partialsPath: './app/templates/partials',
-                    layout: 'default'
+                    misc: {
+                        meta: Meta.get('/'),
+                    }
                 }
             }
         },
@@ -82,13 +87,6 @@ internals.manifest = {
             }
         },
 
-        // Flash Plugin
-        {
-            plugin: {
-                register: './lib/flash'
-            }
-        },
-
         // Hapi cookie jar
         {
             plugin: {
@@ -105,16 +103,6 @@ internals.manifest = {
             }
         },
 
-        //  App context decorator
-        {
-            plugin: {
-                register: './lib/context',
-                options: {
-                    meta: Meta.get('/')
-                }
-            }
-        },
-
         //  Core routes
         {
             plugin: './app/routes/core.js'

lib/auth.js

@@ -22,5 +22,5 @@ exports.register = function(server, options, next) {
 
 exports.register.attributes = {
     name: 'auth',
-    dependencies: ['context', 'hapi-auth-cookie', 'mongoose']
+    dependencies: ['views', 'hapi-auth-cookie', 'mongoose']
 };

lib/views.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const Hoek = require('hoek');
+const internals = {};
+
+internals.prepare = function(config) {
+
+    const engines = config.engines;
+    Object.keys(engines).forEach((engine) => {
+        if ( typeof engines[engine] === 'string' ) {
+            engines[engine] = require(engines[engine]);
+        }
+    });
+    return config;
+};
+
+exports.register = function(plugin, options, next) {
+
+    const ext = {
+        context: function(request) {
+
+            const ctx = {
+                devEnv: (process.env.NODE_ENV === 'development'),
+                meta: options.misc.meta,
+                credentials: request.auth.isAuthenticated?request.auth.credentials:null
+            };
+
+            if ( request.yar && request.yar.flash ) {
+                ctx.flash = request.yar.flash();
+            }
+
+            return ctx;
+        }
+    };
+
+    let viewOpts = options.views;
+    viewOpts = Hoek.merge(viewOpts, ext);
+    viewOpts = internals.prepare(viewOpts);
+    plugin.root.views(viewOpts);
+    return next();
+};
+
+exports.register.attributes = {
+    name: 'views',
+    version: require('../package.json').version,
+    depedencies: ['vision']
+};

server.js

@@ -6,7 +6,12 @@ const Hoek = require('hoek');
 Composer(function(err, server) {
 
     Hoek.assert(!err, err);
-    server.start(function() {
+    server.start(function(err) {
+
+        if ( err ) {
+            throw err;
+        }
+
         console.log('Server started @ ' + server.info.uri);
     });