mustache 0.10.0 → 0.11.0

data/Rakefile

@@ -1,10 +1,15 @@
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+#
+# Helpers
+#
+
 def command?(command)
   system("type #{command} > /dev/null")
 end
 
+
 #
 # Tests
 #
@@ -25,6 +30,15 @@ else
   end
 end
 
+if command? :kicker
+  desc "Launch Kicker (like autotest)"
+  task :kicker do
+    puts "Kicking... (ctrl+c to cancel)"
+    exec "kicker -e rake test lib examples"
+  end
+end
+
+
 #
 # Ron
 #
@@ -41,13 +55,6 @@ if command? :ronn
   end
 end
 
-if command? :kicker
-  desc "Launch Kicker (like autotest)"
-  task :kicker do
-    puts "Kicking... (ctrl+c to cancel)"
-    exec "kicker -e rake test lib examples"
-  end
-end
 
 #
 # Gems
@@ -57,14 +64,8 @@ begin
   require 'mg'
   MG.new("mustache.gemspec")
 
-  desc "Build a gem."
-  task :gem => :package
-
-  # Ensure tests pass before pushing a gem.
-  task :gemcutter => :test
-
   desc "Push a new version to Gemcutter and publish docs."
-  task :publish => :gemcutter do
+  task :publish => "gem:publish" do
     require File.dirname(__FILE__) + '/lib/mustache/version'
 
     system "git tag v#{Mustache::Version}"
@@ -81,11 +82,11 @@ end
 # Documentation
 #
 
-# begin
-#   require 'sdoc_helpers'
-# rescue LoadError
-#   warn "sdoc support not enabled. Please gem install sdoc-helpers."
-# end
+begin
+  require 'sdoc_helpers'
+rescue LoadError
+  warn "sdoc support not enabled. Please gem install sdoc-helpers."
+end
 
 desc "Publish to GitHub Pages"
 task :pages => [ "man:build" ] do

data/lib/mustache.rb

@@ -116,7 +116,7 @@ class Mustache
   # The template path informs your Mustache subclass where to look for its
   # corresponding template. By default it's the current directory (".")
   def self.template_path
-    @template_path ||= '.'
+    @template_path ||= inheritable_config_for :template_path, '.'
   end
 
   def self.template_path=(path)
@@ -136,7 +136,7 @@ class Mustache
 
   # A Mustache template's default extension is 'mustache'
   def self.template_extension
-    @template_extension ||= 'mustache'
+    @template_extension ||= inheritable_config_for :template_extension, 'mustache'
   end
 
   def self.template_extension=(template_extension)
@@ -182,7 +182,7 @@ class Mustache
   # `Object`, but it might be nice to set it to something like `Hurl::Views` if
   # your app's main namespace is `Hurl`.
   def self.view_namespace
-    @view_namespace || Object
+    @view_namespace ||= inheritable_config_for(:view_namespace, Object)
   end
 
   def self.view_namespace=(namespace)
@@ -192,7 +192,7 @@ class Mustache
   # Mustache searches the view path for .rb files to require when asked to find a
   # view class. Defaults to "."
   def self.view_path
-    @view_path ||= '.'
+    @view_path ||= inheritable_config_for(:view_path, '.')
   end
 
   def self.view_path=(path)
@@ -288,6 +288,17 @@ class Mustache
     end
   end
 
+  # Return the value of the configuration setting on the superclass, or return 
+  # the default.
+  #
+  # attr_name - Symbol name of the attribute.  It should match the instance variable.
+  # default   - Default value to use if the superclass does not respond.
+  #
+  # Returns the inherited or default configuration setting.
+  def self.inheritable_config_for(attr_name, default)
+    superclass.respond_to?(attr_name) ? superclass.send(attr_name) : default
+  end
+
   def templateify(obj)
     self.class.templateify(obj)
   end

data/lib/mustache/generator.rb

