Add capitalize filter; fix page.layoutWas and page.contentWas

Author: cyjake

lib/liquid/index.coffee

@@ -130,6 +130,9 @@ Liquid.Template.registerTag "include", do ->
       @included.then (i) -> i.render context
 
 Liquid.Template.registerFilter
+  capitalize: (input) ->
+    input && input.replace(/^([a-z])/, (m, chr) -> chr.toUpperCase())
+
   date: formatDate
 
   date_to_xmlschema: (input) ->

lib/liquid/index.js

@@ -37,20 +37,20 @@ function markup(page) {
 }
 
 var _layouts = {}
-var _layout
-
-function layout(post) {
-  if (!post.layoutWas) post.layoutWas = post.layout
-  if (!post.layout || _layout === post.layout) {
-    // Finished layout renderring, restore the original layout of current post
-    post.layout = post.layoutWas
-    return post
+
+function layout(page) {
+  if (!page.layoutWas) page.layoutWas = page.layout
+  if (page.layout_ == page.layout) {
+    // Finished layout renderring, restore the original layout of current page
+    page.layout = page.layoutWas
+    page.layout_ = ''
+    return page
   }
-  _layout = post.layout
+  page.layout_ = page.layout
 
-  var site = post.site
+  var site = page.site
   // support .html layouts only, for now.
-  var lpath = path.join(site.cwd, '_layouts', post.layout) + '.html'
+  var lpath = path.join(site.cwd, '_layouts', page.layout) + '.html'
   var lcache = _layouts[lpath]
 
   if (!lcache) {
@@ -73,15 +73,15 @@ function layout(post) {
     .then(function(template) {
       return template.render({
         site: site,
-        page: post,
-        content: post.output
+        page: page,
+        content: page.output
       })
     })
     .then(function(res) {
-      post.output = res
-      if (lcache.matter) _.extend(post, lcache.matter)
+      page.output = res
+      if (lcache.matter) _.extend(page, lcache.matter)
 
-      return layout(post)
+      return layout(page)
     })
 }
 
@@ -106,12 +106,16 @@ module.exports = function writeTemplated(page) {
       })
     })
     .then(function(res) {
+      page.contentWas = page.content
       page.content = res
       return page
     })
     .then(markup)
     .then(layout)
     .then(render)
+    .then(function() {
+      page.content = page.contentWas
+    })
     .fail(function(err) {
       util.error('Failed to generate ' + page.path + ' because of ')
       util.error(err.message)