tilt 1.2.2 → 1.3.3

data/test/tilt_blueclothtemplate_test.rb

@@ -5,35 +5,16 @@ begin
   require 'bluecloth'
 
   class BlueClothTemplateTest < Test::Unit::TestCase
-    setup do
-      Tilt.register('markdown', Tilt::BlueClothTemplate)
-      Tilt.register('md', Tilt::BlueClothTemplate)
-      Tilt.register('mkd', Tilt::BlueClothTemplate)
+    test "registered for '.md' files" do
+      assert Tilt.mappings['md'].include?(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)
+    test "registered for '.mkd' files" do
+      assert Tilt.mappings['mkd'].include?(Tilt::BlueClothTemplate)
     end
 
-    test "registered for '.markdown' files unless RDiscount is loaded" do
-      unless defined?(RDiscount)
-        assert_equal Tilt::BlueClothTemplate, Tilt['test.markdown']
-      end
-    end
-
-    test "registered for '.md' files unless RDiscount is loaded" do
-      unless defined?(RDiscount)
-        assert_equal Tilt::BlueClothTemplate, Tilt['test.md']
-      end
-    end
-
-    test "registered for '.mkd' files unless RDiscount is loaded" do
-      unless defined?(RDiscount)
-        assert_equal Tilt::BlueClothTemplate, Tilt['test.mkd']
-      end
+    test "registered for '.markdown' files" do
+      assert Tilt.mappings['markdown'].include?(Tilt::BlueClothTemplate)
     end
 
     test "preparing and evaluating templates on #render" do

data/test/tilt_coffeescripttemplate_test.rb

@@ -20,9 +20,40 @@ begin
     end
 
     test "disabling coffee-script wrapper" do
-      template = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { |t| "puts 'Hello, World!'\n" }
+      str = "puts 'Hello, World!'\n"
+
+      template = Tilt::CoffeeScriptTemplate.new(:bare => true) { str }
+      assert_equal "puts('Hello, World!');", template.render
+
+      template2 = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { str}
       assert_equal "puts('Hello, World!');", template.render
     end
+
+    context "disabling coffee-script wrapper globally" do
+      setup do
+        @bare = Tilt::CoffeeScriptTemplate.default_bare
+      end
+
+      teardown do
+        Tilt::CoffeeScriptTemplate.default_bare = @bare
+      end
+
+      test "no options" do
+        template = Tilt::CoffeeScriptTemplate.new { |t| "puts 'Hello, World!'\n" }
+        assert_match "puts('Hello, World!');", template.render
+        assert_match "(function() {", template.render
+      end
+
+      test "overridden by :bare" do
+        template = Tilt::CoffeeScriptTemplate.new(:bare => false) { "puts 'Hello, World!'\n" }
+        assert_not_equal "puts('Hello, World!');", template.render
+      end
+
+      test "overridden by :no_wrap" do
+        template = Tilt::CoffeeScriptTemplate.new(:no_wrap => false) { "puts 'Hello, World!'\n" }
+        assert_not_equal "puts('Hello, World!');", template.render
+      end
+    end
   end
 
 rescue LoadError => boom

data/test/tilt_compilesite_test.rb

@@ -39,7 +39,7 @@ class CompileSiteTest < Test::Unit::TestCase
               locals = { "local#{i}" => 'value' }
               res = template.render(self, locals)
               thread_id = Thread.current.object_id
-              res = template.render(self, "local#{thread_id.to_s}" => 'value')
+              res = template.render(self, "local#{thread_id.abs.to_s}" => 'value')
             rescue => boom
               main_thread.raise(boom)
             end

data/test/tilt_creoletemplate_test.rb

@@ -0,0 +1,28 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'creole'
+
+  class CreoleTemplateTest < Test::Unit::TestCase
+    test "is registered for '.creole' files" do
+      assert_equal Tilt::CreoleTemplate, Tilt['test.creole']
+    end
+
+    test "registered for '.wiki' files" do
+      assert Tilt.mappings['wiki'].include?(Tilt::CreoleTemplate)
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::CreoleTemplate.new { |t| "= Hello World!" }
+      assert_equal "<h1>Hello World!</h1>", template.render
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::CreoleTemplate.new { |t| "= Hello World!" }
+      3.times { assert_equal "<h1>Hello World!</h1>", template.render }
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::CreoleTemplate (disabled)\n"
+end

