tilt 1.2 → 1.3

data/test/tilt_markdown_test.rb

@@ -0,0 +1,149 @@
+# coding: UTF-8
+require 'tilt'
+require 'nokogiri'
+
+module MarkdownTests
+  def self.included(mod)
+    class << mod
+      def template(t = nil)
+        t.nil? ? @template : @template = t
+      end
+    end
+  end
+
+  def render(text, options = {})
+    self.class.template.new(options) { text }.render
+  end
+
+  def normalize(html)
+    Nokogiri::HTML.fragment(html).to_s
+  end
+
+  def nrender(text, options = {})
+    html = render(text, options)
+    html.encode!("UTF-8") if html.respond_to?(:encode)
+    normalize(html)
+  end
+  
+  def test_escape_html
+    html = nrender "Hello <b>World</b>"
+    assert_equal "<p>Hello <b>World</b></p>", html
+  end
+
+  def test_escape_html_false
+    html = nrender "Hello <b>World</b>", :escape_html => false
+    assert_equal "<p>Hello <b>World</b></p>", html
+  end
+
+  def test_escape_html_true
+    html = nrender "Hello <b>World</b>", :escape_html => true
+    assert_equal "<p>Hello &lt;b&gt;World&lt;/b&gt;</p>", html
+  end
+
+  def test_smart_quotes
+    html = nrender 'Hello "World"'
+    assert_equal '<p>Hello "World"</p>', html
+  end
+
+  def test_smart_quotes_false
+    html = nrender 'Hello "World"', :smartypants => false
+    assert_equal '<p>Hello "World"</p>', html
+  end
+
+  def test_smart_quotes_true
+    html = nrender 'Hello "World"', :smartypants => true
+    assert_equal '<p>Hello “World”</p>', html
+  end
+
+  def test_smarty_pants
+    html = nrender "Hello ``World'' -- This is --- a test ..."
+    assert_equal "<p>Hello ``World'' -- This is --- a test ...</p>", html
+  end
+
+  def test_smarty_pants_false
+    html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => false
+    assert_equal "<p>Hello ``World'' -- This is --- a test ...</p>", html
+  end
+
+  def test_smarty_pants_true
+    if self.class.template == Tilt::RedcarpetTemplate
+      warn "\nsmartypants not yet fully supported by redcarpet (#{__FILE__}:#{__LINE__})"
+    else
+      html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
+      assert_equal "<p>Hello “World” — This is —– a test …</p>", html
+    end
+  end
+end
+
+begin
+  require 'rdiscount'
+
+  class MarkdownRDiscountTest < Test::Unit::TestCase
+    include MarkdownTests
+    template Tilt::RDiscountTemplate
+  end
+rescue LoadError => boom
+  # It should already be warned in the main tests
+end
+
+begin
+  require 'redcarpet'
+
+  class MarkdownRedcarpetTest < Test::Unit::TestCase
+    include MarkdownTests
+    template Tilt::RedcarpetTemplate
+  end
+rescue LoadError => boom
+  # It should already be warned in the main tests
+end
+
+begin
+  require 'bluecloth'
+
+  class MarkdownBlueClothTest < Test::Unit::TestCase
+    include MarkdownTests
+    template Tilt::BlueClothTemplate
+  end
+rescue LoadError => boom
+  # It should already be warned in the main tests
+end
+
+begin
+  require 'kramdown'
+
+  class MarkdownKramdownTest < Test::Unit::TestCase
+    include MarkdownTests
+    template Tilt::KramdownTemplate
+    # Doesn't support escaping
+    undef test_escape_html_true
+    # Smarty Pants is *always* on, but doesn't support it fully
+    undef test_smarty_pants
+    undef test_smarty_pants_false
+    undef test_smarty_pants_true
+  end
+rescue LoadError => boom
+  # It should already be warned in the main tests
+end
+
+  
+begin
+  require 'maruku'
+
+  class MarkdownMarukuTest < Test::Unit::TestCase
+    include MarkdownTests
+    template Tilt::MarukuTemplate
+    # Doesn't support escaping
+    undef test_escape_html_true
+    # Doesn't support Smarty Pants, and even fails on ``Foobar''
+    undef test_smarty_pants
+    undef test_smarty_pants_false
+    undef test_smarty_pants_true
+    # Smart Quotes is always on
+    undef test_smart_quotes
+    undef test_smart_quotes_false
+  end
+rescue LoadError => boom
+  # It should already be warned in the main tests
+end
+
+

data/test/tilt_marukutemplate_test.rb

