mustache 0.99.4 → 0.99.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1a22fd6d24b05a356ea96d520d05b1d558789a55
+  data.tar.gz: 434c410c4f8eec4c004ce4dce27d9cc7e6e8d03a
+SHA512:
+  metadata.gz: 3fddf352c8e8ec2303c451a834a3ed437de4dacffe211ff55f64a165dcef9692a972f2346cb6bd272fcfecccc58fef762f055a8f7c19bc74e627c851ba5321db
+  data.tar.gz: 091b121190a804a7d003f762b08f2ab287811ed94f3642233fcda90773affee179bc69de7132b159dae3da4cd5f4c7928cefb3d2ea49a2333038c046993c1a9a

data/README.md

@@ -107,7 +107,7 @@ Escaping
 
 Mustache does escape all values when using the standard double
 Mustache syntax. Characters which will be escaped: `& \ " < >`. To
-disable escaping, simply use tripple mustaches like
+disable escaping, simply use triple mustaches like
 `{{{unescaped_variable}}}`.
 
 Example: Using `{{variable}}` inside a template for `5 > 2` will
@@ -251,7 +251,7 @@ Then just include it:
 Great, but what about that `@ssl` ivar in `gravatar_host`? There are
 many ways we can go about setting it.
 
-Here's on example which illustrates a key feature of Mustache: you
+Here's an example which illustrates a key feature of Mustache: you
 are free to use the `initialize` method just as you would in any
 normal class.
 
@@ -326,12 +326,7 @@ See <http://gist.github.com/323622> for installation instructions.
 Emacs
 -----
 
-mustache-mode.el is included under the contrib/ directory for any
-Emacs users. Based on Google's tpl-mode for ctemplates, it adds
-support for Mustache's more lenient tag values and includes a few
-commands for your editing pleasure.
-
-See <http://gist.github.com/323619> for installation instructions.
+mustache-mode.el is available at https://github.com/mustache/emacs
 
 
 TextMate
@@ -400,7 +395,6 @@ Meta
 * Home: <http://mustache.github.com>
 * Bugs: <http://github.com/defunkt/mustache/issues>
 * List: <mustache@librelist.com>
-* Test: <http://runcoderun.com/defunkt/mustache>
 * Gems: <http://rubygems.org/gems/mustache>
 
 You can also find us in `#{` on irc.freenode.net.

data/lib/mustache.rb

@@ -40,7 +40,7 @@ require 'mustache/settings'
 #
 # * template_file
 #
-# You can tell Mustache exactly which template to us with this
+# You can tell Mustache exactly which template to use with this
 # setting. It can be a relative or absolute path.
 #
 # * template
@@ -234,8 +234,8 @@ class Mustache
   # Returns the constant if found
   # Returns nil if nothing is found
   def self.const_get!(name)
-    name.split('::').inject(Object) do |klass, name|
-      klass.const_get(name)
+    name.split('::').inject(Object) do |klass, cname|
+      klass.const_get(cname)
     end
   rescue NameError
     nil

data/lib/mustache/generator.rb

@@ -90,7 +90,7 @@ class Mustache
 
     # Callback fired when the compiler finds a section token. We're
     # passed the section name and the array of tokens.
-    def on_section(name, content, raw, delims)
+    def on_section(name, offset, content, raw, delims)
       # Convert the tokenized content of this section into a Ruby
       # string we can use.
       code = compile(content)
@@ -121,7 +121,7 @@ class Mustache
 
     # Fired when we find an inverted section. Just like `on_section`,
     # we're passed the inverted section name and the array of tokens.
-    def on_inverted_section(name, content, raw, _)
+    def on_inverted_section(name, offset, content, raw, delims)
       # Convert the tokenized content of this section into a Ruby
       # string we can use.
       code = compile(content)
@@ -139,12 +139,12 @@ class Mustache
     # Fired when the compiler finds a partial. We want to return code
     # which calls a partial at runtime instead of expanding and
     # including the partial's body to allow for recursive partials.