data/test/tilt_erbtemplate_test.rb

@@ -6,12 +6,11 @@ require 'tempfile'
 
 class ERBTemplateTest < Test::Unit::TestCase
   test "registered for '.erb' files" do
-    assert_equal Tilt::ERBTemplate, Tilt['test.erb']
-    assert_equal Tilt::ERBTemplate, Tilt['test.html.erb']
+    assert Tilt.mappings['erb'].include?(Tilt::ERBTemplate)
   end
 
   test "registered for '.rhtml' files" do
-    assert_equal Tilt::ERBTemplate, Tilt['test.rhtml']
+    assert Tilt.mappings['rhtml'].include?(Tilt::ERBTemplate)
   end
 
   test "loading and evaluating templates on #render" do
@@ -67,9 +66,9 @@ class ERBTemplateTest < 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\.erb:/).first
+      assert line, "Backtrace didn't contain test.erb"
       file, line, meth = line.split(":")
-      assert_equal 'test.erb', file
       assert_equal '13', line
     end
   end
@@ -90,18 +89,18 @@ class ERBTemplateTest < Test::Unit::TestCase
     end
   end
 
-  test "default non-stripping trim mode" do
-    template = Tilt.new('test.erb', 1) { "\n<%= 1 + 1 %>\n" }
-    assert_equal "\n2\n", template.render
+  test "default stripping trim mode" do
+    template = Tilt::ERBTemplate.new('test.erb', 1) { "\n<%= 1 + 1 %>\n" }
+    assert_equal "\n2", template.render
   end
 
   test "stripping trim mode" do
-    template = Tilt.new('test.erb', 1, :trim => '-') { "\n<%= 1 + 1 -%>\n" }
+    template = Tilt::ERBTemplate.new('test.erb', 1, :trim => '-') { "\n<%= 1 + 1 -%>\n" }
     assert_equal "\n2", template.render
   end
 
   test "shorthand whole line syntax trim mode" do
-    template = Tilt.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
+    template = Tilt::ERBTemplate.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
     assert_equal "\nhello\n", template.render
   end
 
@@ -164,9 +163,9 @@ class CompiledERBTemplateTest < 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\.erb:/).first
+      assert line, "Backtrace didn't contain test.erb"
       file, line, meth = line.split(":")
-      assert_equal 'test.erb', file
       assert_equal '13', line
     end
   end
@@ -187,18 +186,18 @@ class CompiledERBTemplateTest < Test::Unit::TestCase
     end
   end
 
-  test "default non-stripping trim mode" do
-    template = Tilt.new('test.erb') { "\n<%= 1 + 1 %>\n" }
-    assert_equal "\n2\n", template.render(Scope.new)
+  test "default stripping trim mode" do
+    template = Tilt::ERBTemplate.new('test.erb') { "\n<%= 1 + 1 %>\n" }
+    assert_equal "\n2", template.render(Scope.new)
   end
 
   test "stripping trim mode" do
-    template = Tilt.new('test.erb', :trim => '-') { "\n<%= 1 + 1 -%>\n" }
+    template = Tilt::ERBTemplate.new('test.erb', :trim => '-') { "\n<%= 1 + 1 -%>\n" }
     assert_equal "\n2", template.render(Scope.new)
   end
 
   test "shorthand whole line syntax trim mode" do
-    template = Tilt.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
+    template = Tilt::ERBTemplate.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
     assert_equal "\nhello\n", template.render(Scope.new)
   end
 
@@ -208,7 +207,7 @@ class CompiledERBTemplateTest < Test::Unit::TestCase
     f.puts('ふが <%= @hoge %>')
     f.close()
     @hoge = "ほげ"
-    erb = Tilt['erb'].new(f.path)
+    erb = Tilt::ERBTemplate.new(f.path)
     3.times { erb.render(self) }
     f.delete
   end
@@ -218,7 +217,7 @@ class CompiledERBTemplateTest < Test::Unit::TestCase
     f.puts('ふが <%= @hoge %>')
     f.close()
     @hoge = "ほげ"
-    erb = Tilt['erb'].new(f.path, :default_encoding => 'UTF-8')
+    erb = Tilt::ERBTemplate.new(f.path, :default_encoding => 'UTF-8')
     3.times { erb.render(self) }
     f.delete
   end