@@ -0,0 +1,48 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'maruku'
+
+  class MarukuTemplateTest < Test::Unit::TestCase
+    test "registered for '.md' files" do
+      assert Tilt.mappings['md'].include?(Tilt::MarukuTemplate)
+    end
+
+    test "registered for '.mkd' files" do
+      assert Tilt.mappings['mkd'].include?(Tilt::MarukuTemplate)
+    end
+
+    test "registered for '.markdown' files" do
+      assert Tilt.mappings['markdown'].include?(Tilt::MarukuTemplate)
+    end
+
+    test "registered below Kramdown" do
+      %w[md mkd markdown].each do |ext|
+        mappings = Tilt.mappings[ext]
+        kram_idx = mappings.index(Tilt::KramdownTemplate)
+        maru_idx = mappings.index(Tilt::MarukuTemplate)
+        assert maru_idx > kram_idx,
+          "#{maru_idx} should be higher than #{kram_idx}"
+      end
+    end
+
+    test "preparing and evaluating templates on #render" do
+      template = Tilt::MarukuTemplate.new { |t| "# Hello World!" }
+      assert_equal "<h1 id='hello_world'>Hello World!</h1>", template.render
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::MarukuTemplate.new { |t| "# Hello World!" }
+      3.times { assert_equal "<h1 id='hello_world'>Hello World!</h1>", template.render }
+    end
+
+    test "removes HTML when :filter_html is set" do
+      template = Tilt::MarukuTemplate.new(:filter_html => true) { |t|
+        "HELLO <blink>WORLD</blink>" }
+      assert_equal "<p>HELLO </p>", template.render
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::MarukuTemplate (disabled)\n"
+end

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

@@ -5,16 +5,26 @@ begin
   require 'rdiscount'
 
   class RDiscountTemplateTest < Test::Unit::TestCase
-    test "registered for '.markdown' files" do
-      assert_equal Tilt::RDiscountTemplate, Tilt['test.markdown']
-    end
-
     test "registered for '.md' files" do
-      assert_equal Tilt::RDiscountTemplate, Tilt['test.md']
+      assert Tilt.mappings['md'].include?(Tilt::RDiscountTemplate)
     end
 
     test "registered for '.mkd' files" do
-      assert_equal Tilt::RDiscountTemplate, Tilt['test.mkd']
+      assert Tilt.mappings['mkd'].include?(Tilt::RDiscountTemplate)
+    end
+
+    test "registered for '.markdown' files" do
+      assert Tilt.mappings['markdown'].include?(Tilt::RDiscountTemplate)
+    end
+
+    test "registered above BlueCloth" do
+      %w[md mkd markdown].each do |ext|
+        mappings = Tilt.mappings[ext]
+        blue_idx = mappings.index(Tilt::BlueClothTemplate)
+        rdis_idx = mappings.index(Tilt::RDiscountTemplate)
+        assert rdis_idx < blue_idx,
+          "#{rdis_idx} should be lower than #{blue_idx}"
+      end
     end
 
     test "preparing and evaluating templates on #render" do
@@ -22,6 +32,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_redcarpettemplate_test.rb

@@ -0,0 +1,55 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'redcarpet'
+
+  class RedcarpetTemplateTest < Test::Unit::TestCase
+    test "registered for '.md' files" do
+      assert Tilt.mappings['md'].include?(Tilt::RedcarpetTemplate)
+    end
+
+    test "registered for '.mkd' files" do
+      assert Tilt.mappings['mkd'].include?(Tilt::RedcarpetTemplate)
+    end
+
+    test "registered for '.markdown' files" do
+      assert Tilt.mappings['markdown'].include?(Tilt::RedcarpetTemplate)
+    end
+
+    test "registered above BlueCloth" do
+      %w[md mkd markdown].each do |ext|
+        mappings = Tilt.mappings[ext]
+        blue_idx = mappings.index(Tilt::BlueClothTemplate)
+        rdis_idx = mappings.index(Tilt::RedcarpetTemplate)
+        assert rdis_idx < blue_idx,
+          "#{rdis_idx} should be lower than #{blue_idx}"
+      end
+    end
+
+    test "preparing and evaluating templates on #render" do
+      template = Tilt::RedcarpetTemplate.new { |t| "# Hello World!" }
+      assert_equal "<h1>Hello World!</h1>\n", template.render
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::RedcarpetTemplate.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::RedcarpetTemplate.new(:smart => true) { |t|
+        "OKAY -- 'Smarty Pants'" }
+      assert_equal "<p>OKAY &mdash; &lsquo;Smarty Pants&rsquo;</p>\n",
+        template.render
+    end
+
+    test "stripping HTML when :filter_html is set" do
+      template = Tilt::RedcarpetTemplate.new(:filter_html => true) { |t|
+        "HELLO <blink>WORLD</blink>" }
+      assert_equal "<p>HELLO &lt;blink&gt;WORLD&lt;/blink&gt;</p>\n", template.render
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::RedcarpetTemplate (disabled)\n"
+end

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')
@@ -43,9 +48,9 @@ class StringTemplateTest < Test::Unit::TestCase
       fail 'should have raised an exception'
     rescue => boom
       assert_kind_of NameError, boom
