mustache 0.99.3 → 0.99.4

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)
+    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 @@ class Mustache
         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 @@ 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, content, raw, _)
       # Convert the tokenized content of this section into a Ruby
       # string we can use.
       code = compile(content)

data/lib/mustache/parser.rb

@@ -157,7 +157,7 @@ EOF
       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}"

data/lib/mustache/sinatra.rb

@@ -88,11 +88,6 @@ class Mustache
         # Copy instance variables set in Sinatra to the view
         instance_variables.each do |name|
           instance.instance_variable_set(name, instance_variable_get(name))
-
-          # Automagic attr_readers for ivars you set in Sinatra routes.
-          if !instance.respond_to?(name)
-            (class << instance; self end).send(:attr_reader, name.to_s.sub('@',''))
-          end
         end
 
         # Render with locals.

data/lib/mustache/version.rb

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

data/test/parser_test.rb

@@ -35,7 +35,8 @@ EOF
               [: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 @@ EOF
               [: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 @@ EOF
         :section,
         [:mustache, :fetch, ["list"]],
         [:multi, [:static, "\t"]],
-        "\t"]]
+        "\t",
+        %w[{{ }}]]]
 
     assert_equal expected, tokens
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  hash: 405
-  prerelease: false
+  hash: 411
+  prerelease: 
   segments: 
   - 0
   - 99
-  - 3
-  version: 0.99.3
+  - 4
+  version: 0.99.4
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -07:00
+date: 2011-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Mustache is a framework-agnostic way to render logic-free views.