express-hbs 2.5.0 → 4.0.0

package/test/layoutSpecs.js

@@ -1,118 +0,0 @@
-var request = require('supertest');
-var assert = require('assert');
-var path = require('path');
-var hbs = require('..');
-
-
-function stripWs(s) {
-  return s.replace(/\s+/g, '');
-}
-
-function createLocals(which, viewsDir, locals) {
-  if (!locals) locals = {};
-  var opts = {};
-  if (which === 'express3') {
-    opts.settings = {
-      views: viewsDir
-    };
-    opts.cache = process.env.NODE_ENV === 'production';
-    opts.settings.views = viewsDir;
-    for (var k in locals) {
-      if (!locals.hasOwnProperty(k)) continue;
-      opts[k] = locals[k];
-    }
-  }
-  return opts;
-}
-
-describe('layouts', function() {
-  var app;
-
-  beforeEach(function() {
-    var example = require('../example/app');
-    app = example.create(hbs.create());
-  });
-
-
-  describe('layoutsDir', function() {
-    var app;
-
-    beforeEach(function() {
-      app = require('../example/app-layoutsDir');
-    });
-
-    it('should render layout declared in markup', function(done) {
-      request(app)
-        .get('/fruits')
-        .expect(/DECLARATIVE LAYOUT/, done);
-    });
-
-    it('should allow specifying layout in locals without dir', function(done) {
-      request(app)
-        .get('/veggies')
-        .expect(/PROGRAMMATIC LAYOUT/, done);
-    });
-
-    it('should still allow specifying layout in locals with dir', function(done) {
-      request(app)
-        .get('/veggies/explicit-dir')
-        .expect(/PROGRAMMATIC LAYOUT/, done);
-    });
-  });
-
-
-  describe('options.layout', function() {
-    var dirname = __dirname + '/views/disableLayoutDirective';
-
-    it ('should process template-specified layout without option', function(done) {
-      var render = hbs.create().express3({
-        restrictLayoutsTo: dirname
-      });
-      var locals = createLocals('express3', dirname);
-
-      render(dirname + '/index.hbs', locals, function(err, html) {
-        assert.equal('<dld>dld</dld>', stripWs(html));
-        done();
-      });
-    });
-
-    it ('should allow options.layout to be specified', function(done) {
-      var render = hbs.create().express3({
-        restrictLayoutsTo: dirname
-      });
-      var locals = createLocals('express3', dirname, { layout: 'layouts/default' });
-
-      render(dirname + '/aside.hbs', locals, function(err, html) {
-        assert.equal('<dld>aside</dld>', stripWs(html));
-        done();
-      });
-    });
-
-    it('should error when using a layout outside of the restrictLayoutsTo', function(done) {
-      var render = hbs.create().express3({
-        restrictLayoutsTo: path.resolve(path.join(__dirname, '../'))
-      });
-      var locals = createLocals('express3', dirname, {layout: '/Users/egg/Code/Ghost/ghost/core/package.json'});
-
-      render(dirname + '/aside.hbs', locals, function (err, html) {
-        if (!err) {
-          return done(new Error('We expect an error when reading'));
-        }
-        return done();
-      });
-    });
-
-    it ('should not process template-specified layout when options.layout is falsy', function(done) {
-      var render = hbs.create().express3({
-        restrictLayoutsTo: dirname
-      });
-      var locals = createLocals('express3', dirname, { layout: false });
-
-      render(dirname + '/index.hbs', locals, function(err, html) {
-        assert.equal('dld', stripWs(html));
-        done();
-      });
-    });
-  });
-
-});

package/test/localTemplateOptions/data-access-template.hbs

@@ -1 +0,0 @@
-{{_templateOptions.data.greeting}} {{_templateOptions.data.firstName}} {{_templateOptions.data.lastName}}

package/test/localTemplateOptions/template.hbs

@@ -1 +0,0 @@
-{{@greeting}} {{@firstName}} {{@lastName}}

package/test/localTemplateOptions.js