-    def on_partial(name, indentation)
+    def on_partial(name, offset, indentation)
       ev("ctx.partial(#{name.to_sym.inspect}, #{indentation.inspect})")
     end
 
     # An unescaped tag.
-    def on_utag(name)
+    def on_utag(name, offset)
       ev(<<-compiled)
         v = #{compile!(name)}
         if v.is_a?(Proc)
@@ -155,7 +155,7 @@ class Mustache
     end
 
     # An escaped tag.
-    def on_etag(name)
+    def on_etag(name, offset)
       ev(<<-compiled)
         v = #{compile!(name)}
         if v.is_a?(Proc)

data/lib/mustache/parser.rb

@@ -146,12 +146,12 @@ EOF
       case type
       when '#'
         block = [:multi]
-        @result << [:mustache, :section, fetch, block]
+        @result << [:mustache, :section, fetch, offset, block]
         @sections << [content, position, @result]
         @result = block
       when '^'
         block = [:multi]
-        @result << [:mustache, :inverted_section, fetch, block]
+        @result << [:mustache, :inverted_section, fetch, offset, block]
         @sections << [content, position, @result]
         @result = block
       when '/'
@@ -169,14 +169,14 @@ EOF
       when '='
         self.otag, self.ctag = content.split(' ', 2)
       when '>', '<'
-        @result << [:mustache, :partial, content, padding]
+        @result << [:mustache, :partial, content, offset, padding]
       when '{', '&'
         # The closing } in unescaped tags is just a hack for
         # aesthetics.
         type = "}" if type == "{"
-        @result << [:mustache, :utag, fetch]
+        @result << [:mustache, :utag, fetch, offset]
       else
-        @result << [:mustache, :etag, fetch]
+        @result << [:mustache, :etag, fetch, offset]
       end
 
       # Skip whitespace and any balancing sigils after the content
@@ -234,6 +234,10 @@ EOF
       end
     end
 
+    def offset
+      position[0, 2]
+    end
+
     # Returns [lineno, column, line]
     def position
       # The rest of the current line

data/lib/mustache/sinatra.rb

@@ -39,6 +39,18 @@ class Mustache
   # You can indeed use layouts with this library. Where you'd normally
   # <%= yield %> you instead {{{yield}}} - the body of the subview is
   # set to the `yield` variable and made available to you.
+  #
+  # If you don't want the Sinatra extension to look up your view class,
+  # maybe because you've already loaded it or you're pulling it in from
+  # a gem, you can hand the `mustache` helper a Mustache subclass directly:
+  #
+  #   # Assuming `class Omnigollum::Login < Mustache`
+  #   get '/login' do
+  #     @title = "Log In"
+  #     require 'lib/omnigollum/views/login'
+  #     mustache Omnigollum::Login
+  #   end
+  #
   module Sinatra
     module Helpers
       # Call this in your Sinatra routes.
@@ -72,10 +84,17 @@ class Mustache
           end
         end
 
-        # Find and cache the view class we want. This ensures the
-        # compiled template is cached, too - no looking up and
-        # compiling templates on each page load.
-        klass = mustache_class(template, options)
+        # If instead of a symbol they gave us a Mustache class,
+        # use that for rendering.
+        klass = template if template.is_a?(Class) && template < Mustache
+
+        # Find and cache the view class we want if we don't have
+        # one yet. This ensures the compiled template is cached,
+        # too - no looking up and compiling templates on each page
+        # load.
+        if klass.nil?
+          klass = mustache_class(template, options)
+        end
 
         # Does the view subclass the layout? If so we'll use the
         # view to render the layout so you can override layout

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = VERSION = '0.99.4'
+  Version = VERSION = '0.99.5'
 end

data/man/mustache.1

@@ -1,10 +1,10 @@
-.\" generated with Ronn/v0.5
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "MUSTACHE" "1" "May 2010" "DEFUNKT" "Mustache Manual"
+.TH "MUSTACHE" "1" "August 2011" "DEFUNKT" "Mustache Manual"
 .
 .SH "NAME"