-      line = boom.backtrace.first
+      line = boom.backtrace.grep(/^test\.str:/).first
+      assert line, "Backtrace didn't contain test.str"
       file, line, meth = line.split(":")
-      assert_equal 'test.str', file
       assert_equal '13', line
     end
   end
@@ -114,6 +119,12 @@ class CompiledStringTemplateTest < Test::Unit::TestCase
     assert_equal "Hello\nWorld!\n", template.render(Scope.new)
   end
 
+  
+  test "template with '}'" do
+    template = Tilt::StringTemplate.new { "Hello }" }
+    assert_equal "Hello }", template.render
+  end
+
   test "backtrace file and line reporting without locals" do
     data = File.read(__FILE__).split("\n__END__\n").last
     fail unless data[0] == ?<
@@ -124,8 +135,9 @@ class CompiledStringTemplateTest < Test::Unit::TestCase
     rescue => boom
       assert_kind_of NameError, boom
       line = boom.backtrace.first
+      line = boom.backtrace.grep(/^test\.str:/).first
+      assert line, "Backtrace didn't contain test.str"
       file, line, meth = line.split(":")
-      assert_equal 'test.str', file
       assert_equal '13', line
     end
   end

data/test/tilt_template_test.rb

@@ -121,6 +121,12 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert inst.prepared?
   end
 
+  test "template_source with locals of strings" do
+    inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{name}!' }
+    assert_equal "Hey Joe!", inst.render(Object.new, 'name' => 'Joe')
+    assert inst.prepared?
+  end
+
   class Person
     CONSTANT = "Bob"
 

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'
-  s.date = '2010-12-24'
+  s.version = '1.3'
+  s.date = '2011-04-26'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -20,6 +20,21 @@ Gem::Specification.new do |s|
     TEMPLATES.md
     bin/tilt
     lib/tilt.rb
+    lib/tilt/builder.rb
+    lib/tilt/coffee.rb
+    lib/tilt/creole.rb
+    lib/tilt/css.rb
+    lib/tilt/erb.rb
+    lib/tilt/haml.rb
+    lib/tilt/liquid.rb
+    lib/tilt/markaby.rb
+    lib/tilt/markdown.rb
+    lib/tilt/nokogiri.rb
+    lib/tilt/radius.rb
+    lib/tilt/rdoc.rb
+    lib/tilt/string.rb
+    lib/tilt/template.rb
+    lib/tilt/textile.rb
     test/contest.rb
     test/markaby/locals.mab
     test/markaby/markaby.mab
@@ -32,16 +47,22 @@ Gem::Specification.new do |s|
     test/tilt_cache_test.rb
     test/tilt_coffeescripttemplate_test.rb
     test/tilt_compilesite_test.rb
+    test/tilt_creoletemplate_test.rb
     test/tilt_erbtemplate_test.rb
     test/tilt_erubistemplate_test.rb
+    test/tilt_fallback_test.rb
     test/tilt_hamltemplate_test.rb
+    test/tilt_kramdown_test.rb
     test/tilt_lesstemplate_test.rb
     test/tilt_liquidtemplate_test.rb
     test/tilt_markaby_test.rb
+    test/tilt_markdown_test.rb
+    test/tilt_marukutemplate_test.rb
     test/tilt_nokogiritemplate_test.rb
     test/tilt_radiustemplate_test.rb
     test/tilt_rdiscounttemplate_test.rb
     test/tilt_rdoctemplate_test.rb
+    test/tilt_redcarpettemplate_test.rb
     test/tilt_redclothtemplate_test.rb
     test/tilt_sasstemplate_test.rb
     test/tilt_stringtemplate_test.rb
@@ -66,6 +87,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'nokogiri'
   s.add_development_dependency 'markaby'
   s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'bluecloth'
+  s.add_development_dependency 'RedCloth'
+  s.add_development_dependency 'maruku'
+  s.add_development_dependency 'creole'
+  s.add_development_dependency 'kramdown'
 
   s.extra_rdoc_files = %w[COPYING]