Merge branch 'release/0.5.5'

HISTORY.md

@@ -1,4 +1,7 @@
 
+# 0.5.5 / 6-12-2015
+ * allowing front-matter data to be used in layout
+
 # 0.5.4 / 6-9-2015
  * Added ability to set local layout to null to render view w/out layout (when defaultLayout is set).
 

lib/renderer.js

@@ -82,7 +82,7 @@ Renderer.prototype.compileTemplate = function *(file) {
   debug("compiling template %s", chalk.grey(path.relative(this.options.root, file)));
   meta.fn = this.handlebars.compile(meta.body);
   meta.render = function (locals, options) {
-    return this.fn(extend(true, {}, locals, this.attributes), options);
+    return this.fn(locals, options);
   };
   return meta;
 };
@@ -300,6 +300,10 @@ Renderer.prototype.render = function *(template, locals, options) {
   // retrieve view
   if (!body) var view = yield this.getView(template);
 
+  // extend locals with front-matter data
+  if (layout && layout.attributes) extend(locals, layout.attributes);
+  if (view && view.attributes) extend(locals, view.attributes);
+
   // set up some special meta locals before rendering
   options.data.view = template;
   if (layoutId) options.data.layout = layoutId;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa-handlebars",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "repository": {
     "type": "git",
     "url": "git@github.com:dominicbarnes/koa-handlebars.git"

test/fixtures/layouts/front-matter-data.hbs

@@ -0,0 +1,5 @@
+---
+name: Test
+---
+
+Layout, {{name}}!

test/fixtures/layouts/front-matter.hbs

@@ -0,0 +1 @@
+Layout, {{name}}!

test/renderer.js

@@ -386,6 +386,27 @@ describe("Renderer#render(template, locals, options)", function () {
 
     assert.equal(body.trim(), "Hello, World!");
   });
+
+  it("should ensure that YAML data is accessible to all templates", function *() {
+    var r = new Renderer({ root: fixture() });
+    var body = yield r.render("front-matter", { layout: "front-matter" });
+
+    assert.equal(body.trim(), "Layout, World!"); // no {{{@body}}}
+  });
+
+  it("should allow YAML in layout", function *() {
+    var r = new Renderer({ root: fixture() });
+    var body = yield r.render("simple", { layout: "front-matter-data" });
+
+    assert.equal(body.trim(), "Layout, Test!"); // no {{{@body}}}
+  });
+
+  it("should allow layout YAML to be overridden by view YAML", function *() {
+    var r = new Renderer({ root: fixture() });
+    var body = yield r.render("front-matter", { layout: "front-matter-data" });
+
+    assert.equal(body.trim(), "Layout, World!"); // no {{{@body}}}
+  });
 });
 
 describe("Renderer#middleware()", function () {