-\fBmustache\fR \-\- Mustache processor
+\fBmustache\fR \- Mustache processor
 .
 .SH "SYNOPSIS"
 .
@@ -17,17 +17,13 @@ mustache \-\-tokens <FILE>
 .fi
 .
 .SH "DESCRIPTION"
-Mustache is a logic\-less templating system for HTML, config files,
-anything.
+Mustache is a logic\-less templating system for HTML, config files, anything\.
 .
 .P
-The \fBmustache\fR command processes a Mustache template preceded by YAML
-frontmatter from standard input and prints one or more documents to
-standard output.
+The \fBmustache\fR command processes a Mustache template preceded by YAML frontmatter from standard input and prints one or more documents to standard output\.
 .
 .P
-YAML frontmatter beings with \fB\-\-\-\fR on a single line, followed by YAML,
-ending with another \fB\-\-\-\fR on a single line, e.g.
+YAML frontmatter beings with \fB\-\-\-\fR on a single line, followed by YAML, ending with another \fB\-\-\-\fR on a single line, e\.g\.
 .
 .IP "" 4
 .
@@ -42,12 +38,10 @@ names: [ {name: chris}, {name: mark}, {name: scott} ]
 .IP "" 0
 .
 .P
-If you are unfamiliar with YAML, it is a superset of JSON. Valid JSON
-should work fine.
+If you are unfamiliar with YAML, it is a superset of JSON\. Valid JSON should work fine\.
 .
 .P
-After the frontmatter should come any valid Mustache template. See
-mustache(5) for an overview of Mustache templates.
+After the frontmatter should come any valid Mustache template\. See mustache(5) for an overview of Mustache templates\.
 .
 .P
 For example:
@@ -65,23 +59,23 @@ For example:
 .IP "" 0
 .
 .P
-Now let's combine them.
+Now let\'s combine them\.
 .
 .IP "" 4
 .
 .nf
 
-$ cat data.yml
+$ cat data\.yml
 \-\-\-
 names: [ {name: chris}, {name: mark}, {name: scott} ]
 \-\-\-
 