@@ -1,127 +0,0 @@
-'use strict';
-var assert = require('assert');
-var path = require('path');
-var hbs = require('..');
-var H = require('./helpers');
-
-describe('local template options', function () {
-  var dirname = path.join(__dirname, 'localTemplateOptions');
-
-  describe('express3', function () {
-
-    it('merges res.locals._templateOptions with the self._templateOptions', function (done) {
-      var instance = hbs.create();
-      var render = instance.express3({
-        restrictLayoutsTo: dirname
-      });
-      instance.updateTemplateOptions({
-          data: {
-            greeting: 'Hello,',
-            firstName: 'Freddy',
-            lastName: 'Krueger'
-          } 
-      });
-
-      var locals = H.createLocals('express3', dirname, {
-        _templateOptions: {
-          data: {
-            lastName: 'Mercury'
-          } 
-        } 
-      });
-
-      render(path.join(dirname, 'template.hbs'), locals, function (err, html) {
-        assert.ifError(err);
-        assert.strictEqual(H.stripWs(html), H.stripWs('Hello, Freddy Mercury')); 
-        done(err);
-      });
-    });
-
-    it('removes _templateOptions from the locals data', function (done) {
-      var instance = hbs.create();
-      var render = instance.express3({
-        restrictLayoutsTo: dirname
-      });
-      instance.updateTemplateOptions({
-          data: {
-            greeting: 'Hello,',
-            firstName: 'Freddy',
-            lastName: 'Krueger'
-          } 
-      });
-
-      var locals = H.createLocals('express3', dirname, {
-        _templateOptions: {
-          data: {
-            lastName: 'Mercury'
-          } 
-        } 
-      });
-
-      render(path.join(dirname, 'data-access-template.hbs'), locals, function (err, html) {
-        assert.ifError(err);
-        assert.strictEqual(H.stripWs(html), H.stripWs('')); 
-        done(err);
-      });
-    });
-  });
-
-  describe('express4', function () {
-
-    it('merges res.locals._templateOptions with the self._templateOptions', function (done) {
-      var instance = hbs.create();
-      var render = instance.express4({
-        restrictLayoutsTo: dirname
-      });
-      instance.updateTemplateOptions({
-          data: {
-            greeting: 'Hello,',
-            firstName: 'Freddy',
-            lastName: 'Krueger'
-          } 
-      });
-
-      var locals = H.createLocals('express4', dirname, {
-        _templateOptions: {
-          data: {
-            lastName: 'Mercury'
-          } 
-        } 
-      });
-
-      render(path.join(dirname, 'template.hbs'), locals, function (err, html) {
-        assert.ifError(err);
-        assert.strictEqual(H.stripWs(html), H.stripWs('Hello, Freddy Mercury')); 
-        done(err);
-      });
-    });
-
-    it('removes _templateOptions from the locals data', function (done) {
-      var instance = hbs.create();
-      var render = instance.express3({
-        restrictLayoutsTo: dirname
-      });
-      instance.updateTemplateOptions({
-          data: {
-            greeting: 'Hello,',
-            firstName: 'Freddy',
-            lastName: 'Krueger'
-          } 
-      });
-
-      var locals = H.createLocals('express3', dirname, {
-        _templateOptions: {
-          data: {
-            lastName: 'Mercury'
-          } 
-        } 
-      });
-
-      render(path.join(dirname, 'data-access-template.hbs'), locals, function (err, html) {
-        assert.ifError(err);
-        assert.strictEqual(H.stripWs(html), H.stripWs('')); 
-        done(err);
-      });
-    });
-  });
-});

package/test/multiple.js

