express-hbs 2.4.2 → 3.0.0

package/test/apps/async/index.js

@@ -9,50 +9,50 @@ var url = require('url');
 var pages = [
   {
     id: 1,
-    title: 'Title 1'
+    title: 'Title 1',
   },
   {
     id: 2,
-    title: 'Title 2'
+    title: 'Title 2',
   },
   {
     id: 3,
-    title: 'Title 3'
-  }
-]
+    title: 'Title 3',
+  },
+];
 
 var comments = [
   {
     id: 1,
     page: 1,
     subject: 'Title 1 Comment 1',
-    auther: 'JT'
+    auther: 'JT',
   },
   {
     id: 2,
     page: 1,
     subject: 'Title 1 Comment 2',
-    auther: 'Anna'
+    auther: 'Anna',
   },
   {
     id: 3,
     page: 1,
     subject: 'Title 1 Comment 3',
-    auther: 'Jane'
+    auther: 'Jane',
   },
   {
     id: 4,
     page: 1,
     subject: 'Title 1 Comment 4',
-    auther: 'Bob'
+    auther: 'Bob',
   },
   {
     id: 5,
     page: 4,
     subject: 'This should not show!',
-    auther: 'Jill'
-  }
-]
+    auther: 'Jill',
+  },
+];
 
 function getRandomNumber(min, max) {
   return Math.random() * (max - min) + min;
@@ -64,9 +64,13 @@ function create(hbs, env) {
   var viewsDir = path.join(__dirname, 'views');
 
   // Hook in express-hbs and tell it where known directories reside
-  app.engine('hbs', hbs.express4({
-    defaultLayout: path.join(viewsDir, "layout.hbs")
-  }));
+  app.engine(
+    'hbs',
+    hbs.express4({
+      defaultLayout: path.join(viewsDir, 'layout.hbs'),
+      restrictLayoutsTo: viewsDir,
+    }),
+  );
   app.set('view engine', 'hbs');
   app.set('views', viewsDir);
 
@@ -75,7 +79,7 @@ function create(hbs, env) {
   app.get('/', function (req, res) {
     res.render('index', {
       message: 'Hello,',
-      username: req.cookies.user
+      username: req.cookies.user,
     });
   });
 
@@ -83,42 +87,51 @@ function create(hbs, env) {
     res.render('failer');
   });
 
-  hbs.registerAsyncHelper('user', function(username, resultcb) {
-    setTimeout(function() {
-      resultcb(username);
-    }, getRandomNumber(100, 900))
+  hbs.registerAsyncHelper('user', function (username, resultcb) {
+    setTimeout(
+      function () {
+        resultcb(username);
+      },
+      getRandomNumber(100, 900),
+    );
   });
 
-  hbs.registerAsyncHelper('pages', function(options, resultcb) {
+  hbs.registerAsyncHelper('pages', function (options, resultcb) {
     var self = this;
-    setTimeout(function() {
-      var result = [];
-      for(var i = 0; i < pages.length; i++) {
-        options.data.page = pages[i];
-        result.push(options.fn.call(self, pages[i], options));
-      }
-      resultcb(result.join(''));
-    }, getRandomNumber(100, 900))
+    setTimeout(
+      function () {
+        var result = [];
+        for (var i = 0; i < pages.length; i++) {
+          options.data.page = pages[i];
+          result.push(options.fn.call(self, pages[i], options));
+        }
+        resultcb(result.join(''));
+      },
+      getRandomNumber(100, 900),
+    );
   });
 
-  hbs.registerAsyncHelper('comments', function(options, resultcb) {
+  hbs.registerAsyncHelper('comments', function (options, resultcb) {
     var self = this;
-    setTimeout(function() {
-      var result = [];
-      for(var i = 0; i < comments.length; i++) {
-        if (options.hash.page === comments[i].page) {
-          result.push(options.fn(comments[i]));
+    setTimeout(
+      function () {
+        var result = [];
+        for (var i = 0; i < comments.length; i++) {
+          if (options.hash.page === comments[i].page) {
+            result.push(options.fn(comments[i]));
+          }
         }
-      }
-      resultcb(result.join(''));
-    }, getRandomNumber(100, 300))
+        resultcb(result.join(''));
+      },
+      getRandomNumber(100, 300),
+    );
   });
 
-  hbs.registerAsyncHelper('failer', function(_, resultcb) {
-    setTimeout(function() {
+  hbs.registerAsyncHelper('failer', function (_, resultcb) {
+    setTimeout(function () {
       resultcb(options.fn());
     }, 100);
-  })
+  });
 
   return app;
 }

package/test/apps/i18n/index.js

@@ -7,7 +7,6 @@
  *
  */
 
-
 function create(hbs, env) {
   'use strict';
 
@@ -26,13 +25,17 @@ function create(hbs, env) {
   i18n.configure({
     locales: ['en', 'fr'],
     cookie: 'locale',
-    directory: __dirname + '/locales'
+    directory: __dirname + '/locales',
   });
 
   // Hook in express-hbs and tell it where known directories reside
-  app.engine('hbs', hbs.express3({
-    i18n: i18n
-  }));
+  app.engine(
+    'hbs',
+    hbs.express3({
+      i18n: i18n,
+      restrictLayoutsTo: viewsDir,
+    }),
+  );
   app.set('view engine', 'hbs');
   app.set('views', viewsDir);
 
@@ -44,7 +47,7 @@ function create(hbs, env) {
 
   app.get('/', function (req, res) {
     res.render('index', {
-      array: [1, 2]
+      array: [1, 2],
     });
   });
 

package/test/asyncSpecs.js

@@ -10,7 +10,7 @@ function makeUserRequest(app, user, cb) {
   request(app)
     .get('/')
     .set('Cookie', 'user=' + user)
-    .end(function(err, res) {
+    .end(function (err, res) {
       if (err) cb(err);
       if (res.text.search('Hello, ' + user) <= 0) {
         return cb(new Error('Wrong template send for user ' + user + ': ' + res.text), user);
@@ -21,18 +21,18 @@ function makeUserRequest(app, user, cb) {
 
 function requestAll(app, users, cb) {
   var status = {};
-  for(var i = 0; i < users.length; i++) {
+  for (var i = 0; i < users.length; i++) {
     status[users[i]] = 'Pending';
-    makeUserRequest(app, users[i], function(err, user) {
+    makeUserRequest(app, users[i], function (err, user) {
       if (err) {
         status[user] = 'Error: ' + err.message;
       } else {
-        status[user] = 'Completed'
+        status[user] = 'Completed';
       }
     });
   }
-  var checkTimer = setInterval(function() {
-    for(var i = 0; i < users.length; i++) {
+  var checkTimer = setInterval(function () {
+    for (var i = 0; i < users.length; i++) {
       if (status[users[i]] === 'Pending') {
         return;
       }
@@ -42,10 +42,10 @@ function requestAll(app, users, cb) {
   }, 100);
 }
 
-describe('async', function() {
-  it('should render all async helpers', function(done) {
+describe('async', function () {
+  it('should render all async helpers', function (done) {
     var app = asyncApp.create(hbs.create(), 'production');
-    requestAll(app, ['jt','anna','joe','jeff','jane'], function(results) {
+    requestAll(app, ['jt', 'anna', 'joe', 'jeff', 'jane'], function (results) {
       assert.equal(results.jt, 'Completed');
       assert.equal(results.anna, 'Completed');
       assert.equal(results.joe, 'Completed');
@@ -55,14 +55,14 @@ describe('async', function() {
     });
   });
 
-  it('should render nested async helpers', function(done) {
+  it('should render nested async helpers', function (done) {
     var app = asyncApp.create(hbs.create(), 'production');
-    makeUserRequest(app, 'jt', function(err, user, results) {
+    makeUserRequest(app, 'jt', function (err, user, results) {
       if (err) {
         return done(err);
       }
       assert.equal(false, resolver.hasResolvers(results));
-      assert.equal(-1, results.search('This should not show!'))
+      assert.equal(-1, results.search('This should not show!'));
       done();
     });
   });

package/test/cacheSpecs.js

@@ -4,7 +4,6 @@ var rewire = require('rewire');
 var assert = require('assert');
 var fs = require('fs');
 
-
 /**
  * Creates instance of example app using an injected version of express-hbs to track the number of times a
  * file is read. Additionally, the $NODE_ENV environment variable may be set.
@@ -16,7 +15,7 @@ function createApp(env) {
   var readCounts = {};
   var hbs = rewire('../lib/hbs');
   hbs.__set__('fs', {
-    readFileSync: function(filename, encoding) {
+    readFileSync: function (filename, encoding) {
       if (typeof readCounts[filename] === 'undefined') {
         readCounts[filename] = 1;
       } else {
@@ -26,7 +25,7 @@ function createApp(env) {
       return fs.readFileSync(filename, encoding);
     },
 
-    readFile: function(filename, encoding, cb) {
+    readFile: function (filename, encoding, cb) {
       if (typeof readCounts[filename] === 'undefined') {
         readCounts[filename] = 1;
       } else {
@@ -35,33 +34,31 @@ function createApp(env) {
 
       fs.readFile(filename, encoding, cb);
     },
-    existsSync: function(filename, encoding) {
+    existsSync: function (filename, encoding) {
       return fs.existsSync(filename, encoding);
-    }
+    },
   });
 
   // used mocked hbs in example
   var example = require('../example/app');
   var app = example.create(hbs, env);
-  return {app: app, readCounts: readCounts};
+  return { app: app, readCounts: readCounts };
 }
 
-
-describe('express-hbs', function() {
-  describe('cache', function() {
-
-    it('should not cache layout in `development`', function(done) {
+describe('express-hbs', function () {
+  describe('cache', function () {
+    it('should not cache layout in `development`', function (done) {
       var mock = createApp('development');
 
       request(mock.app)
         .get('/')
-        .end(function(err) {
+        .end(function (err) {
           assert.ifError(err);
 
           request(mock.app)
             .get('/')
             .expect(/DEFAULT LAYOUT/)
-            .end(function(err) {
+            .end(function (err) {
               assert.ifError(err);
 
               var filename = path.resolve(__dirname, '../example/views/layout/default.hbs');
@@ -71,19 +68,19 @@ describe('express-hbs', function() {
         });
     });
 
-    it('should cache layout in `production` reading file once', function(done) {
+    it('should cache layout in `production` reading file once', function (done) {
       var mock = createApp('production');
 
       // reads layout from fs once
       request(mock.app)
         .get('/')
-        .end(function(err) {
+        .end(function (err) {
           assert.ifError(err);
 
           request(mock.app)
             .get('/')
             .expect(/DEFAULT LAYOUT/)
-            .end(function(err, res) {
+            .end(function (err, res) {
               assert.ifError(err);
 
               var filename = path.resolve(__dirname, '../example/views/layout/default.hbs');
@@ -93,18 +90,18 @@ describe('express-hbs', function() {
         });
     });
 
-    it('should not cache partials in `development`', function(done) {
+    it('should not cache partials in `development`', function (done) {
       var mock = createApp('development');
 
       request(mock.app)
         .get('/veggies')
         .expect(/just a comment/)
-        .end(function(err) {
+        .end(function (err) {
           assert.ifError(err);
           request(mock.app)
             .get('/veggies')
             .expect(/just a comment/)
-            .end(function(err) {
+            .end(function (err) {
               assert.ifError(err);
 
               var filename = path.resolve(__dirname, '../example/views/partials/sub/comment.hbs');
@@ -120,12 +117,12 @@ describe('express-hbs', function() {
       request(mock.app)
         .get('/veggies')
         .expect(/just a comment/)
-        .end(function(err) {
+        .end(function (err) {
           assert.ifError(err);
           request(mock.app)
             .get('/veggies')
             .expect(/just a comment/)
-            .end(function(err) {
+            .end(function (err) {
               assert.ifError(err);
 
               var filename = path.resolve(__dirname, '../example/views/partials/sub/comment.hbs');

package/test/customExtension.js

@@ -4,32 +4,32 @@ var hbs = require('..');
 var path = require('path');
 var H = require('./helpers');
 
-
-// MEANJS is using custom extension .server.view.html instead of .hbs 
+// MEANJS is using custom extension .server.view.html instead of .hbs
 // https://github.com/meanjs/mean
-describe('custom extension for partials view', function() {
+describe('custom extension for partials view', function () {
   var dirname = path.join(__dirname, 'views/customExtension');
   var render = hbs.create().express4({
-      extname: '.server.view.html',
-      partialsDir: dirname + '/partialsDir'
+    extname: '.server.view.html',
+    partialsDir: dirname + '/partialsDir',
+    restrictLayoutsTo: dirname,
   });
 
-  it('should allow rendering multiple partials with custom extension', function(done) {
+  it('should allow rendering multiple partials with custom extension', function (done) {
     function check(err, html) {
       assert.ifError(err);
       assert.equal(
-        '<html>' + 
-          '<subpartial>1</subpartial>' + 
-          '<partial>1</partial>' + 
-          '<subpartial>2</subpartial>' + 
-          '<partial>2</partial>' + 
-        '</html>', 
-      H.stripWs(html));
+        '<html>' +
+          '<subpartial>1</subpartial>' +
+          '<partial>1</partial>' +
+          '<subpartial>2</subpartial>' +
+          '<partial>2</partial>' +
+          '</html>',
+        H.stripWs(html),
+      );
       done();
     }
 
-    var options = {cache: true, settings: {views: dirname }};
+    var options = { cache: true, settings: { views: dirname } };
     render(dirname + '/template.server.view.html', options, check);
   });
-
 });

package/test/handlebarsSpecs.js

@@ -2,90 +2,87 @@ var request = require('supertest');
 var assert = require('assert');
 var hbs = require('..');
 
-describe('express-hbs', function() {
-
-  describe('defaults', function() {
+describe('express-hbs', function () {
+  describe('defaults', function () {
     var app;
 
-    beforeEach(function() {
+    beforeEach(function () {
       var example = require('../example/app');
       app = example.create(hbs.create());
     });
 
-
-    it('should render using default layout', function(done) {
+    it('should render using default layout', function (done) {
       request(app)
         .get('/')
         .expect(/DEFAULT LAYOUT/, done);
     });
 
-    it('should render layout declared in markup', function(done) {
+    it('should render layout declared in markup', function (done) {
       request(app)
         .get('/fruits')
         .expect(/DECLARATIVE LAYOUT/, done);
     });
 
-    it('should render nested declarative layouts correctly', function(done) {
+    it('should render nested declarative layouts correctly', function (done) {
       request(app)
         .get('/fruits/apple')
         .expect(/DECLARATIVE LAYOUT/)
         .expect(/NESTED LAYOUT/, done);
     });
 
-    it('should render layout specified as locals', function(done) {
+    it('should render layout specified as locals', function (done) {
       request(app)
         .get('/veggies')
         .expect(/PROGRAMMATIC LAYOUT/, done);
     });
 
-    it('should render nested layouts correctly when first layout is specified as locals', function(done) {
+    it('should render nested layouts correctly when first layout is specified as locals', function (done) {
       request(app)
         .get('/veggies/carrot')
         .expect(/PROGRAMMATIC LAYOUT/)
         .expect(/NESTED LAYOUT/, done);
     });
 
-    it('should render partial', function(done) {
+    it('should render partial', function (done) {
       request(app)
         .get('/veggies')
         .expect(/jquery\.js/)
         .expect(/Other partial/, done);
     });
 
-    it('should render sub partial', function(done) {
+    it('should render sub partial', function (done) {
       request(app)
         .get('/veggies')
         .expect(/just a comment/, done);
     });
 
-    it('should render block', function(done) {
+    it('should render block', function (done) {
       request(app)
         .get('/')
         .expect(/color: blue/, done);
     });
 
-    it('should render block default content', function(done) {
+    it('should render block default content', function (done) {
       request(app)
         .get('/')
         .expect(/Default block content/, done);
     });
 
-    it('should render block content instead of default content when contentFor is declared', function(done) {
+    it('should render block content instead of default content when contentFor is declared', function (done) {
       request(app)
         .get('/replace')
         .expect(/Non-default block content/, done);
     });
 
-    it('should replace {{body}}', function(done) {
+    it('should replace {{body}}', function (done) {
       request(app)
         .get('/')
         .expect(/Vegetables/, done);
     });
-
   });
 
-  describe('instances', function() {
-    it('should create isolated instances', function() {
+  describe('instances', function () {
+    it('should create isolated instances', function () {
       var hbs2 = hbs.create();
       var hbs3 = hbs.create();
 

package/test/helperSpecs.js

@@ -2,53 +2,57 @@ var assert = require('assert');
 var hbs = require('..');
 var H = require('./helpers');
 
-describe('helpers', function() {
-
-  describe('sync', function() {
+describe('helpers', function () {
+  describe('sync', function () {
     var dirname = __dirname + '/views/helpers';
 
     function sync(s, options) {
-      return new hbs.SafeString("-sync-" + s);
+      return new hbs.SafeString('-sync-' + s);
     }
 
-    it ('should register functions', function(done) {
+    it('should register functions', function (done) {
       var hb = hbs.create();
-      hb.registerHelper("sync", sync);
+      hb.registerHelper('sync', sync);
       var render = hb.express3({
-        viewsDir: dirname
+        viewsDir: dirname,
+        restrictLayoutsTo: dirname,
       });
       var locals = H.createLocals('express3', dirname);
 
-      render(dirname + '/home/index.hbs', locals, function(err, html) {
+      render(dirname + '/home/index.hbs', locals, function (err, html) {
         assert.equal('<default>index-sync-index</default>', H.stripWs(html));
         done();
       });
     });
   });
 
-  describe('async', function() {
+  describe('async', function () {
     var dirname = __dirname + '/views/helpers';
-    it ('should register functions', function(done) {
+    it('should register functions', function (done) {
       var hb = hbs.create();
       function async(s, cb) {
-        setTimeout(function() {
-          cb(new hb.SafeString("-async-" + s));
-        }, Math.floor((Math.random()*10)+1));
+        setTimeout(
+          function () {
+            cb(new hb.SafeString('-async-' + s));
+          },
+          Math.floor(Math.random() * 10 + 1),
+        );
       }
-      hb.registerAsyncHelper("async", async);
+      hb.registerAsyncHelper('async', async);
 
       var render = hb.express3({
-        viewsDir: dirname
+        viewsDir: dirname,
+        restrictLayoutsTo: dirname,
       });
       var locals = H.createLocals('express3', dirname);
 
-      render(dirname + '/home/async.hbs', locals, function(err, html) {
-        assert.equal('<default>asynctemplate-async-foo-async-bar-async-bah-async-baz</default>', H.stripWs(html));
+      render(dirname + '/home/async.hbs', locals, function (err, html) {
+        assert.equal(
+          '<default>asynctemplate-async-foo-async-bar-async-bah-async-baz</default>',
+          H.stripWs(html),
+        );
         done();
       });
     });
-
-
   });
-
 });

package/test/helpers.js

@@ -7,7 +7,7 @@ function createLocals(which, viewsDir, locals) {
   var opts = {};
   if (which === 'express3' || which === 'express4') {
     opts.settings = {
-      views: viewsDir
+      views: viewsDir,
     };
     opts.cache = process.env.NODE_ENV === 'production';
     for (var k in locals) {
@@ -20,5 +20,5 @@ function createLocals(which, viewsDir, locals) {
 
 module.exports = {
   createLocals: createLocals,
-  stripWs: stripWs
-};
+  stripWs: stripWs,
+};