mustache 0.11.2 → 0.12.0

data/README.md

@@ -208,9 +208,9 @@ you want to use in all your views? No problem.
 This is just Ruby, after all.
 
     module ViewHelpers
-      def gravatar(email, size = 30)
-        gravatar_id = Digest::MD5.hexdigest(email.to_s.strip.downcase)
-        gravatar_for_id(gravatar_id, size)
+      def gravatar
+        gravatar_id = Digest::MD5.hexdigest(self[:email].to_s.strip.downcase)
+        gravatar_for_id(gravatar_id)
       end
 
       def gravatar_for_id(gid, size = 30)
@@ -242,6 +242,10 @@ Then just include it:
       def in_ca
         true
       end
+
+      def users
+        User.all
+      end
     end
 
 Great, but what about that `@ssl` ivar in `gravatar_host`? There are
@@ -265,7 +269,13 @@ Now:
 
     Simple.new(request.ssl?).render
 
-Convoluted but you get the idea.
+Finally, our template might look like this:
+
+    <ul>
+      {{# users}}
+        <li><img src="{{ gravatar }}"> {{ login }}</li>
+      {{/ users}}
+    </ul>
 
 
 Sinatra

data/lib/mustache.rb

@@ -70,7 +70,10 @@ require 'mustache/context'
 # for files containing view classes when using the `view_class` method.
 #
 class Mustache
-  # Helper method for quickly instantiating and rendering a view.
+  # Instantiates an instance of this class and calls `render` with
+  # the passed args.
+  #
+  # Returns a rendered String version of a template
   def self.render(*args)
     new.render(*args)
   end
@@ -288,7 +291,7 @@ class Mustache
     end
   end
 
-  # Return the value of the configuration setting on the superclass, or return 
+  # 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.
@@ -341,8 +344,27 @@ class Mustache
 
   # Parses our fancy pants template file and returns normal file with
   # all special {{tags}} and {{#sections}}replaced{{/sections}}.
+  #
+  # data - A String template or a Hash context. If a Hash is given,
+  #        we'll try to figure out the template from the class.
+  #  ctx - A Hash context if `data` is a String template.
+  #
+  # Examples
+  #
+  #   @view.render("Hi {{thing}}!", :thing => :world)
+  #
+  #   View.template = "Hi {{thing}}!"
+  #   @view = View.new
+  #   @view.render(:thing => :world)
+  #
+  # Returns a rendered String version of a template
   def render(data = template, ctx = {})
-    tpl = templateify(data)
+    if data.is_a? Hash
+      ctx = data
+      tpl = templateify(template)
+    else
+      tpl = templateify(data)
+    end
 
     return tpl.render(context) if ctx == {}
 

data/lib/mustache/context.rb

@@ -12,6 +12,8 @@ class Mustache
   # A Context represents the context which a Mustache template is
   # executed within. All Mustache tags reference keys in the Context.
   class Context
+    attr_accessor :frame, :key
+
     # Expect to be passed an instance of `Mustache`.
     def initialize(mustache)
       @stack = [mustache]
@@ -23,12 +25,15 @@ class Mustache
     # If the Mustache view handling the rendering (e.g. the view
     # representing your profile page or some other template) responds
     # to `partial`, we call it and render the result.
-    def partial(name)
+    def partial(name, indentation = '')
       # Look for the first Mustache in the stack.
       mustache = mustache_in_stack
 
       # Call its `partial` method and render the result.
-      mustache.render(mustache.partial(name), self)
+      result = mustache.render(mustache.partial(name), self)
+
+      # Indent the rendered partial by the given indentation.
+      result.gsub(/^/, indentation)
     end
 
     # Find the first Mustache in the stack. If we're being rendered
@@ -82,9 +87,12 @@ class Mustache
     # If no second parameter is passed (or raise_on_context_miss is
     # set to true), will raise a ContextMiss exception on miss.
     def fetch(name, default = :__raise)
+      @key = name
+
       @stack.each do |frame|
         # Prevent infinite recursion.
         next if frame == self
+        @frame = frame
 
         # Is this frame a hash?
         hash = frame.respond_to?(:has_key?)
@@ -92,12 +100,16 @@ class Mustache
         if hash && frame.has_key?(name)
           return frame[name]
         elsif hash && frame.has_key?(name.to_s)
+          @key = name.to_s
           return frame[name.to_s]
         elsif !hash && frame.respond_to?(name)
+          @frame = nil
           return frame.__send__(name)
         end
       end
 
+      @frame = @key = nil
+
       if default == :__raise || mustache_in_stack.raise_on_context_miss?
         raise ContextMiss.new("Can't find #{name} in #{@stack.inspect}")
       else

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)
+    def on_section(name, content, raw)
       # Convert the tokenized content of this section into a Ruby
       # string we can use.
       code = compile(content)
@@ -102,9 +102,11 @@ class Mustache
         if v == true
           #{code}
         elsif v.is_a?(Proc)
-          v.call(#{code})
+          Mustache::Template.new(v.call(#{raw.inspect}).to_s).render(ctx.dup)
         else
-          v = [v] unless v.is_a?(Array) # shortcut when passed non-array
+          # Shortcut when passed non-array
+          v = [v] if v.respond_to?(:has_key?) || !v.respond_to?(:map)
+
           v.map { |h| ctx.push(h); r = #{code}; ctx.pop; r }.join
         end
       end
@@ -113,7 +115,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)
+    def on_inverted_section(name, content, raw)
       # Convert the tokenized content of this section into a Ruby
       # string we can use.
       code = compile(content)
@@ -131,18 +133,28 @@ 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)
-      ev("ctx.partial(#{name.to_sym.inspect})")
+    def on_partial(name, indentation)
+      ev("ctx.partial(#{name.to_sym.inspect}, #{indentation.inspect})")
     end
 
     # An unescaped tag.
     def on_utag(name)
-      ev("ctx[#{name.to_sym.inspect}]")
+      ev(<<-compiled)
+        v = ctx[#{name.to_sym.inspect}]
+        v = Mustache::Template.new(v.call.to_s).render(ctx.dup) if v.is_a?(Proc)
+        ctx.frame[ctx.key] = v if ctx.frame.is_a?(Hash)
+        v.to_s
+      compiled
     end
 
     # An escaped tag.
     def on_etag(name)
-      ev("CGI.escapeHTML(ctx[#{name.to_sym.inspect}].to_s)")
+      ev(<<-compiled)
+        v = ctx[#{name.to_sym.inspect}]
+        v = Mustache::Template.new(v.call.to_s).render(ctx.dup) if v.is_a?(Proc)
+        ctx.frame[ctx.key] = v if ctx.frame.is_a?(Hash)
+        CGI.escapeHTML(v.to_s)
+      compiled
     end
 
     # An interpolation-friendly version of a string, for use within a

data/lib/mustache/parser.rb

@@ -29,7 +29,7 @@ class Mustache
     class SyntaxError < StandardError
       def initialize(message, position)
         @message = message
-        @lineno, @column, @line = position
+        @lineno, @column, @line, _ = position
         @stripped_line = @line.strip
         @stripped_column = @column - (@line.size - @line.lstrip.size)
       end
@@ -44,8 +44,10 @@ EOF
       end
     end
 
-    # After these types of tags, all whitespace will be skipped.
-    SKIP_WHITESPACE = [ '#', '^', '/' ]
+    # After these types of tags, all whitespace until the end of the line will
+    # be skipped if they are the first (and only) non-whitespace content on
+    # the line.
+    SKIP_WHITESPACE = [ '#', '^', '/', '<', '>', '=', '!' ]
 
     # The content allowed in a tag name.
     ALLOWED_CONTENT = /(\w|[?!\/-])*/
@@ -104,7 +106,18 @@ EOF
     # Find {{mustaches}} and add them to the @result array.
     def scan_tags
       # Scan until we hit an opening delimiter.
-      return unless @scanner.scan(regexp(otag))
+      start_of_line = @scanner.beginning_of_line?
+      pre_match_position = @scanner.pos
+
+      return unless x = @scanner.scan(/([ \t]*)?#{Regexp.escape(otag)}/)
+      padding = @scanner[1] || ''
+
+      # Don't touch the preceding whitespace unless we're matching the start
+      # of a new line.
+      unless start_of_line
+        @result << [:static, padding] unless padding.empty?
+        padding = ''
+      end
 
       # Since {{= rewrites ctag, we store the ctag which should be used
       # when parsing this specific tag.
@@ -138,7 +151,8 @@ EOF
         @result = block
       when '/'
         section, pos, result = @sections.pop
-        @result = result
+        raw = @scanner.pre_match[pos[3]...pre_match_position] + padding
+        (@result = result).last << raw
 
         if section.nil?
           error "Closing unopened #{content.inspect}"
@@ -150,7 +164,7 @@ EOF
       when '='
         self.otag, self.ctag = content.split(' ', 2)
       when '>', '<'
-        @result << [:mustache, :partial, content]
+        @result << [:mustache, :partial, content, padding]
       when '{', '&'
         # The closing } in unescaped tags is just a hack for
         # aesthetics.
@@ -170,24 +184,38 @@ EOF
         error "Unclosed tag"
       end
 
-      # Skip whitespace following this tag if we need to.
-      @scanner.skip(/\s+/) if SKIP_WHITESPACE.include?(type)
+      # If this tag was the only non-whitespace content on this line, strip
+      # the remaining whitespace.  If not, but we've been hanging on to padding
+      # from the beginning of the line, re-insert the padding as static text.
+      if start_of_line
+        if SKIP_WHITESPACE.include?(type)
+          @scanner.skip(/[ \t]*\n/)
+        else
+          @result.insert(-2, [:static, padding]) unless padding.empty?
+        end
+      end
+
+      return unless @result == [:multi]
+
+      # Store off the current scanner position now that we've closed the tag
+      # and consumed any irrelevant whitespace.
+      @sections.last[1] << @scanner.pos unless @sections.empty?
     end
 
     # Try to find static text, e.g. raw HTML with no {{mustaches}}.
     def scan_text
-      text = scan_until_exclusive(regexp(otag))
+      text = scan_until_exclusive(/(^[ \t]*)?#{Regexp.escape(otag)}/)
 
       if text.nil?
         # Couldn't find any otag, which means the rest is just static text.
         text = @scanner.rest
         # Mark as done.
-        @scanner.clear
+        @scanner.terminate
       end
 
       text.force_encoding(@encoding) if @encoding
 
-      @result << [:static, text]
+      @result << [:static, text] unless text.empty?
     end
 
     # Scans the string until the pattern is matched. Returns the substring

data/lib/mustache/sinatra.rb

@@ -51,11 +51,6 @@ class Mustache
           options = settings.send(:mustache).merge(options)
         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 they aren't explicitly disabling layouts, try to find
         # one.
         if options[:layout] != false
@@ -76,12 +71,18 @@ class Mustache
             layout = layout.new
           end
 
-          # Does the view subclass the layout? If so we'll use the
-          # view to render the layout so you can override layout
-          # methods in your view - tricky.
-          view_subclasses_layout = klass < layout.class if layout
         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)
+        
+        # Does the view subclass the layout? If so we'll use the
+        # view to render the layout so you can override layout
+        # methods in your view - tricky.
+        view_subclasses_layout = klass < layout.class if layout
+        
         # Create a new instance for playing with.
         instance = klass.new
 

data/lib/mustache/template.rb

@@ -21,7 +21,6 @@ class Mustache
     # path, which it uses to find partials.
     def initialize(source)
       @source = source
-      @tmpid = 0
     end
 
     # Renders the `@source` Mustache template using the given
@@ -47,7 +46,7 @@ class Mustache
     # Does the dirty work of transforming a Mustache template into an
     # interpolation-friendly Ruby string.
     def compile(src = @source)
-      Generator.new.compile(tokens)
+      Generator.new.compile(tokens(src))
     end
     alias_method :to_s, :compile
 

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = VERSION = '0.11.2'
+  Version = VERSION = '0.12.0'
 end

data/test/fixtures/crazy_recursive.mustache

@@ -2,7 +2,7 @@
   <body>
     <ul>
       {{#top_nodes}}
-        {{> node}}
+      {{> node}}
       {{/top_nodes}}
     </ul>
   </body>

data/test/fixtures/lambda.mustache

@@ -1,3 +1,7 @@
-{{#cached}}
+{{#rendered}}
 Hi {{name}}.
-{{/cached}}
+{{/rendered}}
+
+{{#not_rendered}}
+Hi {{name}}.
+{{/not_rendered}}

data/test/fixtures/lambda.rb

@@ -12,7 +12,7 @@ class Lambda < Mustache
     @cached = nil
   end
 
-  def cached
+  def rendered
     lambda do |text|
       return @cached if @cached
 
@@ -20,6 +20,10 @@ class Lambda < Mustache
       @cached = render(text)
     end
   end
+
+  def not_rendered
+    lambda { |text| "{{= | =}}#{text}" }
+  end
 end
 
 if $0 == __FILE__

data/test/fixtures/node.mustache

@@ -2,7 +2,7 @@
   {{contents}}
   <ul>
     {{#children}}
-      {{> node}}
+    {{> node}}
     {{/children}}
   </ul>
-</li>
+</li>

data/test/fixtures/partial_with_module.mustache

@@ -1,3 +1,4 @@
 <h1>{{greeting}}</h1>
 {{>simple}}
+
 <h3>{{farewell}}</h3>

data/test/fixtures/utf8_partial.mustache

@@ -1 +1 @@
-<h2>中文又来啦</h2>
+<h2>中文又来啦</h2>

data/test/mustache_test.rb

@@ -3,6 +3,17 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'helper'
 
 class MustacheTest < Test::Unit::TestCase
+  def test_instance_render
+    klass = Class.new(Mustache)
+    klass.template = "Hi {{thing}}!"
+    assert_equal "Hi world!", klass.render(:thing => :world)
+    assert_equal "Nice.", klass.render("{{compliment}}.", :compliment => "Nice")
+    assert_equal <<-end_simple, Simple.new.render(:name => "yo", :in_ca => false)
+Hello yo
+You have just won $10000!
+end_simple
+  end
+
   def test_passenger
     assert_equal <<-end_passenger, Passenger.to_text
 <VirtualHost *>
@@ -16,22 +27,24 @@ end_passenger
   def test_complex_view
     assert_equal <<-end_complex, ComplexView.render
 <h1>Colors</h1>
-<ul>
-  <li><strong>red</strong></li>
-    <li><a href="#Green">green</a></li>
-    <li><a href="#Blue">blue</a></li>
-    </ul>
+  <ul>
+      <li><strong>red</strong></li>
+      <li><a href="#Green">green</a></li>
+      <li><a href="#Blue">blue</a></li>
+  </ul>
+
 end_complex
   end
 
   def test_nested_objects
     assert_equal <<-end_complex, NestedObjects.render
 <h1>Colors</h1>
-<ul>
-  <li><strong>red</strong></li>
-    <li><a href="#Green">green</a></li>
-    <li><a href="#Blue">blue</a></li>
-    </ul>
+  <ul>
+      <li><strong>red</strong></li>
+      <li><a href="#Green">green</a></li>
+      <li><a href="#Blue">blue</a></li>
+  </ul>
+
 end_complex
   end
 
@@ -41,9 +54,7 @@ end_complex
     instance = Mustache.new
     instance.template = html
     instance[:no_flash] = true
-    assert_equal <<-rendered.strip, instance.render
-<p class="flash-notice" style="display: none;">
-rendered
+    assert_equal %Q'<p class="flash-notice" style="display: none;">', instance.render
   end
 
   def test_two_line_sections
@@ -52,9 +63,7 @@ rendered
     instance = Mustache.new
     instance.template = html
     instance[:no_flash] = true
-    assert_equal <<-rendered.strip, instance.render
-<p class="flash-notice" style="display: none;"\n>
-rendered
+    assert_equal %Q'<p class="flash-notice" style="display: none;"\n>', instance.render
   end
 
   def test_multi_line_sections_preserve_trailing_newline
@@ -67,7 +76,7 @@ Howday.
 template
 
     view[:something] = true
-    assert_equal <<-rendered.strip, view.render.strip
+    assert_equal <<-rendered, view.render
 yay
 Howday.
 rendered
@@ -78,9 +87,7 @@ rendered
 
     instance = Mustache.new
     instance.template = html
-    assert_equal <<-rendered.strip, instance.render
-<p class="flash-notice" style="display: none;">
-rendered
+    assert_equal %Q'<p class="flash-notice" style="display: none;">', instance.render
   end
 
   def test_simple
@@ -131,29 +138,26 @@ end_simple
 
   def test_delimiters
     assert_equal <<-end_template, Delimiters.render
-
 * It worked the first time.
-
 * And it worked the second time.
 * As well as the third.
-
 * Then, surprisingly, it worked the final time.
 end_template
   end
 
   def test_double_section
-    assert_equal <<-end_section.strip, DoubleSection.render.strip
-* first
+    assert_equal <<-end_section, DoubleSection.render
+  * first
 * second
-* third
+  * third
 end_section
   end
 
   def test_inverted_section
-    assert_equal <<-end_section.strip, InvertedSection.render.strip
-* first
+    assert_equal <<-end_section, InvertedSection.render
+  * first
 * second
-* third
+  * third
 end_section
   end
 
@@ -231,7 +235,7 @@ data
     end
     instance.template = '{{#show}} <li>{{die}}</li> {{/show}} yay'
 
-    assert_equal "yay", instance.render
+    assert_equal " yay", instance.render
   end
 
   def test_reports_unclosed_sections
@@ -265,7 +269,7 @@ data
     instance[:list] = { :item => 1234 }
     instance.template = '{{#list}} <li>{{item}}</li> {{/list}}'
 
-    assert_equal '<li>1234</li>', instance.render.strip
+    assert_equal ' <li>1234</li> ', instance.render
   end
 
   def test_enumerable_sections_accept_a_string_keyed_hash_as_a_context
@@ -273,14 +277,14 @@ data
     instance[:list] = { 'item' => 1234 }
     instance.template = '{{#list}} <li>{{item}}</li> {{/list}}'
 
-    assert_equal '<li>1234</li>', instance.render.strip
+    assert_equal ' <li>1234</li> ', instance.render
   end
 
   def test_not_found_in_context_renders_empty_string
     instance = Mustache.new
     instance.template = '{{#list}} <li>{{item}}</li> {{/list}}'
 
-    assert_equal '', instance.render.strip
+    assert_equal '', instance.render
   end
 
   def test_not_found_in_nested_context_renders_empty_string
@@ -288,7 +292,7 @@ data
     instance[:list] = { :item => 1234 }
     instance.template = '{{#list}} <li>{{prefix}}{{item}}</li> {{/list}}'
 
-    assert_equal '<li>1234</li>', instance.render.strip
+    assert_equal ' <li>1234</li> ', instance.render
   end
 
   def test_not_found_in_context_raises_when_asked_to
@@ -297,7 +301,7 @@ data
     instance.template = '{{#list}} <li>{{item}}</li> {{/list}}'
 
     assert_raises Mustache::ContextMiss do
-      instance.render.strip
+      instance.render
     end
   end
 
@@ -343,13 +347,13 @@ data
     view = Lambda.new
     view[:name] = 'Chris'
 
-    assert_equal "Hi Chris.", view.render.chomp
+    assert_equal "Hi Chris.\n\nHi {{name}}.", view.render.chomp
     assert_equal 1, view.calls
 
-    assert_equal "Hi Chris.", view.render.chomp
+    assert_equal "Hi Chris.\n\nHi {{name}}.", view.render.chomp
     assert_equal 1, view.calls
 
-    assert_equal "Hi Chris.", view.render.chomp
+    assert_equal "Hi Chris.\n\nHi {{name}}.", view.render.chomp
     assert_equal 1, view.calls
   end
 
@@ -380,7 +384,7 @@ data
 {{#items}}
 start
 {{#items}}
-  {{a}}
+{{a}}
 {{/items}}
 end
 {{/items}}
@@ -414,14 +418,14 @@ expected
   end
 
   def test_id_with_nested_context
-    html = %(<div>{{id}}</div>\n<div>{{# has_a? }}{{id}}{{/ has_a? }}</div>\n<div>{{# has_b? }}{{id}}{{/ has_b? }}</div>)
+    html = %(<div>{{id}}</div>\n<div>{{# has_a? }}{{id}}{{/ has_a? }}</div>\n<div>{{# has_b? }}{{id}}{{/ has_b? }}</div>\n)
 
     instance = Mustache.new
     instance.template = html
     instance[:id] = 3
     instance[:has_a?] = true
     instance[:has_b?] = true
-    assert_equal <<-rendered.strip, instance.render
+    assert_equal <<-rendered, instance.render
 <div>3</div>
 <div>3</div>
 <div>3</div>
@@ -473,4 +477,64 @@ template
       assert_equal value, tmpl.send(attr)
     end
   end
+    def test_array_of_arrays
+    template = <<template
+{{#items}}
+start
+{{#map}}
+{{a}}
+{{/map}}
+end
+{{/items}}
+template
+
+    data = {
+      "items" => [
+        [ {"a" => 1}, {"a" => 2}, {"a" => 3} ],
+        [ {"a" => 4}, {"a" => 5}, {"a" => 6} ],
+        [ {"a" => 7}, {"a" => 8}, {"a" => 9} ]
+      ]
+    }
+
+    assert_equal <<expected, Mustache.render(template, data)
+start
+1
+2
+3
+end
+start
+4
+5
+6
+end
+start
+7
+8
+9
+end
+expected
+  end
+      def test_indentation_again
+    template = <<template
+SELECT
+  {{#cols}}
+    {{name}},
+  {{/cols}}
+FROM
+  DUMMY1
+template
+
+    view = Mustache.new
+    view[:cols] = [{:name => 'Name'}, {:name => 'Age'}, {:name => 'Weight'}]
+    view.template = template
+
+    assert_equal <<template, view.render
+SELECT
+    Name,
+    Age,
+    Weight,
+FROM
+  DUMMY1
+template
+  end
 end

data/test/parser_test.rb

@@ -32,22 +32,27 @@ EOF
             :section,
             "first",
             [:multi,
-              [:static, "<li><strong>"],
+              [:static, "  <li><strong>"],
               [:mustache, :etag, "name"],
-              [:static, "</strong></li>\n"]]],
+              [:static, "</strong></li>\n"]],
+            %Q'  <li><strong>{{name}}</strong></li>\n'],
           [:mustache,
             :section,
             "link",
             [:multi,
-              [:static, "<li><a href=\""],
+              [:static, "  <li><a href=\""],
               [:mustache, :etag, "url"],
               [:static, "\">"],
               [:mustache, :etag, "name"],
-              [:static, "</a></li>\n"]]]]],
+              [:static, "</a></li>\n"]],
+            %Q'  <li><a href="{{url}}">{{name}}</a></li>\n']],
+        %Q'{{#first}}\n  <li><strong>{{name}}</strong></li>\n{{/first}}\n{{#link}}\n  <li><a href="{{url}}">{{name}}</a></li>\n{{/link}}\n'],
+      [:static, "\n"],
       [:mustache,
         :section,
         "empty",
-        [:multi, [:static, "<p>The list is empty.</p>\n"]]]]
+        [:multi, [:static, "<p>The list is empty.</p>\n"]],
+        %Q'<p>The list is empty.</p>\n']]
 
     assert_equal expected, tokens
   end

data/test/partial_test.rb

@@ -99,36 +99,36 @@ end_partial
   <body>
     <ul>
       <li>
-  1
-  <ul>
-    <li>
-  2
-  <ul>
-    <li>
-  3
-  <ul>
+        1
+        <ul>
+          <li>
+            2
+            <ul>
+              <li>
+                3
+                <ul>
+                </ul>
+              </li>
+            </ul>
+          </li>
+          <li>
+            4
+            <ul>
+              <li>
+                5
+                <ul>
+                  <li>
+                    6
+                    <ul>
+                    </ul>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </li>
     </ul>
-</li>
-    </ul>
-</li>
-    <li>
-  4
-  <ul>
-    <li>
-  5
-  <ul>
-    <li>
-  6
-  <ul>
-    </ul>
-</li>
-    </ul>
-</li>
-    </ul>
-</li>
-    </ul>
-</li>
-      </ul>
   </body>
 </html>
 end_partial

data/test/spec_test.rb

@@ -0,0 +1,68 @@
+require 'mustache'
+require 'tmpdir'
+require 'yaml'
+require 'test/unit'
+
+# Automatically process !code types into Proc objects
+YAML::add_builtin_type('code') { |_, val| eval(val['ruby']) }
+
+# A simple base class for Mustache specs.
+# Creates a partials directory, then points a (dynamic) subclass of Mustache at
+# that directory before each test; the partials directory is destroyed after
+# each test is run.
+class MustacheSpec < Test::Unit::TestCase
+  def setup
+    @partials = File.join(File.dirname(__FILE__), 'partials')
+    Dir.mkdir(@partials)
+
+    @Mustache = Class.new(Mustache)
+    @Mustache.template_path = @partials
+  end
+
+  def teardown
+    Dir[File.join(@partials, '*')].each { |file| File.delete(file) }
+    Dir.rmdir(@partials)
+  end
+
+  # Extracts the partials from the test, and dumps them into the partials
+  # directory for inclusion.
+  def setup_partials(test)
+    (test['partials'] || {}).each do |name, content|
+      File.open(File.join(@partials, "#{name}.mustache"), 'w') do |f|
+        f.print(content)
+      end
+    end
+  end
+
+  # Asserts equality between the rendered template and the expected value,
+  # printing additional context data on failure.
+  def assert_mustache_spec(test)
+    actual = @Mustache.render(test['template'], test['data'])
+
+    assert_equal test['expected'], actual, "" <<
+      "#{ test['desc'] }\n" <<
+      "Data: #{ test['data'].inspect }\n" <<
+      "Template: #{ test['template'].inspect }\n" <<
+      "Partials: #{ (test['partials'] || {}).inspect }\n"
+  end
+
+  def test_noop; assert(true); end
+end
+
+spec_files = File.join(File.dirname(__FILE__), '..', 'ext', 'spec', 'specs', '*.yml')
+Dir[spec_files].each do |file|
+  spec = YAML.load_file(file)
+
+  Class.new(MustacheSpec) do
+    define_method :name do
+      File.basename(file).sub(/^./, &:upcase)
+    end
+
+    spec['tests'].each do |test|
+      define_method :"test - #{test['name']}" do
+        setup_partials(test)
+        assert_mustache_spec(test)
+      end
+    end
+  end
+end

data/test/template_test.rb

@@ -0,0 +1,20 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'helper'
+
+class TemplateTest < Test::Unit::TestCase
+  def test_compile
+    assert_equal %("foo"), Mustache::Template.new("foo").compile
+  end
+
+  def test_compile_with_source
+    assert_equal %("bar"), Mustache::Template.new("foo").compile("bar")
+  end
+
+  def test_token
+    assert_equal [:multi, [:static, "foo"]], Mustache::Template.new("foo").tokens
+  end
+
+  def test_token_with_source
+    assert_equal [:multi, [:static, "bar"]], Mustache::Template.new("foo").tokens("bar")
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
+  hash: 47
   prerelease: false
   segments: 
   - 0
-  - 11
-  - 2
-  version: 0.11.2
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -07:00
+date: 2010-12-10 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -102,6 +103,8 @@ files:
 - test/mustache_test.rb
 - test/parser_test.rb
 - test/partial_test.rb
+- test/spec_test.rb
+- test/template_test.rb
 has_rdoc: true
 homepage: http://github.com/defunkt/mustache
 licenses: []
@@ -112,23 +115,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mustache is a framework-agnostic way to render logic-free views.