data/test/tilt_erubistemplate_test.rb

@@ -9,6 +9,16 @@ begin
       assert_equal Tilt::ErubisTemplate, Tilt['test.html.erubis']
     end
 
+    test "registered above ERB" do
+      %w[erb rhtml].each do |ext|
+        mappings = Tilt.mappings[ext]
+        erubis_idx = mappings.index(Tilt::ErubisTemplate)
+        erb_idx = mappings.index(Tilt::ERBTemplate)
+        assert erubis_idx < erb_idx,
+          "#{erubis_idx} should be lower than #{erb_idx}"
+      end
+    end
+
     test "preparing and evaluating templates on #render" do
       template = Tilt::ErubisTemplate.new { |t| "Hello World!" }
       assert_equal "Hello World!", template.render
@@ -62,9 +72,9 @@ begin
         fail 'should have raised an exception'
       rescue => boom
         assert_kind_of NameError, boom
-        line = boom.backtrace.first
+        line = boom.backtrace.grep(/^test\.erubis:/).first
+        assert line, "Backtrace didn't contain test.erubis"
         file, line, meth = line.split(":")
-        assert_equal 'test.erubis', file
         assert_equal '13', line
       end
     end

data/test/tilt_fallback_test.rb

@@ -0,0 +1,122 @@
+require 'contest'
+require 'tilt'
+
+class TiltFallbackTest < Test::Unit::TestCase
+  class FailTemplate  < Tilt::Template
+    def self.engine_initialized?; false end
+    def prepare;                        end
+    
+    def initialize_engine
+      raise LoadError, "can't load #{self.class}"
+    end
+  end
+
+  class WinTemplate < Tilt::Template
+    def self.engine_initialized?; true end
+    def prepare;                       end
+  end
+
+  FailTemplate2 = Class.new(FailTemplate)
+  WinTemplate2  = Class.new(WinTemplate)
+
+  def set_ivar(obj, name, value)
+    obj.instance_variable_set("@#{name}", value)
+  end
+  
+  def clear_ivar(obj, name)
+    ivar = "@#{name}"
+    value = obj.instance_variable_get(ivar)
+  ensure
+    obj.instance_variable_set(ivar, value.dup.clear)
+  end
+
+  setup do
+    # Make sure every test have no mappings.
+    @p = clear_ivar(Tilt, :preferred_mappings)
+    @t = clear_ivar(Tilt, :template_mappings)
+  end
+
+  teardown do
+    set_ivar(Tilt, :preferred_mappings, @p)
+    set_ivar(Tilt, :template_mappings, @t)
+  end
+
+  test "returns nil on unregistered extensions" do
+    template = Tilt["md"]
+    assert_equal nil, template
+  end
+
+  test "returns the last registered template" do
+    Tilt.register("md", WinTemplate)
+    Tilt.register("md", WinTemplate2)
+    
+    template = Tilt["md"]
+    assert_equal WinTemplate2, template
+  end
+
+  test "returns the last registered working template" do
+    Tilt.register("md", WinTemplate)
+    Tilt.register("md", FailTemplate)
+
+    template = Tilt["md"]
+    assert_equal WinTemplate, template
+  end
+
+  test "if every template fails, raise the exception from the first template" do
+    Tilt.register("md", FailTemplate)
+    Tilt.register("md", FailTemplate2)
+
+    exc = assert_raise(LoadError) { Tilt["md"] }
+    assert_match /FailTemplate2/, exc.message
+  end
+
+  test ".prefer should also register the template" do
+    Tilt.prefer(WinTemplate, "md")
+    assert Tilt.registered?("md")
+  end
+
+  test ".prefer always win" do
+    Tilt.register("md", FailTemplate)
+    Tilt.register("md", WinTemplate)
+    Tilt.prefer(FailTemplate, "md")
+
+    template = Tilt["md"]
+    assert_equal FailTemplate, template
+  end
+
+  test ".prefer accepts multiple extensions" do
+    extensions = %w[md mkd markdown]
+    Tilt.prefer(FailTemplate, *extensions)
+    
+    extensions.each do |ext|
+      template = Tilt[ext]
+      assert_equal FailTemplate, template
+    end
+  end
+
+  test ".prefer with no extension should use already registered extensions" do
+    extensions = %w[md mkd markdown]
+    
+    extensions.each do |ext|
+      Tilt.register(ext, FailTemplate)
+      Tilt.register(ext, WinTemplate)
+    end
+
+    Tilt.prefer(FailTemplate)
+
+    extensions.each do |ext|
+      template = Tilt[ext]
+      assert_equal FailTemplate, template
+    end
+  end
+  
+  test ".prefer should only override extensions the preferred library is registered for"  do
+    Tilt.register("md", WinTemplate)
+    Tilt.register("mkd", FailTemplate)
+    Tilt.register("mkd", WinTemplate)
+    Tilt.prefer(FailTemplate)
+    assert_equal FailTemplate, Tilt["mkd"]
+    assert_equal WinTemplate, Tilt["md"]
+  end
+end
+

