express-hbs 2.4.2 → 3.0.0

package/test/i18nSpecs.js

@@ -2,31 +2,33 @@ var request = require('supertest');
 var assert = require('assert');
 var hbs = require('..');
 
-describe('i18n', function() {
+describe('i18n', function () {
   var app;
 
-  beforeEach(function() {
+  beforeEach(function () {
     var apper = require('./apps/i18n');
     app = apper.create(hbs.create());
   });
 
-  it('should render en', function(done) {
+  it('should render en', function (done) {
     request(app)
       .get('/')
       .set('Cookie', 'locale=en')
-      .end(function(req, res) {
-        var expected = '<span id="text">text to test</span>\n<br>\n<span class="each">1 cat</span><span class="each">2 cats</span>';
+      .end(function (req, res) {
+        var expected =
+          '<span id="text">text to test</span>\n<br>\n<span class="each">1 cat</span><span class="each">2 cats</span>';
         assert.equal(res.text, expected);
         done();
       });
   });
 
-  it('should render fr', function(done) {
+  it('should render fr', function (done) {
     request(app)
       .get('/')
       .set('Cookie', 'locale=fr')
-      .end(function(req, res) {
-        var expected = '<span id="text">Texte à tester</span>\n<br>\n<span class="chaque">1 chat</span><span class="chaque">2 chats</span>';
+      .end(function (req, res) {
+        var expected =
+          '<span id="text">Texte à tester</span>\n<br>\n<span class="chaque">1 chat</span><span class="chaque">2 chats</span>';
         assert.equal(res.text, expected);
         done();
       });

package/test/issues.js

@@ -4,19 +4,20 @@ var hbs = require('..');
 var path = require('path');
 var H = require('./helpers');
 
-
-describe('issue-22 template', function() {
+describe('issue-22 template', function () {
   var dirname = path.join(__dirname, 'issues/22');
 
-  it('should use multiple layouts with caching', function(done) {
-    var render = hbs.create().express3({});
+  it('should use multiple layouts with caching', function (done) {
+    var render = hbs.create().express3({
+      restrictLayoutsTo: dirname,
+    });
     var locals1 = H.createLocals('express3', dirname, { layout: 'layout1', cache: true });
     var locals2 = H.createLocals('express3', dirname, { layout: 'layout2', cache: true });
 
-    render(dirname + '/template.hbs', locals1, function(err, html) {
+    render(dirname + '/template.hbs', locals1, function (err, html) {
       assert.ifError(err);
       assert.equal('<layout1>template</layout1>', H.stripWs(html));
-      render(dirname + '/template.hbs', locals2, function(err, html) {
+      render(dirname + '/template.hbs', locals2, function (err, html) {
         assert.ifError(err);
         assert.equal('<layout2>template</layout2>', H.stripWs(html));
         done();
@@ -25,12 +26,13 @@ describe('issue-22 template', function() {
   });
 });
 
-describe('issue-23', function() {
-  var dirname =  path.join(__dirname, 'issues/23');
+describe('issue-23', function () {
+  var dirname = path.join(__dirname, 'issues/23');
 
-  it('should not pass an empty or missing partial to handlebars', function(done) {
+  it('should not pass an empty or missing partial to handlebars', function (done) {
     var render = hbs.create().express3({
-      partialsDir: [dirname + '/partials']
+      partialsDir: [dirname + '/partials'],
+      restrictLayoutsTo: dirname,
     });
 
     function check(err, html) {
@@ -38,12 +40,17 @@ describe('issue-23', function() {
       assert.equal('<html>Hello</html>', H.stripWs(html));
       done();
     }
-    var result = render(dirname + '/index.hbs', {cache: true, settings: {views: dirname + '/views'}}, check);
+    var result = render(
+      dirname + '/index.hbs',
+      { cache: true, settings: { views: dirname + '/views' } },
+      check,
+    );
   });
 
-  it('should handle empty string', function(done) {
+  it('should handle empty string', function (done) {
     var render = hbs.create().express3({
-      partialsDir: [dirname + '/partials']
+      partialsDir: [dirname + '/partials'],
+      restrictLayoutsTo: dirname,
     });
 
     function check(err, html) {
@@ -51,14 +58,18 @@ describe('issue-23', function() {
       assert.equal('', H.stripWs(html));
       done();
     }
-    var result = render(dirname + '/empty.hbs', {cache: true, settings: {views: dirname + '/views'}}, check);
+    var result = render(
+      dirname + '/empty.hbs',
+      { cache: true, settings: { views: dirname + '/views' } },
+      check,
+    );
   });
 
-
-  it('should register empty partial', function(done) {
+  it('should register empty partial', function (done) {
     var hb = hbs.create();
     var render = hb.express3({
-      partialsDir: [dirname + '/partials']
+      partialsDir: [dirname + '/partials'],
+      restrictLayoutsTo: dirname,
     });
     hb.handlebars.registerPartial('emptyPartial', '');
 
@@ -74,15 +85,20 @@ describe('issue-23', function() {
       }
     }
     function doIt() {
-      render(dirname + '/emptyPartial.hbs', {cache: true, settings: {views: dirname + '/views'}}, check);
+      render(
+        dirname + '/emptyPartial.hbs',
+        { cache: true, settings: { views: dirname + '/views' } },
+        check,
+      );
     }
     doIt();
   });
 
-  it('should register partial that results in empty string (comment)', function(done) {
+  it('should register partial that results in empty string (comment)', function (done) {
     var hb = hbs.create();
     var render = hb.express3({
-      partialsDir: [dirname + '/partials']
+      partialsDir: [dirname + '/partials'],
+      restrictLayoutsTo: dirname,
     });
     // this fails
     //hb.handlebars.registerPartial('emptyComment', '{{! just a comment}}');
@@ -100,65 +116,76 @@ describe('issue-23', function() {
       }
     }
     function doIt() {
-      render(dirname + '/emptyComment.hbs', {cache: true, settings: {views: dirname + '/views'}}, check);
+      render(
+        dirname + '/emptyComment.hbs',
+        { cache: true, settings: { views: dirname + '/views' } },
+        check,
+      );
     }
     doIt();
   });
 });
 
-
-describe('issue-21', function() {
-  var dirname =  path.join(__dirname, 'issues/21');
+describe('issue-21', function () {
+  var dirname = path.join(__dirname, 'issues/21');
   var render = hbs.create().express3({
-    layoutsDir: dirname + '/views/layouts'
+    layoutsDir: dirname + '/views/layouts',
+    restrictLayoutsTo: dirname,
   });
 
-  it('should allow specifying layouts without the parent dir', function(done) {
+  it('should allow specifying layouts without the parent dir', function (done) {
     function check(err, html) {
       assert.ifError(err);
       assert.equal('<html>index</html>', H.stripWs(html));
       done();
     }
 
-    var options = {cache: true, layout: 'default', settings: {views: dirname + '/views'}};
+    var options = { cache: true, layout: 'default', settings: { views: dirname + '/views' } };
     var result = render(dirname + '/views/index.hbs', options, check);
   });
 
+  it('should allow specifying layouts without the parent dir in a sub view', function (done) {
+    function check(err, html) {
+      assert.ifError(err);
+      assert.equal('<html>sub</html>', H.stripWs(html));
+      done();
+    }
 
-  it('should allow specifying layouts without the parent dir in a sub view', function(done) { function check(err, html) {
-    assert.ifError(err);
-    assert.equal('<html>sub</html>', H.stripWs(html));
-    done();
-  }
-
-  var options = {cache: true, layout: 'default', settings: {views: dirname + '/views'}};
-  var result = render(dirname + '/views/sub/sub.hbs', options, check);
+    var options = { cache: true, layout: 'default', settings: { views: dirname + '/views' } };
+    var result = render(dirname + '/views/sub/sub.hbs', options, check);
   });
 
-  it('should treat layouts that start with "." relative to template', function(done) { function check(err, html) {
-    assert.ifError(err);
-    assert.equal('<relative>sub</relative>', H.stripWs(html));
-    done();
-  }
+  it('should treat layouts that start with "." relative to template', function (done) {
+    function check(err, html) {
+      assert.ifError(err);
+      assert.equal('<relative>sub</relative>', H.stripWs(html));
+      done();
+    }
 
-  var options = {cache: true, layout: './relativeLayout', settings: {views: dirname + '/views'}};
-  var result = render(dirname + '/views/sub/sub.hbs', options, check);
+    var options = {
+      cache: true,
+      layout: './relativeLayout',
+      settings: { views: dirname + '/views' },
+    };
+    var result = render(dirname + '/views/sub/sub.hbs', options, check);
   });
 
-  it('should allow layouts in subfolders', function(done) {
+  it('should allow layouts in subfolders', function (done) {
     function check(err, html) {
       assert.ifError(err);
       assert.equal('<sub>useLayoutInDir</sub>', H.stripWs(html));
       done();
     }
 
-    var options = {cache: true, layout: 'sub/child', settings: {views: dirname + '/views'}};
+    var options = { cache: true, layout: 'sub/child', settings: { views: dirname + '/views' } };
     var result = render(dirname + '/views/useLayoutInDir.hbs', options, check);
   });
 
-  it('should treat layouts relative to views directory if layoutsDir is not passed', function(done) {
-    var dirname =  path.join(__dirname, 'issues/21');
-    var render = hbs.create().express3();
+  it('should treat layouts relative to views directory if layoutsDir is not passed', function (done) {
+    var dirname = path.join(__dirname, 'issues/21');
+    var render = hbs.create().express3({
+      restrictLayoutsTo: dirname,
+    });
 
     function check(err, html) {
       assert.ifError(err);
@@ -166,74 +193,85 @@ describe('issue-21', function() {
       done();
     }
 
-    var options = {cache: true, layout: 'layouts/sub/child', settings: {views: dirname + '/views'}};
+    var options = {
+      cache: true,
+      layout: 'layouts/sub/child',
+      settings: { views: dirname + '/views' },
+    };
     var result = render(dirname + '/views/sub/sub.hbs', options, check);
   });
 });
 
+describe('issue-49', function () {
+  var dirname = path.join(__dirname, 'issues/49');
 
-describe('issue-49', function() {
-  var dirname =  path.join(__dirname, 'issues/49');
-
-  it('should report filename with error', function(done) {
-    var hb = hbs.create()
-    var render = hb.express3({});
+  it('should report filename with error', function (done) {
+    var hb = hbs.create();
+    var render = hb.express3({
+      restrictLayoutsTo: dirname,
+    });
     var locals = H.createLocals('express3', dirname, {});
-    render(dirname + '/error.hbs', locals, function(err, html) {
+    render(dirname + '/error.hbs', locals, function (err, html) {
       assert(err.stack.indexOf('[error.hbs]') > 0);
       done();
     });
   });
 
-  it('should report relative filename with error', function(done) {
-    var hb = hbs.create()
-    var render = hb.express3({});
+  it('should report relative filename with error', function (done) {
+    var hb = hbs.create();
+    var render = hb.express3({
+      restrictLayoutsTo: dirname,
+    });
     var locals = H.createLocals('express3', dirname, {});
-    render(dirname + '/front/error.hbs', locals, function(err, html) {
+    render(dirname + '/front/error.hbs', locals, function (err, html) {
       assert(err.stack.indexOf('[front/error.hbs]') > 0);
       done();
     });
   });
 
-  it('should report filename with partial error', function(done) {
-    var hb = hbs.create()
+  it('should report filename with partial error', function (done) {
+    var hb = hbs.create();
     var render = hb.express3({
-      partialsDir: dirname + '/partials'
+      partialsDir: dirname + '/partials',
+      restrictLayoutsTo: dirname,
     });
     var locals = H.createLocals('express3', dirname, {});
-    render(dirname + '/partial.hbs', locals, function(err, html) {
+    render(dirname + '/partial.hbs', locals, function (err, html) {
       assert(err.stack.indexOf('[partial.hbs]') > 0);
       done();
     });
   });
 
-  it('should report filename with layout error', function(done) {
-    var hb = hbs.create()
+  it('should report filename with layout error', function (done) {
+    var hb = hbs.create();
     var render = hb.express3({
-      partialsDir: dirname + '/partials'
+      partialsDir: dirname + '/partials',
+      restrictLayoutsTo: dirname,
     });
     var locals = H.createLocals('express3', dirname, {});
-    render(dirname + '/index.hbs', locals, function(err, html) {
+    render(dirname + '/index.hbs', locals, function (err, html) {
       assert(err.stack.indexOf('[layouts/default.hbs]') > 0);
       done();
     });
   });
 });
 
-describe('issue-53', function() {
-  var dirname =  path.join(__dirname, 'issues/53');
+describe('issue-53', function () {
+  var dirname = path.join(__dirname, 'issues/53');
 
-  it('should use block with async helpers', function(done) {
-    var hb = hbs.create()
+  it('should use block with async helpers', function (done) {
+    var hb = hbs.create();
     var res = 0;
-    hb.registerAsyncHelper('weird', function(_, resultcb) {
-      setTimeout(function() {
+    hb.registerAsyncHelper('weird', function (_, resultcb) {
+      setTimeout(function () {
         resultcb(++res);
-      }, 1)
+      }, 1);
+    });
+    var render = hb.express3({
+      restrictLayoutsTo: dirname,
     });
-    var render = hb.express3({});
     var locals = H.createLocals('express3', dirname, {});
-    render(dirname + '/index.hbs', locals, function(err, html) {
+    render(dirname + '/index.hbs', locals, function (err, html) {
       assert.ifError(err);
       assert.ok(html.indexOf('__aSyNcId_') < 0);
       done();
@@ -241,7 +279,7 @@ describe('issue-53', function() {
   });
 });
 
-describe('issue-59', function() {
+describe('issue-59', function () {
   var dirname = __dirname + '/issues/59';
   it('should escape or not', function (done) {
     var hb = hbs.create();
@@ -250,10 +288,11 @@ describe('issue-59', function() {
       cb('<strong>' + s + '</strong>');
     }
 
-    hb.registerAsyncHelper("async", async);
+    hb.registerAsyncHelper('async', async);
 
     var render = hb.express3({
-      viewsDir: dirname
+      viewsDir: dirname,
+      restrictLayoutsTo: dirname,
     });
     var locals = H.createLocals('express3', dirname);
 
@@ -272,7 +311,8 @@ describe('issue-59', function() {
     hb.registerAsyncHelper('async', async);
 
     var render = hb.express3({
-      viewsDir: dirname
+      viewsDir: dirname,
+      restrictLayoutsTo: dirname,
     });
     var locals = H.createLocals('express3', dirname);
 
@@ -283,20 +323,21 @@ describe('issue-59', function() {
   });
 });
 
-describe('issue-73', function() {
+describe('issue-73', function () {
   var dirname = path.join(__dirname, 'issues/73');
-  it('should allow compile options', function(done){
+  it('should allow compile options', function (done) {
     var hb = hbs.create();
     var render = hb.express3({
       viewsDir: dirname,
       partialsDir: dirname + '/partials',
-      onCompile: function(eh, source, filename) {
+      restrictLayoutsTo: dirname,
+      onCompile: function (eh, source, filename) {
         var options;
         if (filename && filename.indexOf('partials')) {
-          options = {preventIndent: true};
+          options = { preventIndent: true };
         }
         return eh.handlebars.compile(source, options);
-      }
+      },
     });
 
     var locals = H.createLocals('express3', dirname);
@@ -311,8 +352,7 @@ describe('issue-73', function() {
   });
 });
 
-
-describe('issue-62', function() {
+describe('issue-62', function () {
   var dirname = path.join(__dirname, 'issues/62');
 
   it('should provide options for async helpers', function (done) {
@@ -326,18 +366,16 @@ describe('issue-62', function() {
       }
     }
 
-    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 + '/basic.hbs', locals, function (err, html) {
-      assert.equal(
-        H.stripWs(html),
-        '&lt;strong&gt;foo&lt;/strong&gt;&lt;em&gt;foo&lt;/em&gt;'
-      );
+      assert.equal(H.stripWs(html), '&lt;strong&gt;foo&lt;/strong&gt;&lt;em&gt;foo&lt;/em&gt;');
       done();
     });
   });
@@ -356,31 +394,30 @@ describe('issue-62', function() {
       }
     }
 
-    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 + '/block.hbs', locals, function (err, html) {
-      assert.equal(
-        H.stripWs(html),
-        '<p>GoodbyeWorld</p><p>HelloHandlebars</p>'
-      );
+      assert.equal(H.stripWs(html), '<p>GoodbyeWorld</p><p>HelloHandlebars</p>');
       done();
     });
   });
 });
 
-describe('issue-76', function() {
-  var dirname =  path.join(__dirname, 'issues/76');
+describe('issue-76', function () {
+  var dirname = path.join(__dirname, 'issues/76');
 
   it('should allow cachePartials to be called independently of render', function (done) {
     var hb = hbs.create();
 
     var render = hb.express3({
-      partialsDir: dirname
+      partialsDir: dirname,
+      restrictLayoutsTo: dirname,
     });
 
     hb.cachePartials(function (err) {
@@ -392,11 +429,12 @@ describe('issue-76', function() {
 });
 
 describe('issue-84', function () {
-  var dirname =  path.join(__dirname, 'issues/84');
+  var dirname = path.join(__dirname, 'issues/84');
 
   it('should render deeply nested partials', function (done) {
     var render = hbs.create().express3({
-      partialsDir: [dirname + '/partials']
+      partialsDir: [dirname + '/partials'],
+      restrictLayoutsTo: dirname,
     });
 
     function check(err, html) {
@@ -407,42 +445,46 @@ describe('issue-84', function () {
       done();
     }
 
-    render(dirname + '/index.hbs', {cache: true, settings: {views: dirname + '/views'}}, check);
+    render(dirname + '/index.hbs', { cache: true, settings: { views: dirname + '/views' } }, check);
   });
 });
 
-describe('issue-144', function() {
-  var dirname =  path.join(__dirname, 'issues/144');
+describe('issue-144', function () {
+  var dirname = path.join(__dirname, 'issues/144');
 
-  it('should repalce with async helpers even special string like $\'', function(done) {
-    var hb = hbs.create()
-    hb.registerAsyncHelper('special_string', function(_, resultcb) {
-      setTimeout(function() {
-        resultcb(new hbs.SafeString('<p><code>\'$example$\'</code> abcd</p>'));
-      }, 1)
+  it("should repalce with async helpers even special string like $'", function (done) {
+    var hb = hbs.create();
+    hb.registerAsyncHelper('special_string', function (_, resultcb) {
+      setTimeout(function () {
+        resultcb(new hbs.SafeString("<p><code>'$example$'</code> abcd</p>"));
+      }, 1);
+    });
+    var render = hb.express3({
+      restrictLayoutsTo: dirname,
     });
-    var render = hb.express3({});
     var locals = H.createLocals('express3', dirname, {});
-    render(dirname + '/index.hbs', locals, function(err, html) {
-      assert.equal('<div><p><code>\'$example$\'</code> abcd</p></div>\n', html);
+    render(dirname + '/index.hbs', locals, function (err, html) {
+      assert.equal("<div><p><code>'$example$'</code> abcd</p></div>\n", html);
       done();
     });
   });
 });
 
-describe('issue-153', function() {
+describe('issue-153', function () {
   var dirname = path.join(__dirname, 'issues/153');
-  it('should concat contentFor blocks with newline', function(done) {
+  it('should concat contentFor blocks with newline', function (done) {
     var check = function (err, html) {
       if (err) {
         done(err);
       }
       assert.equal('1\n2', html.trim());
       done();
-    }
-    var hb = hbs.create()
-    var render = hb.express3({});
-    var locals = H.createLocals('express3', dirname, { });
+    };
+    var hb = hbs.create();
+    var render = hb.express3({
+      restrictLayoutsTo: dirname,
+    });
+    var locals = H.createLocals('express3', dirname, {});
     render(dirname + '/index.hbs', locals, check);
   });
 });