@@ -1,119 +0,0 @@
-'use strict';
-
-var request = require('supertest');
-var assert = require('assert');
-var express = require('express');
-var hbs = require('..');
-
-describe('multiple directories', function() {
-  var app;
-
-  beforeEach(function() {
-    app = express();
-    app.engine('hbs', hbs.express3({
-      restrictLayoutsTo: './test/views/multiple'
-    }));
-    app.set('view engine', 'hbs');
-    app.get('/test1', function (req, res) {
-      res.render('test1');
-    });
-    app.get('/test2', function (req, res) {
-      res.render('test2');
-    });
-    app.get('/collide', function (req, res) {
-      res.render('collide');
-    });
-    app.get('/error', function (req, res) {
-      res.render('error');
-    });
-  });
-
-  it('should handle single folder', function(done) {
-    app.set('views', './test/views/multiple/views1');
-    request(app)
-      .get('/test1')
-      .end(function (err, res) {
-        assert.ifError(err);
-        var expected = '<h1>test1</h1>\n';
-        assert.equal(res.text, expected);
-        done();
-      });
-  });
-
-  it('should handle multiple folders', function(done) {
-    app.set('views', ['./test/views/multiple/views1', './test/views/multiple/views2']);
-    request(app)
-      .get('/test2')
-      .end(function (err, res) {
-        assert.ifError(err);
-        var expected = '<h1>test2</h1>\n';
-        assert.equal(res.text, expected);
-        done();
-      });
-  });
-
-  describe('should handle multiple folders in specific order', function() {
-
-    it('views1, views2', function(done) {
-      app.set('views', ['./test/views/multiple/views1', './test/views/multiple/views2']);
-      request(app)
-        .get('/collide')
-        .end(function (err, res) {
-          assert.ifError(err);
-          var expected = '<h1>collide1</h1>\n';
-          assert.equal(res.text, expected);
-          done();
-        });
-    });
-
-    it('views2, views1', function(done) {
-      app.set('views', ['./test/views/multiple/views2', './test/views/multiple/views1']);
-      request(app)
-        .get('/collide')
-        .end(function (err, res) {
-          assert.ifError(err);
-          var expected = '<h1>collide2</h1>\n';
-          assert.equal(res.text, expected);
-          done();
-        });
-    });
-
-  });
-
-  /* eslint-disable no-unused-vars */
-  describe('should report the filename in error', function() {
-
-    it('should report from first folder', function(done) {
-      app.set('views', ['./test/views/multiple/views1', './test/views/multiple/views2']);
-      app.use(function(err, req, res, next) {
-        res.status(500).send(err.stack);
-      });
-
-      request(app)
-      .get('/error')
-      .end(function(err, res) {
-        assert.ifError(err);
-        assert(res.error.text.indexOf('views1/error.hbs]') > 0);
-        done();
-      });
-    });
-
-
-    it('should report from second folder', function(done) {
-      app.set('views', ['./test/views/multiple/views2', './test/views/multiple/views1']);
-      app.use(function(err, req, res, next) {
-        res.status(500).send(err.stack);
-      });
-
-      request(app)
-      .get('/error')
-      .end(function(err, res) {
-        assert.ifError(err);
-        assert(res.error.text.indexOf('views2/error.hbs]') > 0);
-        done();
-      });
-    });
-  });
-  /* eslint-enable no-unused-vars */
-
-});

package/test/nonExpress.js

@@ -1,37 +0,0 @@
-var assert = require('assert');
-var hbs = require('..');
-var H = require('./helpers');
-
-describe('non-express', function() {
-
-  describe('viewsDir', function() {
-    var dirname = __dirname + '/views/viewsDir';
-
-    it ('should use viewsDir options', function(done) {
-      var render = hbs.create().express3({
-        viewsDir: dirname,
-        restrictLayoutsTo: dirname
-      });
-      var locals = H.createLocals('express3', dirname);
-
-      render(dirname + '/sub/directive.hbs', locals, function(err, html) {
-        assert.equal('<vd>directive</vd>', H.stripWs(html));
-        done();
-      });
-    });
-
-    it ('should work with layoutsDir', function(done) {
-      var render = hbs.create().express3({
-        viewsDir: dirname,
-        layoutsDir: dirname + '/layouts',
-        restrictLayoutsTo: dirname
-      });
-      var locals = H.createLocals('express3', dirname, {layout: 'default.hbs'});
-
-      render(dirname + '/sub/lay.hbs', locals, function(err, html) {
-        assert.equal('<vd>lay</vd>', H.stripWs(html));
-        done();
-      });
-    });
-  });
-});

package/test/optionsSpecs.js