-$ cat template.mustache
+$ cat template\.mustache
 {{#names}}
   Hi {{name}}!
 {{/names}}
 
-$ cat data.yml template.mustache | mustache
+$ cat data\.yml template\.mustache | mustache
 Hi chris!
 Hi mark!
 Hi scott!
@@ -91,8 +85,7 @@ Hi scott!
 .IP "" 0
 .
 .P
-If you provide multiple YAML documents (as delimited by \fB\-\-\-\fR), your
-template will be rendered multiple times. Like a mail merge.
+If you provide multiple YAML documents (as delimited by \fB\-\-\-\fR), your template will be rendered multiple times\. Like a mail merge\.
 .
 .P
 For example:
@@ -101,7 +94,7 @@ For example:
 .
 .nf
 
-$ cat data.yml
+$ cat data\.yml
 \-\-\-
 name: chris
 \-\-\-
@@ -110,10 +103,10 @@ name: mark
 name: scott
 \-\-\-
 
-$ cat template.mustache
+$ cat template\.mustache
 Hi {{name}}!
 
-$ cat data.yml template.mustache | mustache
+$ cat data\.yml template\.mustache | mustache
 Hi chris!
 Hi mark!
 Hi scott!
@@ -123,23 +116,15 @@ Hi scott!
 .IP "" 0
 .
 .SH "OPTIONS"
-By default \fBmustache\fR will try to render a Mustache template using the
-YAML frontmatter you provide. It can do a few other things, however.
+By default \fBmustache\fR will try to render a Mustache template using the YAML frontmatter you provide\. It can do a few other things, however\.
 .
 .TP
 \fB\-c\fR, \fB\-\-compile\fR
-Print the compiled Ruby version of a given template. This is the
-code that is actually used when rendering a template into a
-string. Useful for debugging but only if you are familiar with
-Mustache's internals.
+Print the compiled Ruby version of a given template\. This is the code that is actually used when rendering a template into a string\. Useful for debugging but only if you are familiar with Mustache\'s internals\.
 .
 .TP
 \fB\-t\fR, \fB\-\-tokens\fR
-Print the tokenized form of a given Mustache template. This can be
-used to understand how Mustache parses a template. The tokens are
-handed to a generator which compiles them into a Ruby
-string. Syntax errors and confused tags, therefor, can probably be
-identified by examining the tokens produced.
+Print the tokenized form of a given Mustache template\. This can be used to understand how Mustache parses a template\. The tokens are handed to a generator which compiles them into a Ruby string\. Syntax errors and confused tags, therefor, can probably be identified by examining the tokens produced\.
 .
 .SH "INSTALLATION"
 If you have RubyGems installed:
@@ -158,10 +143,10 @@ gem install mustache
 .
 .nf
 
-$ mustache data.yml template.mustache
-$ cat data.yml | mustache \- template.mustache
-$ mustache \-c template.mustache
-$ cat <<data | ruby mustache \- template.mustache
+$ mustache data\.yml template\.mustache
+$ cat data\.yml | mustache \- template\.mustache
+$ mustache \-c template\.mustache
+$ cat <<data | ruby mustache \- template\.mustache
 \-\-\-
 name: Bob
 age: 30
@@ -177,4 +162,4 @@ Mustache is Copyright (C) 2009 Chris Wanstrath
 Original CTemplate by Google
 .
 .SH "SEE ALSO"
-mustache(5), mustache(7), gem(1), \fIhttp://mustache.github.com/\fR
+mustache(5), gem(1), \fIhttp://mustache\.github\.com/\fR

data/man/mustache.1.html

@@ -2,77 +2,86 @@
 <html>
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.5'>
-  <title>mustache(1) -- Mustache processor</title>
-  <style type='text/css'>
-    body {margin:0}
-    #man, #man code, #man pre, #man tt, #man kbd, #man samp {
-      font-family:consolas,monospace;
-      font-size:16px;
-      line-height:1.3;
-      color:#343331;
-      background:#fff; }
-    #man { max-width:89ex; text-align:justify; margin:0 25px 25px 25px }
-    #man h1, #man h2, #man h3 { color:#232221;clear:left }
-    #man h1 { font-size:28px; margin:15px 0 30px 0; text-align:center }
-    #man h2 { font-size:18px; margin-bottom:0; margin-top:10px; line-height:1.3; }
-    #man h3 { font-size:16px; margin:0 0 0 4ex; }
-    #man p, #man ul, #man ol, #man dl, #man pre { margin:0 0 18px 0; }
-    #man pre {
-      color:#333231;
-      background:#edeceb;
-      padding:5px 7px;
-      margin:0px 0 20px 0;
-      border-left:2ex solid #ddd}
-    #man pre + h2, #man pre + h3 {
-      margin-top:22px;
-    }
-    #man h2 + pre, #man h3 + pre {
-      margin-top:5px;
-    }
-    #man > p, #man > ul, #man > ol, #man > dl, #man > pre { margin-left:8ex; }
-    #man dt { margin:0; clear:left }
-    #man dt.flush { float:left; width:8ex }
-    #man dd { margin:0 0 0 9ex }
-    #man code, #man strong, #man b { font-weight:bold; color:#131211; }
-    #man pre code { font-weight:normal; color:#232221; background:inherit }
-    #man em, var, u {
-      font-style:normal; color:#333231; border-bottom:1px solid #999; }
-    #man h1.man-title { display:none; }
-    #man ol.man, #man ol.man li { margin:2px 0 10px 0; padding:0;
-      float:left; width:33%; list-style-type:none;
-      text-transform:uppercase; font-size:18px; color:#999;
-      letter-spacing:1px;}
-    #man ol.man { width:100%; }
-    #man ol.man li.tl { text-align:left }
-    #man ol.man li.tc { text-align:center;letter-spacing:4px }
-    #man ol.man li.tr { text-align:right }
-    #man ol.man a { color:#999 }
-    #man ol.man a:hover { color:#333231 }
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>mustache(1) - Mustache processor</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
   </style>
 </head>