@@ -101,6 +101,8 @@ class Mustache
       if v = ctx[#{name.to_sym.inspect}]
         if v == true
           #{code}
+        elsif v.is_a?(Proc)
+          v.call(#{code})
         else
           v = [v] unless v.is_a?(Array) # shortcut when passed non-array
           v.map { |h| ctx.push(h); r = #{code}; ctx.pop; r }.join

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = '0.10.0'
+  Version = VERSION = '0.11.0'
 end

data/man/mustache.1

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.4.1
+.\" generated with Ronn/v0.5
 .\" http://github.com/rtomayko/ronn/
 .
-.TH "MUSTACHE" "1" "March 2010" "DEFUNKT" "Mustache Manual"
+.TH "MUSTACHE" "1" "April 2010" "DEFUNKT" "Mustache Manual"
 .
 .SH "NAME"
 \fBmustache\fR \-\- Mustache processor
@@ -9,6 +9,7 @@
 .SH "SYNOPSIS"
 .
 .nf
+
 mustache <YAML> <FILE>
 mustache \-\-compile <FILE>
 mustache \-\-tokens <FILE>
@@ -31,6 +32,7 @@ ending with another \fB\-\-\-\fR on a single line, e.g.
 .IP "" 4
 .
 .nf
+
 \-\-\-
 names: [ {name: chris}, {name: mark}, {name: scott} ]
 \-\-\-
@@ -53,6 +55,7 @@ For example:
 .IP "" 4
 .
 .nf
+
 {{#names}}
   Hi {{name}}!
 {{/names}}
@@ -67,14 +70,17 @@ Now let's combine them.
 .IP "" 4
 .
 .nf
+
 $ cat data.yml
 \-\-\-
 names: [ {name: chris}, {name: mark}, {name: scott} ]
 \-\-\-
+
 $ cat template.mustache
 {{#names}}
   Hi {{name}}!
 {{/names}}
+
 $ cat data.yml template.mustache | mustache
 Hi chris!
 Hi mark!
@@ -94,6 +100,7 @@ For example:
 .IP "" 4
 .
 .nf
+
 $ cat data.yml
 \-\-\-
 name: chris
@@ -102,8 +109,10 @@ name: mark
 \-\-\-
 name: scott
 \-\-\-
+
 $ cat template.mustache
 Hi {{name}}!
+
 $ cat data.yml template.mustache | mustache
 Hi chris!
 Hi mark!
@@ -138,6 +147,7 @@ If you have RubyGems installed:
 .IP "" 4
 .
 .nf
+
 gem install mustache
 .
 .fi
@@ -147,6 +157,7 @@ gem install mustache
 .SH "EXAMPLES"
 .
 .nf
+
 $ mustache data.yml template.mustache
 $ cat data.yml | mustache \- template.mustache
 $ mustache \-c template.mustache
@@ -166,4 +177,4 @@ Mustache is Copyright (C) 2009 Chris Wanstrath
 Original CTemplate by Google
 .
 .SH "SEE ALSO"
-mustache(5), mustache(7), gem(1),\fIhttp://defunkt.github.com/mustache/\fR
+mustache(5), mustache(7), gem(1), \fIhttp://mustache.github.com/\fR

data/man/mustache.1.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.4.1'>
+  <meta name='generator' value='Ronn/v0.5'>
   <title>mustache(1) -- Mustache processor</title>
   <style type='text/css'>
     body {margin:0}
@@ -190,12 +190,12 @@ data
 <h2>SEE ALSO</h2>
 
 <p>mustache(5), mustache(7), gem(1),
-<a href="http://defunkt.github.com/mustache/">http://defunkt.github.com/mustache/</a></p>
+<a href="http://mustache.github.com/">http://mustache.github.com/</a></p>
 
 
 <ol class='foot man'>
   <li class='tl'>DEFUNKT</li>
-  <li class='tc'>March 2010</li>
+  <li class='tc'>April 2010</li>
   <li class='tr'>mustache(1)</li>
 </ol>
 

data/man/mustache.5

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.4.1
+.\" generated with Ronn/v0.5
 .\" http://github.com/rtomayko/ronn/
 .
-.TH "MUSTACHE" "5" "March 2010" "DEFUNKT" "Mustache Manual"
+.TH "MUSTACHE" "5" "April 2010" "DEFUNKT" "Mustache Manual"
 .
 .SH "NAME"
 \fBmustache\fR \-\- Logic\-less templates.
@@ -12,6 +12,7 @@ A typical Mustache template:
 .IP "" 4
 .
 .nf
+
 Hello {{name}}
 You have just won ${{value}}!
 {{#in_ca}}
@@ -28,6 +29,7 @@ Given the following hash:
 .IP "" 4
 .
 .nf
+
 {
   "name": "Chris",
   "value": 10000,
@@ -45,6 +47,7 @@ Will produce the following:
 .IP "" 4
 .
 .nf
+
 Hello Chris
 You have just won $10000!
 Well, $6000.0, after taxes.
@@ -65,12 +68,14 @@ replaced with a value, some nothing, and others a series of
 values. This document explains the different types of Mustache tags.
 .
 .SH "TAG TYPES"
-Tags are indicated by the double mustaches. \fB{{name}}\fR is a tag, as is \fB{{#name}}\fR. Let's talk about the different types of tags.
+Tags are indicated by the double mustaches. \fB{{person}}\fR is a tag, as
+is \fB{{#person}}\fR. In both examples, we'd refer to \fBperson\fR as the key
+or tag key. Let's talk about the different types of tags.
 .
 .SS "Variables"
-The most basic tag is the variable. A \fB{{name}}\fR tag in a basic
-template will try to find the \fBname\fR key or method on your view. If
-there is no \fBname\fR method, nothing will be rendered.
+The most basic tag type is the variable. A \fB{{name}}\fR tag in a basic
+template will try to find the \fBname\fR key in the current context. If
+there is no \fBname\fR key, nothing will be rendered.
 .
 .P
 All variables are HTML escaped by default. If you want to return
@@ -78,7 +83,7 @@ unescaped HTML, use the triple mustache: \fB{{{name}}}\fR.
 .
 .P
 You can also use \fB&\fR to unescape a variable: \fB{{& name}}\fR. This may be
-useful when changing delimiters (see "Set Delimter" below).
+useful when changing delimiters (see "Set Delimiter" below).
 .
 .P
 By default a variable "miss" returns an empty string. This can usually
@@ -91,6 +96,7 @@ Template:
 .IP "" 4
 .
 .nf
+
 * {{name}}
 * {{age}}
 * {{company}}
@@ -106,6 +112,7 @@ Hash:
 .IP "" 4
 .
 .nf
+
 {
   "name": "Chris",
   "company": "<b>GitHub</b>"
@@ -121,6 +128,7 @@ Output:
 .IP "" 4
 .
 .nf
+
 * Chris
 *
 * &lt;b&gt;GitHub&lt;/b&gt;
@@ -132,25 +140,20 @@ Output:
 .
 .SS "Sections"
 Sections render blocks of text one or more times, depending on the
-value of the referenced tag.
+value of the key in the current context.
 .
 .P
-A section begins with a pound and ends with a slash. That is,\fB{{#person}}\fR begins a "person" section while \fB{{/person}}\fR ends it.
+A section begins with a pound and ends with a slash. That is, \fB{{#person}}\fR begins a "person" section while \fB{{/person}}\fR ends it.
 .
 .P
-If the \fBperson\fR key exists and calling it returns false or an empty
-list, the HTML between the pound and slash will not be displayed.
+The behavior of the section is determined by the value of the key.
 .
 .P
-If the \fBperson\fR method exists and calling it returns true or an
-object, the HTML between the pound and slash will be rendered and
-displayed exactly one time. The object that was returned by the \fBperson\fR method will become the context of the block, as well.
+\fBFalse Values or Empty Lists\fR
 .
 .P
-If the \fBperson\fR method exists and calling it returns a non\-empty list,
-the text in the block will be displayed once for each item in the
-list. The context of the block will be set to the current item for
-each iteration. In this way we can loop over collections.
+If the \fBperson\fR key exists and has a value of false or an empty
+list, the HTML between the pound and slash will not be displayed.
 .
 .P
 Template:
@@ -158,12 +161,64 @@ Template:
 .IP "" 4
 .
 .nf
-{{#person}}
-  Shown!
-{{/person}}
-{{#anything_else}}
+
+Shown.
+{{#nothin}}
   Never shown!
-{{/anything_else}}
+{{/nothin}}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Hash:
+.
+.IP "" 4
+.
+.nf
+
+{
+  "person": true,
+}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Output:
+.
+.IP "" 4
+.
+.nf
+
+Shown.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fBNon\-Empty Lists\fR
+.
+.P
+If the \fBperson\fR key exists and has a non\-false value, the HTML between
+the pound and slash will be rendered and displayed one or more times.
+.
+.P
+When the value is a non\-empty list, the text in the block will be
+displayed once for each item in the list. The context of the block
+will be set to the current item for each iteration. In this way we can
+loop over collections.
+.
+.P
+Template:
+.
+.IP "" 4
+.
+.nf
+
 {{#repo}}
   <b>{{name}}</b>
 {{/repo}}
@@ -178,8 +233,8 @@ Hash:
 .IP "" 4
 .
 .nf
+
 {
-  "person": true,
   "repo": [
     { "name": "resque" },
     { "name": "hub" },
@@ -197,7 +252,7 @@ Output:
 .IP "" 4
 .
 .nf
-Shown!
+
 <b>resque</b>
 <b>hub</b>
 <b>rip</b>
@@ -206,14 +261,122 @@ Shown!
 .
 .IP "" 0
 .
+.P
+\fBLambdas\fR
+.
+.P
+When the value is a callable object, such as a function or lambda, the
+object will be invoked and passed the block of text. The text passed
+is the literal block, unrendered. \fB{{tags}}\fR will not have been expanded
+\- the lambda should do that on its own. In this way you can implement
+filters or caching.
+.
+.P
+Template:
+.
+.IP "" 4
+.
+.nf
+
+{{#wrapped}}
+  {{name}} is awesome.
+{{/wrapped}}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Hash:
+.
+.IP "" 4
+.
+.nf
+
+{
+  "name": "Willy",
+  "wrapped": function() {
+    return function(text) {
+      return "<b>" + render(text) + "</b>"
+    }
+  }
+}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Output:
+.
+.IP "" 4
+.
+.nf
+
+<b>Willy is awesome.</b>
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fBNon\-False Values\fR
+.
+.P
+When the value is non\-false but not a list, it will be used as the
+context for a single rendering of the block.
+.
+.P
+Template:
+.
+.IP "" 4
+.
+.nf
+
+{{#person?}}
+  Hi {{name}}!
+{{/person?}}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Hash:
+.
+.IP "" 4
+.
+.nf
+
+{
+  "person?": { "name": "Jon" }
+}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Output:
+.
+.IP "" 4
+.
+.nf
+
+Hi Jon!
+.
+.fi
+.
+.IP "" 0
+.
 .SS "Inverted Sections"
 An inverted section begins with a caret (hat) and ends with a
 slash. That is \fB{{^person}}\fR begins a "person" inverted section while \fB{{/person}}\fR ends it.
 .
 .P
 While sections can be used to render text one or more times based on the
-value of the key given, inverted sections may render text once based
-on the inverse value of the key given. That is, they will be rendered
+value of the key, inverted sections may render text once based
+on the inverse value of the key. That is, they will be rendered
 if the key doesn't exist, is false, or is an empty list.
 .
 .P
@@ -222,6 +385,7 @@ Template:
 .IP "" 4
 .
 .nf
+
 {{#repo}}
   <b>{{name}}</b>
 {{/repo}}
@@ -239,6 +403,7 @@ Hash:
 .IP "" 4
 .
 .nf
+
 {
   "repo": []
 }
@@ -253,6 +418,7 @@ Output:
 .IP "" 4
 .
 .nf
+
 No repos :(
 .
 .fi
@@ -265,6 +431,7 @@ Comments begin with a bang and are ignored. The following template:
 .IP "" 4
 .
 .nf
+
 <h1>Today{{! ignore me }}.</h1>
 .
 .fi
@@ -277,12 +444,16 @@ Will render as follows:
 .IP "" 4
 .
 .nf
+
 <h1>Today.</h1>
 .
 .fi
 .
 .IP "" 0
 .
+.P
+Comments may contain newlines.
+.
 .SS "Partials"
 Partials begin with a greater than sign, like \fB{{> box}}\fR.
 .
@@ -297,6 +468,7 @@ this:
 .IP "" 4
 .
 .nf
+
 <%= partial :next_more, :start => start, :size => size %>
 .
 .fi
@@ -309,6 +481,7 @@ Mustache requires only this:
 .IP "" 4
 .
 .nf
+
 {{> next_more}}
 .
 .fi
@@ -328,13 +501,15 @@ For example, this template and partial:
 .IP "" 4
 .
 .nf
+
 base.mustache:
 <h2>Names</h2>
-{{# names }}
-  {{> user }}
-{{/ names }}
+{{#names}}
+  {{> user}}
+{{/names}}
+
 user.mustache:
-<strong>{{ name }}</strong>
+<strong>{{name}}</strong>
 .
 .fi
 .
@@ -346,10 +521,11 @@ Can be thought of as a single, expanded template:
 .IP "" 4
 .
 .nf
+
 <h2>Names</h2>
-{{# names }}
-  <strong>{{ name }}</strong>
-{{/ names }}
+{{#names}}
+  <strong>{{name}}</strong>
+{{/names}}
 .
 .fi
 .
@@ -357,7 +533,7 @@ Can be thought of as a single, expanded template:
 .
 .SS "Set Delimiter"
 Set Delimiter tags start with an equal sign and change the tag
-delimiters from {{ and }} to custom strings.
+delimiters from \fB{{\fR and \fB}}\fR to custom strings.
 .
 .P
 Consider the following contrived example:
@@ -365,7 +541,8 @@ Consider the following contrived example:
 .IP "" 4
 .
 .nf
-* {{ default_tags }}
+
+* {{default_tags}}
 {{=<% %>=}}
 * <% erb_style_tags %>
 <%={{ }}=%>
@@ -396,4 +573,4 @@ Mustache is Copyright (C) 2009 Chris Wanstrath
 Original CTemplate by Google
 .
 .SH "SEE ALSO"
-mustache(1), mustache(7), gem(1),\fIhttp://defunkt.github.com/mustache/\fR
+mustache(1), mustache(7), \fIhttp://mustache.github.com/\fR

data/man/mustache.5.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.4.1'>
+  <meta name='generator' value='Ronn/v0.5'>
   <title>mustache(5) -- Logic-less templates.</title>
   <style type='text/css'>
     body {margin:0}
@@ -106,20 +106,21 @@ values. This document explains the different types of Mustache tags.</p>
 
 <h2>TAG TYPES</h2>
 
-<p>Tags are indicated by the double mustaches. <code>{{name}}</code> is a tag, as is
-<code>{{#name}}</code>. Let's talk about the different types of tags.</p>
+<p>Tags are indicated by the double mustaches. <code>{{person}}</code> is a tag, as
+is <code>{{#person}}</code>. In both examples, we'd refer to <code>person</code> as the key
+or tag key. Let's talk about the different types of tags.</p>
 
 <h3>Variables</h3>
 
-<p>The most basic tag is the variable. A <code>{{name}}</code> tag in a basic
-template will try to find the <code>name</code> key or method on your view. If
-there is no <code>name</code> method, nothing will be rendered.</p>
+<p>The most basic tag type is the variable. A <code>{{name}}</code> tag in a basic
+template will try to find the <code>name</code> key in the current context. If
+there is no <code>name</code> key, nothing will be rendered.</p>
 
 <p>All variables are HTML escaped by default. If you want to return
 unescaped HTML, use the triple mustache: <code>{{{name}}}</code>.</p>
 
 <p>You can also use <code>&amp;</code> to unescape a variable: <code>{{&amp; name}}</code>. This may be
-useful when changing delimiters (see "Set Delimter" below).</p>
+useful when changing delimiters (see "Set Delimiter" below).</p>
 
 <p>By default a variable "miss" returns an empty string. This can usually
 be configured in your Mustache library. The Ruby version of Mustache
@@ -152,33 +153,51 @@ supports raising an exception in this situation, for instance.</p>
 <h3>Sections</h3>
 
 <p>Sections render blocks of text one or more times, depending on the
-value of the referenced tag.</p>
+value of the key in the current context.</p>
 
 <p>A section begins with a pound and ends with a slash. That is,
 <code>{{#person}}</code> begins a "person" section while <code>{{/person}}</code> ends it.</p>
 
-<p>If the <code>person</code> key exists and calling it returns false or an empty
-list, the HTML between the pound and slash will not be displayed.</p>
+<p>The behavior of the section is determined by the value of the key.</p>
 
-<p>If the <code>person</code> method exists and calling it returns true or an
-object, the HTML between the pound and slash will be rendered and
-displayed exactly one time. The object that was returned by the
-<code>person</code> method will become the context of the block, as well.</p>
+<p><strong>False Values or Empty Lists</strong></p>
 
-<p>If the <code>person</code> method exists and calling it returns a non-empty list,
-the text in the block will be displayed once for each item in the
-list. The context of the block will be set to the current item for
-each iteration. In this way we can loop over collections.</p>
+<p>If the <code>person</code> key exists and has a value of false or an empty
+list, the HTML between the pound and slash will not be displayed.</p>
 
 <p>Template:</p>
 
-<pre><code>{{#person}}
-  Shown!
-{{/person}}
-{{#anything_else}}
+<pre><code>Shown.
+{{#nothin}}
   Never shown!
-{{/anything_else}}
-{{#repo}}
+{{/nothin}}
+</code></pre>
+
+<p>Hash:</p>
+
+<pre><code>{
+  "person": true,
+}
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>Shown.
+</code></pre>
+
+<p><strong>Non-Empty Lists</strong></p>
+
+<p>If the <code>person</code> key exists and has a non-false value, the HTML between
+the pound and slash will be rendered and displayed one or more times.</p>
+
+<p>When the value is a non-empty list, the text in the block will be
+displayed once for each item in the list. The context of the block
+will be set to the current item for each iteration. In this way we can
+loop over collections.</p>
+
+<p>Template:</p>
+
+<pre><code>{{#repo}}
   &lt;b&gt;{{name}}&lt;/b&gt;
 {{/repo}}
 </code></pre>
@@ -186,7 +205,6 @@ each iteration. In this way we can loop over collections.</p>
 <p>Hash:</p>
 
 <pre><code>{
-  "person": true,
   "repo": [
     { "name": "resque" },
     { "name": "hub" },
@@ -197,12 +215,67 @@ each iteration. In this way we can loop over collections.</p>
 
 <p>Output:</p>
 
-<pre><code>Shown!
-&lt;b&gt;resque&lt;/b&gt;
+<pre><code>&lt;b&gt;resque&lt;/b&gt;
 &lt;b&gt;hub&lt;/b&gt;
 &lt;b&gt;rip&lt;/b&gt;
 </code></pre>
 
+<p><strong>Lambdas</strong></p>
+
+<p>When the value is a callable object, such as a function or lambda, the
+object will be invoked and passed the block of text. The text passed
+is the literal block, unrendered. <code>{{tags}}</code> will not have been expanded
+- the lambda should do that on its own. In this way you can implement
+filters or caching.</p>
+
+<p>Template:</p>
+
+<pre><code>{{#wrapped}}
+  {{name}} is awesome.
+{{/wrapped}}
+</code></pre>
+
+<p>Hash:</p>
+
+<pre><code>{
+  "name": "Willy",
+  "wrapped": function() {
+    return function(text) {
+      return "&lt;b&gt;" + render(text) + "&lt;/b&gt;"
+    }
+  }
+}
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;b&gt;Willy is awesome.&lt;/b&gt;
+</code></pre>
+
+<p><strong>Non-False Values</strong></p>
+
+<p>When the value is non-false but not a list, it will be used as the
+context for a single rendering of the block.</p>
+
+<p>Template:</p>
+
+<pre><code>{{#person?}}
+  Hi {{name}}!
+{{/person?}}
+</code></pre>
+
+<p>Hash:</p>
+
+<pre><code>{
+  "person?": { "name": "Jon" }
+}
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>Hi Jon!
+</code></pre>
+
 <h3>Inverted Sections</h3>
 
 <p>An inverted section begins with a caret (hat) and ends with a
@@ -210,8 +283,8 @@ slash. That is <code>{{^person}}</code> begins a "person" inverted section while
 <code>{{/person}}</code> ends it.</p>
 
 <p>While sections can be used to render text one or more times based on the
-value of the key given, inverted sections may render text once based
-on the inverse value of the key given. That is, they will be rendered
+value of the key, inverted sections may render text once based
+on the inverse value of the key. That is, they will be rendered
 if the key doesn't exist, is false, or is an empty list.</p>
 
 <p>Template:</p>
@@ -248,6 +321,8 @@ if the key doesn't exist, is false, or is an empty list.</p>
 <pre><code>&lt;h1&gt;Today.&lt;/h1&gt;
 </code></pre>
 
+<p>Comments may contain newlines.</p>
+
 <h3>Partials</h3>
 
 <p>Partials begin with a greater than sign, like <code>{{&gt; box}}</code>.</p>
@@ -276,30 +351,30 @@ expansion, even though it's not literally true.</p>
 
 <pre><code>base.mustache:
 &lt;h2&gt;Names&lt;/h2&gt;
-{{# names }}
-  {{&gt; user }}
-{{/ names }}
+{{#names}}
+  {{&gt; user}}
+{{/names}}
 
 user.mustache:
-&lt;strong&gt;{{ name }}&lt;/strong&gt;
+&lt;strong&gt;{{name}}&lt;/strong&gt;
 </code></pre>
 
 <p>Can be thought of as a single, expanded template:</p>
 
 <pre><code>&lt;h2&gt;Names&lt;/h2&gt;
-{{# names }}
-  &lt;strong&gt;{{ name }}&lt;/strong&gt;
-{{/ names }}
+{{#names}}
+  &lt;strong&gt;{{name}}&lt;/strong&gt;
+{{/names}}
 </code></pre>
 
 <h3>Set Delimiter</h3>
 
 <p>Set Delimiter tags start with an equal sign and change the tag
-delimiters from {{ and }} to custom strings.</p>
+delimiters from <code>{{</code> and <code>}}</code> to custom strings.</p>
 
 <p>Consider the following contrived example:</p>
 
-<pre><code>* {{ default_tags }}
+<pre><code>* {{default_tags}}
 {{=&lt;% %>=}}
 * &lt;% erb_style_tags %>
 &lt;%={{ }}=%>
@@ -325,13 +400,13 @@ markup."</p>
 
 <h2>SEE ALSO</h2>
 
-<p>mustache(1), mustache(7), gem(1),
-<a href="http://defunkt.github.com/mustache/">http://defunkt.github.com/mustache/</a></p>
+<p>mustache(1), mustache(7),
+<a href="http://mustache.github.com/">http://mustache.github.com/</a></p>
 
 
 <ol class='foot man'>
   <li class='tl'>DEFUNKT</li>
-  <li class='tc'>March 2010</li>
+  <li class='tc'>April 2010</li>
   <li class='tr'>mustache(5)</li>
 </ol>
 

data/man/mustache.5.ron

@@ -41,21 +41,22 @@ values. This document explains the different types of Mustache tags.
 
 ## TAG TYPES
 
-Tags are indicated by the double mustaches. `{{name}}` is a tag, as is
-`{{#name}}`. Let's talk about the different types of tags.
+Tags are indicated by the double mustaches. `{{person}}` is a tag, as
+is `{{#person}}`. In both examples, we'd refer to `person` as the key
+or tag key. Let's talk about the different types of tags.
 
 
 ### Variables
 
-The most basic tag is the variable. A `{{name}}` tag in a basic
-template will try to find the `name` key or method on your view. If
-there is no `name` method, nothing will be rendered.
+The most basic tag type is the variable. A `{{name}}` tag in a basic
+template will try to find the `name` key in the current context. If
+there is no `name` key, nothing will be rendered.
 
 All variables are HTML escaped by default. If you want to return
 unescaped HTML, use the triple mustache: `{{{name}}}`.
 
 You can also use `&` to unescape a variable: `{{& name}}`. This may be
-useful when changing delimiters (see "Set Delimter" below).
+useful when changing delimiters (see "Set Delimiter" below).
 
 By default a variable "miss" returns an empty string. This can usually
 be configured in your Mustache library. The Ruby version of Mustache
@@ -86,32 +87,47 @@ Output:
 ### Sections
 
 Sections render blocks of text one or more times, depending on the
-value of the referenced tag.
+value of the key in the current context.
 
 A section begins with a pound and ends with a slash. That is,
 `{{#person}}` begins a "person" section while `{{/person}}` ends it.
 
-If the `person` key exists and calling it returns false or an empty
-list, the HTML between the pound and slash will not be displayed.
+The behavior of the section is determined by the value of the key.
 
-If the `person` method exists and calling it returns true or an
-object, the HTML between the pound and slash will be rendered and
-displayed exactly one time. The object that was returned by the
-`person` method will become the context of the block, as well.
+**False Values or Empty Lists**
 
-If the `person` method exists and calling it returns a non-empty list,
-the text in the block will be displayed once for each item in the
-list. The context of the block will be set to the current item for
-each iteration. In this way we can loop over collections.
+If the `person` key exists and has a value of false or an empty
+list, the HTML between the pound and slash will not be displayed.
 
 Template:
 
-    {{#person}}
-      Shown!
-    {{/person}}
-    {{#anything_else}}
+    Shown.
+    {{#nothin}}
       Never shown!
-    {{/anything_else}}
+    {{/nothin}}
+
+Hash:
+
+    {
+      "person": true,
+    }
+
+Output:
+
+    Shown.
+
+**Non-Empty Lists**
+
+If the `person` key exists and has a non-false value, the HTML between
+the pound and slash will be rendered and displayed one or more times.
+
+When the value is a non-empty list, the text in the block will be
+displayed once for each item in the list. The context of the block
+will be set to the current item for each iteration. In this way we can
+loop over collections.
+
+Template:
+
     {{#repo}}
       <b>{{name}}</b>
     {{/repo}}
@@ -119,7 +135,6 @@ Template:
 Hash:
 
     {
-      "person": true,
       "repo": [
         { "name": "resque" },
         { "name": "hub" },
@@ -129,11 +144,60 @@ Hash:
 
 Output:
 
-    Shown!
     <b>resque</b>
     <b>hub</b>
     <b>rip</b>
 
+**Lambdas**
+
+When the value is a callable object, such as a function or lambda, the
+object will be invoked and passed the block of text. The text passed
+is the literal block, unrendered. `{{tags}}` will not have been expanded
+- the lambda should do that on its own. In this way you can implement
+filters or caching.
+
+Template:
+
+    {{#wrapped}}
+      {{name}} is awesome.
+    {{/wrapped}}
+
+Hash:
+
+    {
+      "name": "Willy",
+      "wrapped": function() {
+        return function(text) {
+          return "<b>" + render(text) + "</b>"
+        }
+      }
+    }
+
+Output:
+
+    <b>Willy is awesome.</b>
+
+**Non-False Values**
+
+When the value is non-false but not a list, it will be used as the
+context for a single rendering of the block.
+
+Template:
+
+    {{#person?}}
+      Hi {{name}}!
+    {{/person?}}
+
+Hash:
+
+    {
+      "person?": { "name": "Jon" }
+    }
+
+Output:
+
+    Hi Jon!
+
 
 ### Inverted Sections
 
@@ -142,8 +206,8 @@ slash. That is `{{^person}}` begins a "person" inverted section while
 `{{/person}}` ends it.
 
 While sections can be used to render text one or more times based on the
-value of the key given, inverted sections may render text once based
-on the inverse value of the key given. That is, they will be rendered
+value of the key, inverted sections may render text once based
+on the inverse value of the key. That is, they will be rendered
 if the key doesn't exist, is false, or is an empty list.
 
 Template:
@@ -176,6 +240,8 @@ Will render as follows:
 
     <h1>Today.</h1>
 
+Comments may contain newlines.
+
 
 ### Partials
 
@@ -203,29 +269,29 @@ For example, this template and partial:
 
     base.mustache:
     <h2>Names</h2>
-    {{# names }}
-      {{> user }}
-    {{/ names }}
+    {{#names}}
+      {{> user}}
+    {{/names}}
 
     user.mustache:
-    <strong>{{ name }}</strong>
+    <strong>{{name}}</strong>
 
 Can be thought of as a single, expanded template:
 
     <h2>Names</h2>
-    {{# names }}
-      <strong>{{ name }}</strong>
-    {{/ names }}
+    {{#names}}
+      <strong>{{name}}</strong>
+    {{/names}}
 
 
 ### Set Delimiter
 
 Set Delimiter tags start with an equal sign and change the tag
-delimiters from {{ and }} to custom strings.
+delimiters from `{{` and `}}` to custom strings.
 
 Consider the following contrived example:
 
-    * {{ default_tags }}
+    * {{default_tags}}
     {{=<% %>=}}
     * <% erb_style_tags %>
     <%={{ }}=%>
@@ -254,5 +320,5 @@ Original CTemplate by Google
 
 ## SEE ALSO
 
-mustache(1), mustache(7), gem(1),
+mustache(1), mustache(7),
 <http://mustache.github.com/>

data/test/fixtures/lambda.mustache

@@ -0,0 +1,3 @@
+{{#cached}}
+Hi {{name}}.
+{{/cached}}

data/test/fixtures/lambda.rb

@@ -0,0 +1,27 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'mustache'
+
+class Lambda < Mustache
+  self.path = File.dirname(__FILE__)
+
+  attr_reader :calls
+
+  def initialize(*args)
+    super
+    @calls = 0
+    @cached = nil
+  end
+
+  def cached
+    lambda do |text|
+      return @cached if @cached
+
+      @calls += 1
+      @cached = render(text)
+    end
+  end
+end
+
+if $0 == __FILE__
+  puts Lambda.to_html(Lambda.template, :name => "Jonny")
+end

data/test/mustache_test.rb

@@ -323,6 +323,20 @@ data
     assert instance.compiled?
   end
 
+  def test_sections_returning_lambdas_get_called_with_text
+    view = Lambda.new
+    view[:name] = 'Chris'
+
+    assert_equal "Hi Chris.", view.render.chomp
+    assert_equal 1, view.calls
+
+    assert_equal "Hi Chris.", view.render.chomp
+    assert_equal 1, view.calls
+
+    assert_equal "Hi Chris.", view.render.chomp
+    assert_equal 1, view.calls
+  end
+
   def test_lots_of_staches
     template = "{{{{foo}}}}"
 
@@ -428,4 +442,19 @@ def indent
 end
 template
   end
+
+  def test_inherited_attributes
+    Object.const_set :TestNamespace, Module.new
+    base = Class.new(Mustache)
+    tmpl = Class.new(base)
+
+    {:template_path      => File.expand_path('./foo'), 
+     :template_extension => 'stache',
+     :view_namespace     => TestNamespace,
+     :view_path          => './foo'
+     }.each do |attr, value|
+      base.send("#{attr}=", value)
+      assert_equal value, tmpl.send(attr)
+    end
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  prerelease: false
+  segments: 
+  - 0
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -71,6 +76,8 @@ files:
 - test/fixtures/inner_partial.txt
 - test/fixtures/inverted_section.mustache
 - test/fixtures/inverted_section.rb
+- test/fixtures/lambda.mustache
+- test/fixtures/lambda.rb
 - test/fixtures/namespaced.mustache
 - test/fixtures/namespaced.rb
 - test/fixtures/nested_objects.mustache
@@ -108,18 +115,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mustache is a framework-agnostic way to render logic-free views.