data/test/tilt_hamltemplate_test.rb

@@ -48,9 +48,9 @@ begin
         fail 'should have raised an exception'
       rescue => boom
         assert_kind_of NameError, boom
-        line = boom.backtrace.first
+        line = boom.backtrace.grep(/^test\.haml:/).first
+        assert line, "Backtrace didn't contain test.haml"
         file, line, meth = line.split(":")
-        assert_equal 'test.haml', file
         assert_equal '12', line
       end
     end
@@ -108,9 +108,9 @@ begin
         fail 'should have raised an exception'
       rescue => boom
         assert_kind_of NameError, boom
-        line = boom.backtrace.first
+        line = boom.backtrace.grep(/^test\.haml:/).first
+        assert line, "Backtrace didn't contain test.haml"
         file, line, meth = line.split(":")
-        assert_equal 'test.haml', file
         assert_equal '12', line
       end
     end

data/test/tilt_kramdown_test.rb

@@ -0,0 +1,42 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'kramdown'
+
+  class MarukuTemplateTest < Test::Unit::TestCase
+    test "registered for '.md' files" do
+      assert Tilt.mappings['md'].include?(Tilt::KramdownTemplate)
+    end
+
+    test "registered for '.mkd' files" do
+      assert Tilt.mappings['mkd'].include?(Tilt::KramdownTemplate)
+    end
+
+    test "registered for '.markdown' files" do
+      assert Tilt.mappings['markdown'].include?(Tilt::KramdownTemplate)
+    end
+
+    test "registered above MarukuTemplate" 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 kram_idx < maru_idx,
+          "#{kram_idx} should be lower than #{maru_idx}"
+      end
+    end
+
+    test "preparing and evaluating templates on #render" do
+      template = Tilt::KramdownTemplate.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::KramdownTemplate.new { |t| "# Hello World!" }
+      3.times { assert_equal "<h1 id='hello_world'>Hello World!</h1>", template.render }
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::KramdownTemplate (disabled)\n"
+end

data/test/tilt_lesstemplate_test.rb

@@ -2,6 +2,7 @@ require 'contest'
 require 'tilt'
 
 begin
+  require 'pathname'
   require 'less'
 
   class LessTemplateTest < Test::Unit::TestCase
@@ -11,12 +12,12 @@ begin
 
     test "compiles and evaluates the template on #render" do
       template = Tilt::LessTemplate.new { |t| ".bg { background-color: #0000ff; } \n#main\n { .bg; }\n" }
-      assert_equal ".bg, #main { background-color: #0000ff; }\n", template.render
+      assert_equal ".bg {\n  background-color: #0000ff;\n}\n#main {\n  background-color: #0000ff;\n}\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 }
+      3.times { assert_equal ".bg {\n  background-color: #0000ff;\n}\n#main {\n  background-color: #0000ff;\n}\n", template.render }
     end
   end
 

data/test/tilt_markdown_test.rb

@@ -0,0 +1,161 @@
+# coding: UTF-8
+require 'tilt'
+
+begin
+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
+    if self.class.template == Tilt::RedcarpetTemplate
+      flunk "redcarpet doesn't support :escape_html yet"
+    end
+    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
+    html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
+    assert_equal "<p>Hello “World” — This is —– a test …</p>", html
+  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
+    # Doesn't support escaping
+    undef test_escape_html_true
+
+    def test_smarty_pants_true
+      html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
+      assert_equal "<p>Hello “World” – This is — a test …</p>", html
+    end
+  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
+
+rescue LoadError
+  warn "Markdown tests need Nokogiri\n"
+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