@@ -1,24 +0,0 @@
-var assert = require('assert');
-var hbs = require('..');
-var path = require('path');
-var H = require('./helpers');
-var fs = require('fs');
-
-
-describe('options', function() {
-  var dirname =  path.join(__dirname, 'views/beautify');
-
-  it('should pretty print HTML', function(done) {
-    var hb = hbs.create();
-    var render = hb.express3({beautify: true, restrictLayoutsTo: dirname});
-    var locals = H.createLocals('express3', dirname, {});
-
-    render(dirname + '/index.hbs', locals, function(err, html) {
-      assert.ifError(err);
-      var expected = fs.readFileSync(dirname + '/expected.hbs', 'utf8');
-      assert.equal(html.trim(), expected.trim());
-      done();
-    });
-  });
-});
-

package/test/views/beautify/expected.hbs

@@ -1,9 +0,0 @@
-<html>
-
-<head>head</head>
-
-<body>
-  <h1>heading 1</h1>
-  <h2>heading 2</h2>
-</body>
-<html>

package/test/views/beautify/index.hbs

@@ -1,2 +0,0 @@
-<html>
-  <head>head</head> <body><h1>heading 1</h1><h2>heading 2</h2></body> <html>

package/test/views/customExtension/layout.server.view.html

@@ -1 +0,0 @@
-<html>{{{body}}}</html>

package/test/views/customExtension/partialsDir/partial1.server.view.html

@@ -1 +0,0 @@
-<partial>1</partial>

package/test/views/customExtension/partialsDir/partial2.server.view.html

@@ -1 +0,0 @@
-<partial>2</partial>

package/test/views/customExtension/partialsDir/subs/subPartial1.server.view.html

@@ -1 +0,0 @@
-<subpartial>1</subpartial>

package/test/views/customExtension/partialsDir/subs/subPartial2.server.view.html

@@ -1 +0,0 @@
-<subpartial>2</subpartial>

package/test/views/customExtension/template.server.view.html

@@ -1,5 +0,0 @@
-{{!< layout}}
-{{> subs/subPartial1}}
-{{> partial1}}
-{{> subs/subPartial2}}
-{{> partial2}}

package/test/views/disableLayoutDirective/aside.hbs

@@ -1 +0,0 @@
-aside

package/test/views/disableLayoutDirective/index.hbs

@@ -1,2 +0,0 @@
-{{!< layouts/default}}
-dld

package/test/views/disableLayoutDirective/layouts/default.hbs

@@ -1 +0,0 @@
-<dld>{{{body}}}</dld>

package/test/views/helpers/home/async.hbs

@@ -1,6 +0,0 @@
-{{!< ../layouts/default}}
-asynctemplate
-{{async "foo"}}
-{{async "bar"}}
-{{async "bah"}}
-{{async "baz"}}

package/test/views/helpers/home/index.hbs

@@ -1,3 +0,0 @@
-{{!< ../layouts/default}}
-index
-{{sync "index"}}

package/test/views/helpers/layouts/default.hbs

@@ -1 +0,0 @@
-<default>{{{body}}}</default>

package/test/views/multiple/views1/collide.hbs

@@ -1 +0,0 @@
-<h1>collide1</h1>

package/test/views/multiple/views1/error.hbs

@@ -1 +0,0 @@
-{{{http://google.co.uk}}

package/test/views/multiple/views1/test1.hbs

@@ -1 +0,0 @@
-<h1>test1</h1>

package/test/views/multiple/views2/collide.hbs

@@ -1 +0,0 @@
-<h1>collide2</h1>

package/test/views/multiple/views2/error.hbs

@@ -1 +0,0 @@
-{{{http://google.co.uk}}

package/test/views/multiple/views2/test2.hbs

@@ -1 +0,0 @@
-<h1>test2</h1>

package/test/views/viewsDir/layouts/default.hbs

@@ -1 +0,0 @@
-<vd>{{{body}}}</vd>

package/test/views/viewsDir/sub/directive.hbs

@@ -1,2 +0,0 @@
-{{!< ../layouts/default}}
-directive

package/test/views/viewsDir/sub/lay.hbs

@@ -1 +0,0 @@
-lay