Passing v1.1.2 of the Mustache spec.

lib/mustache/generator.rb

@@ -90,7 +90,7 @@ def compile!(exp)
 
     # 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)
+    def on_section(name, content, raw, delims)
       # Convert the tokenized content of this section into a Ruby
       # string we can use.
       code = compile(content)
@@ -102,7 +102,13 @@ def on_section(name, content, raw)
         if v == true
           #{code}
         elsif v.is_a?(Proc)
-          Mustache::Template.new(v.call(#{raw.inspect}).to_s).render(ctx.dup)
+          t = Mustache::Template.new(v.call(#{raw.inspect}).to_s)
+          def t.tokens(src=@source)
+            p = Parser.new
+            p.otag, p.ctag = #{delims.inspect}
+            p.compile(src)
+          end
+          t.render(ctx.dup)
         else
           # Shortcut when passed non-array
           v = [v] unless v.is_a?(Array) || defined?(Enumerator) && v.is_a?(Enumerator)
@@ -115,7 +121,7 @@ def on_section(name, content, raw)
 
     # 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, content, raw, _)
       # Convert the tokenized content of this section into a Ruby
       # string we can use.
       code = compile(content)

lib/mustache/parser.rb

@@ -157,7 +157,7 @@ def scan_tags
       when '/'
         section, pos, result = @sections.pop
         raw = @scanner.pre_match[pos[3]...pre_match_position] + padding
-        (@result = result).last << raw
+        (@result = result).last << raw << [self.otag, self.ctag]
 
         if section.nil?
           error "Closing unopened #{content.inspect}"

test/parser_test.rb

@@ -35,7 +35,8 @@ def test_parser
               [:static, "  <li><strong>"],
               [:mustache, :etag, [:mustache, :fetch, ["name"]]],
               [:static, "</strong></li>\n"]],
-            %Q'  <li><strong>{{name}}</strong></li>\n'],
+            %Q'  <li><strong>{{name}}</strong></li>\n',
+            %w[{{ }}]],
           [:mustache,
             :section,
             [:mustache, :fetch, ["link"]],
@@ -45,14 +46,17 @@ def test_parser
               [:static, "\">"],
               [:mustache, :etag, [:mustache, :fetch, ["name"]]],
               [: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'],
+            %Q'  <li><a href="{{url}}">{{name}}</a></li>\n',
+            %w[{{ }}]]],
+        %Q'{{#first}}\n  <li><strong>{{name}}</strong></li>\n{{/first}}\n{{#link}}\n  <li><a href="{{url}}">{{name}}</a></li>\n{{/link}}\n',
+        %w[{{ }}]],
       [:static, "\n"],
       [:mustache,
         :section,
         [:mustache, :fetch, ["empty"]],
         [:multi, [:static, "<p>The list is empty.</p>\n"]],
-        %Q'<p>The list is empty.</p>\n']]
+        %Q'<p>The list is empty.</p>\n',
+        %w[{{ }}]]]
 
     assert_equal expected, tokens
   end
@@ -66,7 +70,8 @@ def test_raw_content_and_whitespace
         :section,
         [:mustache, :fetch, ["list"]],
         [:multi, [:static, "\t"]],
-        "\t"]]
+        "\t",
+        %w[{{ }}]]]
 
     assert_equal expected, tokens
   end