tilt 1.2.1 → 1.2.2

data/lib/tilt.rb

@@ -1,6 +1,6 @@
 module Tilt
   TOPOBJECT = defined?(BasicObject) ? BasicObject : Object
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 
   @template_mappings = {}
 
@@ -164,6 +164,10 @@ module Tilt
         raise NotImplementedError
       end
     end
+    
+    def evaluate(scope, locals, &block)
+      cached_evaluate(scope, locals, &block)
+    end
 
     # Process the template and return the result. The first time this
     # method is called, the template source is evaluated with instance_eval.
@@ -171,9 +175,9 @@ module Tilt
     # unbound method which will lead to better performance. In any case,
     # template executation is guaranteed to be performed in the scope object
     # with the locals specified and with support for yielding to the block.
-    def evaluate(scope, locals, &block)
+    def cached_evaluate(scope, locals, &block)
       # Redefine itself to use method compilation the next time:
-      def self.evaluate(scope, locals, &block)
+      def self.cached_evaluate(scope, locals, &block)
         method = compiled_method(locals.keys)
         method.bind(scope).call(locals, &block)
       end
@@ -620,17 +624,24 @@ module Tilt
     end
 
     def prepare; end
-
+    
     def evaluate(scope, locals, &block)
-      xml = ::Nokogiri::XML::Builder.new
+      block &&= proc { yield.gsub(/^<\?xml version=\"1\.0\"\?>\n?/, "") }
+      
       if data.respond_to?(:to_str)
-        locals[:xml] = xml
-        block &&= proc { yield.gsub(/^<\?xml version=\"1\.0\"\?>\n?/, "") }
         super(scope, locals, &block)
-      elsif data.kind_of?(Proc)
-        data.call(xml)
+      else
+        ::Nokogiri::XML::Builder.new.tap(&data).to_xml
       end
-      xml.to_xml
+    end
+
+    def precompiled_preamble(locals)
+      return super if locals.include? :xml
+      "xml = ::Nokogiri::XML::Builder.new\n#{super}"
+    end
+
+    def precompiled_postamble(locals)
+      "xml.to_xml"
     end
 
     def precompiled_template(locals)
@@ -647,20 +658,24 @@ module Tilt
       require_template_library 'builder'
     end
 
-    def prepare
-    end
+    def prepare; end
 
     def evaluate(scope, locals, &block)
+      return super(scope, locals, &block) if data.respond_to?(:to_str)
       xml = ::Builder::XmlMarkup.new(:indent => 2)
-      if data.respond_to?(:to_str)
-        locals[:xml] = xml
-        super(scope, locals, &block)
-      elsif data.kind_of?(Proc)
-        data.call(xml)
-      end
+      data.call(xml)
       xml.target!
     end
 
+    def precompiled_preamble(locals)
+      return super if locals.include? :xml
+      "xml = ::Builder::XmlMarkup.new(:indent => 2)\n#{super}"
+    end
+
+    def precompiled_postamble(locals)
+      "xml.target!"
+    end
+
     def precompiled_template(locals)
       data.to_str
     end

data/test/tilt_blueclothtemplate_test.rb

@@ -10,14 +10,14 @@ begin
       Tilt.register('md', Tilt::BlueClothTemplate)
       Tilt.register('mkd', Tilt::BlueClothTemplate)
     end
-    
+
     teardown do
       # Need to revert to RDiscount, otherwise the RDiscount test will fail
       Tilt.register('markdown', Tilt::RDiscountTemplate)
       Tilt.register('md', Tilt::RDiscountTemplate)
       Tilt.register('mkd', Tilt::RDiscountTemplate)
     end
-    
+
     test "registered for '.markdown' files unless RDiscount is loaded" do
       unless defined?(RDiscount)
         assert_equal Tilt::BlueClothTemplate, Tilt['test.markdown']
@@ -41,6 +41,11 @@ begin
       assert_equal "<h1>Hello World!</h1>", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::BlueClothTemplate.new { |t| "# Hello World!" }
+      3.times { assert_equal "<h1>Hello World!</h1>", template.render }
+    end
+
     test "smartypants when :smart is set" do
       template = Tilt::BlueClothTemplate.new(:smartypants => true) { |t|
         "OKAY -- 'Smarty Pants'" }

data/test/tilt_buildertemplate_test.rb

@@ -14,6 +14,11 @@ begin
       assert_equal "<em>Hello World!</em>\n", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::BuilderTemplate.new { |t| "xml.em 'Hello World!'" }
+      3.times { assert_equal "<em>Hello World!</em>\n", template.render }
+    end
+
     test "passing locals" do
       template = Tilt::BuilderTemplate.new { "xml.em('Hey ' + name + '!')" }
       assert_equal "<em>Hey Joe!</em>\n", template.render(Object.new, :name => 'Joe')
@@ -28,7 +33,7 @@ begin
 
     test "passing a block for yield" do
       template = Tilt::BuilderTemplate.new { "xml.em('Hey ' + yield + '!')" }
-      assert_equal "<em>Hey Joe!</em>\n", template.render { 'Joe' }
+      3.times { assert_equal "<em>Hey Joe!</em>\n", template.render { 'Joe' }}
     end
 
     test "block style templates" do
@@ -38,6 +43,16 @@ begin
         end
       assert_equal "<em>Hey Joe!</em>\n", template.render
     end
+
+    test "allows nesting raw XML" do
+      subtemplate = Tilt::BuilderTemplate.new { "xml.em 'Hello World!'" }
+      template = Tilt::BuilderTemplate.new { "xml.strong { xml << yield }" }
+      3.times do
+        options = { :xml => Builder::XmlMarkup.new }
+        assert_equal "<strong>\n<em>Hello World!</em>\n</strong>\n",
+          template.render(options) { subtemplate.render(options) }
+      end
+    end
   end
 rescue LoadError
   warn "Tilt::BuilderTemplate (disabled)"

data/test/tilt_coffeescripttemplate_test.rb

@@ -14,6 +14,11 @@ begin
       assert_match "puts('Hello, World!');", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::CoffeeScriptTemplate.new { |t| "puts 'Hello, World!'\n" }
+      3.times { assert_match "puts('Hello, World!');", template.render }
+    end
+
     test "disabling coffee-script wrapper" do
       template = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { |t| "puts 'Hello, World!'\n" }
       assert_equal "puts('Hello, World!');", template.render

data/test/tilt_erbtemplate_test.rb

@@ -19,6 +19,11 @@ class ERBTemplateTest < Test::Unit::TestCase
     assert_equal "Hello World!", template.render
   end
 
+  test "can be rendered more than once" do
+    template = Tilt::ERBTemplate.new { |t| "Hello World!" }
+    3.times { assert_equal "Hello World!", template.render }
+  end
+
   test "passing locals" do
     template = Tilt::ERBTemplate.new { 'Hey <%= name %>!' }
     assert_equal "Hey Joe!", template.render(Object.new, :name => 'Joe')

data/test/tilt_erubistemplate_test.rb

@@ -14,6 +14,11 @@ begin
       assert_equal "Hello World!", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::ErubisTemplate.new { |t| "Hello World!" }
+      3.times { assert_equal "Hello World!", template.render }
+    end
+
     test "passing locals" do
       template = Tilt::ErubisTemplate.new { 'Hey <%= name %>!' }
       assert_equal "Hey Joe!", template.render(Object.new, :name => 'Joe')

data/test/tilt_hamltemplate_test.rb

@@ -17,6 +17,11 @@ begin
       assert_equal "<p>Hello World!</p>\n", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::HamlTemplate.new { |t| "%p Hello World!" }
+      3.times { assert_equal "<p>Hello World!</p>\n", template.render }
+    end
+
     test "passing locals" do
       template = Tilt::HamlTemplate.new { "%p= 'Hey ' + name + '!'" }
       assert_equal "<p>Hey Joe!</p>\n", template.render(Object.new, :name => 'Joe')

data/test/tilt_lesstemplate_test.rb

@@ -13,6 +13,11 @@ begin
       template = Tilt::LessTemplate.new { |t| ".bg { background-color: #0000ff; } \n#main\n { .bg; }\n" }
       assert_equal ".bg, #main { background-color: #0000ff; }\n", template.render
     end
+
+    test "can be rendered more than once" do
+      template = Tilt::LessTemplate.new { |t| ".bg { background-color: #0000ff; } \n#main\n { .bg; }\n" }
+      3.times { assert_equal ".bg, #main { background-color: #0000ff; }\n", template.render }
+    end
   end
 
 rescue LoadError => boom

data/test/tilt_liquidtemplate_test.rb

@@ -14,6 +14,11 @@ begin
       assert_equal "Hello World!", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::LiquidTemplate.new { |t| "Hello World!" }
+      3.times { assert_equal "Hello World!", template.render }
+    end
+
     test "passing locals" do
       template = Tilt::LiquidTemplate.new { "Hey {{ name }}!" }
       assert_equal "Hey Joe!", template.render(nil, :name => 'Joe')

data/test/tilt_markaby_test.rb

@@ -26,6 +26,11 @@ begin
       assert_equal "<html></html>", tilt.render
     end
 
+    test "can be rendered more than once" do
+      tilt = ::Tilt::MarkabyTemplate.new { "html do; end" }
+      3.times { assert_equal "<html></html>", tilt.render }
+    end
+
     test "should evaluate a template file in the scope given" do
       scope = Object.new
       def scope.foo

data/test/tilt_nokogiritemplate_test.rb

@@ -16,6 +16,15 @@ begin
       assert_equal 'em', doc.root.name
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::NokogiriTemplate.new { |t| "xml.em 'Hello World!'" }
+      3.times do
+        doc = Nokogiri.XML template.render
+        assert_equal 'Hello World!', doc.root.text
+        assert_equal 'em', doc.root.name
+      end
+    end
+
     test "passing locals" do
       template = Tilt::NokogiriTemplate.new { "xml.em('Hey ' + name + '!')" }
       doc = Nokogiri.XML template.render(Object.new, :name => 'Joe')
@@ -34,9 +43,11 @@ begin
 
     test "passing a block for yield" do
       template = Tilt::NokogiriTemplate.new { "xml.em('Hey ' + yield + '!')" }
-      doc = Nokogiri.XML template.render { 'Joe' }
-      assert_equal 'Hey Joe!', doc.root.text
-      assert_equal 'em', doc.root.name
+      3.times do
+        doc = Nokogiri.XML template.render { 'Joe' }
+        assert_equal 'Hey Joe!', doc.root.text
+        assert_equal 'em', doc.root.name
+      end
     end
 
     test "block style templates" do
@@ -52,10 +63,12 @@ begin
     test "allows nesting raw XML, API-compatible to Builder" do
       subtemplate = Tilt::NokogiriTemplate.new { "xml.em 'Hello World!'" }
       template = Tilt::NokogiriTemplate.new { "xml.strong { xml << yield }" }
-      options = { :xml => Nokogiri::XML::Builder.new }
-      doc = Nokogiri.XML(template.render(options) { subtemplate.render(options) })
-      assert_equal 'Hello World!', doc.root.text.strip
-      assert_equal 'strong', doc.root.name
+      3.times do
+        options = { :xml => Nokogiri::XML::Builder.new }
+        doc = Nokogiri.XML(template.render(options) { subtemplate.render(options) })
+        assert_equal 'Hello World!', doc.root.text.strip
+        assert_equal 'strong', doc.root.name
+      end
     end
   end
 rescue LoadError

data/test/tilt_radiustemplate_test.rb

@@ -18,6 +18,11 @@ begin
       assert_equal "Hello World!", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::RadiusTemplate.new { |t| "Hello World!" }
+      3.times { assert_equal "Hello World!", template.render }
+    end
+
     test "passing locals" do
       template = Tilt::RadiusTemplate.new { "Hey <r:name />!" }
       assert_equal "Hey Joe!", template.render(nil, :name => 'Joe')

data/test/tilt_rdiscounttemplate_test.rb

@@ -22,6 +22,11 @@ begin
       assert_equal "<h1>Hello World!</h1>\n", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::RDiscountTemplate.new { |t| "# Hello World!" }
+      3.times { assert_equal "<h1>Hello World!</h1>\n", template.render }
+    end
+
     test "smartypants when :smart is set" do
       template = Tilt::RDiscountTemplate.new(:smart => true) { |t|
         "OKAY -- 'Smarty Pants'" }

data/test/tilt_rdoctemplate_test.rb

@@ -11,7 +11,12 @@ begin
 
     test "preparing and evaluating the template with #render" do
       template = Tilt::RDocTemplate.new { |t| "= Hello World!" }
-      assert_equal "<h1>Hello World!</h1>\n", template.render
+      assert_equal "<h1>Hello World!</h1>", template.render.strip
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::RDocTemplate.new { |t| "= Hello World!" }
+      3.times { assert_equal "<h1>Hello World!</h1>", template.render.strip }
     end
   end
 rescue LoadError => boom

data/test/tilt_redclothtemplate_test.rb

@@ -14,6 +14,10 @@ begin
       assert_equal "<h1>Hello World!</h1>", template.render
     end
 
+    test "can be rendered more than once" do
+      template = Tilt::RedClothTemplate.new { |t| "h1. Hello World!" }
+      3.times { assert_equal "<h1>Hello World!</h1>", template.render }
+    end
   end
 rescue LoadError => boom
   warn "Tilt::RedClothTemplate (disabled)\n"

data/test/tilt_sasstemplate_test.rb

@@ -14,6 +14,11 @@ begin
       template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
       assert_equal "#main {\n  background-color: #0000f1; }\n", template.render
     end
+
+    test "can be rendered more than once" do
+      template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
+      3.times { assert_equal "#main {\n  background-color: #0000f1; }\n", template.render }
+    end
   end
 
   class ScssTemplateTest < Test::Unit::TestCase
@@ -25,6 +30,11 @@ begin
       template = Tilt::ScssTemplate.new { |t| "#main {\n  background-color: #0000f1;\n}" }
       assert_equal "#main {\n  background-color: #0000f1; }\n", template.render
     end
+
+    test "can be rendered more than once" do
+      template = Tilt::ScssTemplate.new { |t| "#main {\n  background-color: #0000f1;\n}" }
+      3.times { assert_equal "#main {\n  background-color: #0000f1; }\n", template.render }
+    end
   end
 
 rescue LoadError => boom

data/test/tilt_stringtemplate_test.rb

@@ -11,6 +11,11 @@ class StringTemplateTest < Test::Unit::TestCase
     assert_equal "Hello World!", template.render
   end
 
+  test "can be rendered more than once" do
+    template = Tilt::StringTemplate.new { |t| "Hello World!" }
+    3.times { assert_equal "Hello World!", template.render }
+  end
+
   test "passing locals" do
     template = Tilt::StringTemplate.new { 'Hey #{name}!' }
     assert_equal "Hey Joe!", template.render(Object.new, :name => 'Joe')

data/tilt.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'tilt'
-  s.version = '1.2.1'
-  s.date = '2010-12-24'
+  s.version = '1.2.2'
+  s.date = '2011-01-17'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tilt
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 -08:00
+date: 2011-01-17 00:00:00 -08:00
 default_executable: tilt
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,7 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 2
         - 2
@@ -84,7 +79,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,7 +92,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -112,7 +105,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -126,7 +118,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -140,7 +131,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -154,7 +144,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -168,7 +157,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -236,7 +224,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -245,7 +232,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"