-<body>
-<div id='man'>
-
-<h1 class='man-title'>mustache(1)</h1>
-
-<ol class='head man'>
-  <li class='tl'>mustache(1)</li>
-  <li class='tc'>Mustache Manual</li>
-  <li class='tr'>mustache(1)</li>
-</ol>
-
-<h2 id='NAME'>NAME</h2>
-<p><code>mustache</code> -- Mustache processor</p>
-
-<h2>SYNOPSIS</h2>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#INSTALLATION">INSTALLATION</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#COPYRIGHT">COPYRIGHT</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>mustache(1)</li>
+    <li class='tc'>Mustache Manual</li>
+    <li class='tr'>mustache(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>mustache</code> - <span class="man-whatis">Mustache processor</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <pre><code>mustache &lt;YAML> &lt;FILE>
 mustache --compile &lt;FILE>
 mustache --tokens &lt;FILE>
 </code></pre>
 
-<h2>DESCRIPTION</h2>
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>Mustache is a logic-less templating system for HTML, config files,
 anything.</p>
@@ -93,7 +102,7 @@ names: [ {name: chris}, {name: mark}, {name: scott} ]
 should work fine.</p>
 
 <p>After the frontmatter should come any valid Mustache template. See
-mustache(5) for an overview of Mustache templates.</p>
+<a href="mustache.5.ron.html" class="man-ref">mustache<span class="s">(5)</span></a> for an overview of Mustache templates.</p>
 
 <p>For example:</p>
 
@@ -143,7 +152,7 @@ Hi mark!
 Hi scott!
 </code></pre>
 
-<h2>OPTIONS</h2>
+<h2 id="OPTIONS">OPTIONS</h2>
 
 <p>By default <code>mustache</code> will try to render a Mustache template using the
 YAML frontmatter you provide. It can do a few other things, however.</p>
@@ -161,14 +170,14 @@ identified by examining the tokens produced.</p></dd>
 </dl>
 
 
-<h2>INSTALLATION</h2>
+<h2 id="INSTALLATION">INSTALLATION</h2>
 
 <p>If you have RubyGems installed:</p>
 
 <pre><code>gem install mustache
 </code></pre>
 
-<h2>EXAMPLES</h2>
+<h2 id="EXAMPLES">EXAMPLES</h2>
 
 <pre><code>$ mustache data.yml template.mustache
 $ cat data.yml | mustache - template.mustache
@@ -181,24 +190,24 @@ age: 30
 data
 </code></pre>
 
-<h2>COPYRIGHT</h2>
+<h2 id="COPYRIGHT">COPYRIGHT</h2>
 
 <p>Mustache is Copyright (C) 2009 Chris Wanstrath</p>
 
 <p>Original CTemplate by Google</p>
 
-<h2>SEE ALSO</h2>
+<h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p>mustache(5), mustache(7), gem(1),
-<a href="http://mustache.github.com/">http://mustache.github.com/</a></p>
+<p><a href="mustache.5.ron.html" class="man-ref">mustache<span class="s">(5)</span></a>, <span class="man-ref">gem<span class="s">(1)</span></span>,
+<a href="http://mustache.github.com/" data-bare-link="true">http://mustache.github.com/</a></p>
 
 
-<ol class='foot man'>
-  <li class='tl'>DEFUNKT</li>
-  <li class='tc'>May 2010</li>
-  <li class='tr'>mustache(1)</li>
-</ol>
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'>DEFUNKT</li>
+    <li class='tc'>August 2011</li>
+    <li class='tr'>mustache(1)</li>
+  </ol>
 
-</div>
+  </div>
 </body>
 </html>