tilt 1.3.3 → 1.4.0

data/test/tilt_csv_test.rb

@@ -0,0 +1,69 @@
+require 'contest'
+require 'tilt'
+
+begin
+  if RUBY_VERSION >= '1.9.0'
+    require 'csv'
+  else
+    require 'fastercsv'
+  end
+
+  class CSVTemplateTest < Test::Unit::TestCase
+
+    test "registered for '.rcsv' files" do
+      assert Tilt.mappings['rcsv'].include?(Tilt::CSVTemplate)
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::CSVTemplate.new { "csv << ['hello', 'world']" }
+      assert_equal "hello,world\n", template.render
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::CSVTemplate.new { "csv << [1,2,3]" }
+      3.times { assert_equal "1,2,3\n", template.render }
+    end
+
+    test "can pass locals" do
+      template = Tilt::CSVTemplate.new { 'csv << [1, name]' }
+      assert_equal "1,Joe\n", template.render(Object.new, :name => 'Joe')
+    end
+
+    test "evaluating in an object scope" do
+      template = Tilt::CSVTemplate.new { 'csv << [1, @name]' }
+      scope = Object.new
+      scope.instance_variable_set :@name, 'Joe'
+      assert_equal "1,Joe\n", template.render(scope)
+    end
+
+    test "backtrace file and line reporting" do
+      data = File.read(__FILE__).split("\n__END__\n").last
+      template = Tilt::CSVTemplate.new('test.csv') { data }
+      begin
+        template.render
+        fail 'should have raised an exception'
+      rescue => boom
+        assert_kind_of NameError, boom
+        line = boom.backtrace.grep(/^test\.csv:/).first
+        assert line, "Backtrace didn't contain test.csv"
+        file, line, meth = line.split(":")
+        assert_equal '4', line
+      end
+    end
+
+  end
+
+rescue LoadError => boom
+  warn "Tilt::CSVTemplate (disabled) please install 'fastercsv' if using ruby 1.8.x"
+end
+
+
+__END__
+# header
+csv << ['Type', 'Age']
+
+raise NameError
+
+# rows
+csv << ['Frog', 2]
+csv << ['Cat', 5]

data/test/tilt_erbtemplate_test.rb

@@ -89,6 +89,11 @@ class ERBTemplateTest < Test::Unit::TestCase
     end
   end
 
+  test "explicit disabling of trim mode" do
+    template = Tilt::ERBTemplate.new('test.erb', 1, :trim => false) { "\n<%= 1 + 1 %>\n" }
+    assert_equal "\n2\n", template.render
+  end
+
   test "default stripping trim mode" do
     template = Tilt::ERBTemplate.new('test.erb', 1) { "\n<%= 1 + 1 %>\n" }
     assert_equal "\n2", template.render

data/test/tilt_erubistemplate_test.rb

@@ -137,7 +137,7 @@ begin
     end
   end
 rescue LoadError => boom
-  warn "Tilt::ErubisTemplate (disabled)\n"
+  warn "Tilt::ErubisTemplate (disabled)"
 end
 
 __END__

data/test/tilt_etannitemplate_test.rb

@@ -0,0 +1,173 @@
+require 'contest'
+require 'tilt'
+
+class EtanniTemplateTest < Test::Unit::TestCase
+  test "registered for '.etn' files" do
+    assert_equal Tilt::EtanniTemplate, Tilt['test.etn']
+  end
+
+  test "registered for '.etanni' files" do
+    assert_equal Tilt::EtanniTemplate, Tilt['test.etanni']
+  end
+
+  test "loading and evaluating templates on #render" do
+    template = Tilt::EtanniTemplate.new { |t| "Hello World!" }
+    assert_equal "Hello World!", template.render
+  end
+
+  test "can be rendered more than once" do
+    template = Tilt::EtanniTemplate.new { |t| "Hello World!" }
+    3.times { assert_equal "Hello World!", template.render }
+  end
+
+  test "passing locals" do
+    template = Tilt::EtanniTemplate.new { 'Hey #{name}!' }
+    assert_equal "Hey Joe!", template.render(Object.new, :name => 'Joe')
+  end
+
+  test "evaluating in an object scope" do
+    template = Tilt::EtanniTemplate.new { 'Hey #{@name}!' }
+    scope = Object.new
+    scope.instance_variable_set :@name, 'Joe'
+    assert_equal "Hey Joe!", template.render(scope)
+  end
+
+  test "passing a block for yield" do
+    template = Tilt::EtanniTemplate.new { 'Hey #{yield}!' }
+    assert_equal "Hey Joe!", template.render { 'Joe' }
+    assert_equal "Hey Moe!", template.render { 'Moe' }
+  end
+
+  test "multiline templates" do
+    template = Tilt::EtanniTemplate.new { "Hello\nWorld!\n" }
+    assert_equal "Hello\nWorld!", 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] == ?<
+    template = Tilt::EtanniTemplate.new('test.etn', 11) { data }
+    begin
+      template.render
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of NameError, boom
+      line = boom.backtrace.grep(/^test\.etn:/).first
+      assert line, "Backtrace didn't contain test.etn"
+      file, line, meth = line.split(":")
+      assert_equal '13', line
+    end
+  end
+
+  test "backtrace file and line reporting with locals" do
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?<
+    template = Tilt::EtanniTemplate.new('test.etn', 1) { data }
+    begin
+      template.render(nil, :name => 'Joe', :foo => 'bar')
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of RuntimeError, boom
+      line = boom.backtrace.first
+      file, line, meth = line.split(":")
+      assert_equal 'test.etn', file
+      assert_equal '6', line
+    end
+  end
+end
+
+
+class CompiledEtanniTemplateTest < Test::Unit::TestCase
+  def teardown
+    GC.start
+  end
+
+  class Scope
+  end
+
+  test "compiling template source to a method" do
+    template = Tilt::EtanniTemplate.new { |t| "Hello World!" }
+    template.render(Scope.new)
+    method = template.send(:compiled_method, [])
+    assert_kind_of UnboundMethod, method
+  end
+
+  test "loading and evaluating templates on #render" do
+    template = Tilt::EtanniTemplate.new { |t| "Hello World!" }
+    assert_equal "Hello World!", template.render(Scope.new)
+  end
+
+  test "passing locals" do
+    template = Tilt::EtanniTemplate.new { 'Hey #{name}!' }
+    assert_equal "Hey Joe!", template.render(Scope.new, :name => 'Joe')
+    assert_equal "Hey Moe!", template.render(Scope.new, :name => 'Moe')
+  end
+
+  test "evaluating in an object scope" do
+    template = Tilt::EtanniTemplate.new { 'Hey #{@name}!' }
+    scope = Scope.new
+    scope.instance_variable_set :@name, 'Joe'
+    assert_equal "Hey Joe!", template.render(scope)
+    scope.instance_variable_set :@name, 'Moe'
+    assert_equal "Hey Moe!", template.render(scope)
+  end
+
+  test "passing a block for yield" do
+    template = Tilt::EtanniTemplate.new { 'Hey #{yield}!' }
+    assert_equal "Hey Joe!", template.render(Scope.new) { 'Joe' }
+    assert_equal "Hey Moe!", template.render(Scope.new) { 'Moe' }
+  end
+
+  test "multiline templates" do
+    template = Tilt::EtanniTemplate.new { "Hello\nWorld!\n" }
+    assert_equal "Hello\nWorld!", template.render(Scope.new)
+  end
+
+  test "template with '}'" do
+    template = Tilt::EtanniTemplate.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] == ?<
+    template = Tilt::EtanniTemplate.new('test.etn', 11) { data }
+    begin
+      template.render(Scope.new)
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of NameError, boom
+      line = boom.backtrace.first
+      line = boom.backtrace.grep(/^test\.etn:/).first
+      assert line, "Backtrace didn't contain test.etn"
+      file, line, meth = line.split(":")
+      assert_equal '13', line
+    end
+  end
+
+  test "backtrace file and line reporting with locals" do
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?<
+    template = Tilt::EtanniTemplate.new('test.etn') { data }
+    begin
+      template.render(Scope.new, :name => 'Joe', :foo => 'bar')
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of RuntimeError, boom
+      line = boom.backtrace.first
+      file, line, meth = line.split(":")
+      assert_equal 'test.etn', file
+      assert_equal '6', line
+    end
+  end
+end
+
+__END__
+<html>
+<body>
+  <h1>Hey #{name}!</h1>
+
+
+  <p>#{fail}</p>
+</body>
+</html>

data/test/tilt_fallback_test.rb

@@ -5,7 +5,7 @@ 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
@@ -22,7 +22,7 @@ class TiltFallbackTest < Test::Unit::TestCase
   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)
@@ -49,7 +49,7 @@ class TiltFallbackTest < Test::Unit::TestCase
   test "returns the last registered template" do
     Tilt.register("md", WinTemplate)
     Tilt.register("md", WinTemplate2)
-    
+
     template = Tilt["md"]
     assert_equal WinTemplate2, template
   end
@@ -87,7 +87,7 @@ class TiltFallbackTest < Test::Unit::TestCase
   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
@@ -96,7 +96,7 @@ class TiltFallbackTest < Test::Unit::TestCase
 
   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)
@@ -109,7 +109,7 @@ class TiltFallbackTest < Test::Unit::TestCase
       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)

data/test/tilt_hamltemplate_test.rb

@@ -131,7 +131,7 @@ begin
     end
   end
 rescue LoadError => boom
-  warn "Tilt::HamlTemplate (disabled)\n"
+  warn "Tilt::HamlTemplate (disabled)"
 end
 
 __END__

data/test/tilt_kramdown_test.rb

@@ -38,5 +38,5 @@ begin
     end
   end
 rescue LoadError => boom
-  warn "Tilt::KramdownTemplate (disabled)\n"
+  warn "Tilt::KramdownTemplate (disabled)"
 end

data/test/tilt_lesstemplate_test.less

@@ -0,0 +1 @@
+@text-color: #ffc0cb;

data/test/tilt_lesstemplate_test.rb

@@ -6,21 +6,37 @@ begin
   require 'less'
 
   class LessTemplateTest < Test::Unit::TestCase
+    def assert_similar(a, b)
+      assert_equal a.gsub(/\s+/m, ' '), b.gsub(/\s+/m, ' ')
+    end
+
     test "is registered for '.less' files" do
       assert_equal Tilt::LessTemplate, Tilt['test.less']
     end
 
     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 {\n  background-color: #0000ff;\n}\n#main {\n  background-color: #0000ff;\n}\n", template.render
+      assert_similar ".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 {\n  background-color: #0000ff;\n}\n#main {\n  background-color: #0000ff;\n}\n", template.render }
+      3.times { assert_similar ".bg {\n  background-color: #0000ff;\n}\n#main {\n  background-color: #0000ff;\n}\n", template.render }
+    end
+
+    test "can be passed a load path" do
+      template = Tilt::LessTemplate.new({
+        :paths => [Pathname(__FILE__).dirname]
+      }) {
+        <<-EOLESS
+        @import 'tilt_lesstemplate_test.less';
+        .bg {background-color: @text-color;}
+        EOLESS
+      }
+      assert_similar ".bg {\n  background-color: #ffc0cb;\n}\n", template.render
     end
   end
 
 rescue LoadError => boom
-  warn "Tilt::LessTemplate (disabled)\n"
+  warn "Tilt::LessTemplate (disabled)"
 end

data/test/tilt_liquidtemplate_test.rb

@@ -74,5 +74,5 @@ begin
   end
 
 rescue LoadError => boom
-  warn "Tilt::LiquidTemplate (disabled)\n"
+  warn "Tilt::LiquidTemplate (disabled)"
 end

data/test/tilt_markaby_test.rb

@@ -84,5 +84,5 @@ begin
   end
 
 rescue LoadError => boom
-  warn "Tilt::MarkabyTemplate (disabled)\n"
+  warn "Tilt::MarkabyTemplate (disabled)"
 end

data/test/tilt_markdown_test.rb

@@ -18,7 +18,7 @@ module MarkdownTests
   end
 
   def normalize(html)
-    Nokogiri::HTML.fragment(html).to_s
+    Nokogiri::HTML.fragment(html).to_s.strip
   end
 
   def nrender(text, options = {})
@@ -26,7 +26,7 @@ module MarkdownTests
     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
@@ -98,7 +98,18 @@ begin
 
     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
+      assert_equal "<p>Hello “World'' – This is — a test …</p>", html
+    end
+
+    def test_fenced_code_blocks_with_lang
+      code = <<-COD.gsub(/^\s+/,"")
+      ```ruby
+      puts "hello world"
+      ```
+      COD
+
+      html = nrender code, :fenced_code_blocks => true
+      assert_equal %Q{<pre><code class="ruby">puts "hello world"\n</code></pre>}, html
     end
   end
 rescue LoadError => boom
@@ -133,7 +144,7 @@ rescue LoadError => boom
   # It should already be warned in the main tests
 end
 
-  
+
 begin
   require 'maruku'
 
@@ -155,7 +166,7 @@ rescue LoadError => boom
 end
 
 rescue LoadError
-  warn "Markdown tests need Nokogiri\n"
+  warn "Markdown tests need Nokogiri"
 end
 
 

data/test/tilt_marukutemplate_test.rb

@@ -44,5 +44,5 @@ begin
     end
   end
 rescue LoadError => boom
-  warn "Tilt::MarukuTemplate (disabled)\n"
+  warn "Tilt::MarukuTemplate (disabled)"
 end

data/test/tilt_radiustemplate_test.rb

@@ -70,6 +70,6 @@ begin
   end
 
 rescue LoadError => boom
-  warn "Tilt::RadiusTemplate (disabled)\n"
+  warn "Tilt::RadiusTemplate (disabled)"
 end
 

data/test/tilt_rdiscounttemplate_test.rb

@@ -51,5 +51,5 @@ begin
     end
   end
 rescue LoadError => boom
-  warn "Tilt::RDiscountTemplate (disabled)\n"
+  warn "Tilt::RDiscountTemplate (disabled)"
 end

data/test/tilt_rdoctemplate_test.rb

@@ -2,6 +2,7 @@ require 'contest'
 require 'tilt'
 
 begin
+  require 'rdoc'
   require 'rdoc/markup'
   require 'rdoc/markup/to_html'
   class RDocTemplateTest < Test::Unit::TestCase
@@ -11,14 +12,20 @@ begin
 
     test "preparing and evaluating the template with #render" do
       template = Tilt::RDocTemplate.new { |t| "= Hello World!" }
-      assert_equal "<h1>Hello World!</h1>", template.render.strip
+      result = template.render.strip
+      assert_match /<h1/, result
+      assert_match />Hello World!</, result
     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 }
+      3.times do
+        result = template.render.strip
+        assert_match /<h1/, result
+        assert_match />Hello World!</, result
+      end
     end
   end
 rescue LoadError => boom
-  warn "Tilt::RDocTemplate (disabled)\n"
+  warn "Tilt::RDocTemplate (disabled) [#{boom}]"
 end

data/test/tilt_redcarpettemplate_test.rb

@@ -37,6 +37,11 @@ begin
       end
     end
 
+    test "redcarpet2 is our default choice" do
+      template = Tilt::RedcarpetTemplate.new {}
+      assert_equal Tilt::RedcarpetTemplate::Redcarpet2, template.prepare.class
+    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
@@ -48,12 +53,19 @@ begin
     end
 
     test "smartypants when :smart is set" do
-      template = Tilt::RedcarpetTemplate.new(:smart => true) { |t|
+      template = Tilt::RedcarpetTemplate.new(:smartypants => true) { |t|
+        "OKAY -- 'Smarty Pants'" }
+      assert_match /<p>OKAY &ndash; &#39;Smarty Pants&#39;<\/p>/,
+        template.render
+    end
+
+    test "smartypants with a rendererer instance" do
+      template = Tilt::RedcarpetTemplate.new(:renderer => Redcarpet::Render::HTML.new(:hard_wrap => true), :smartypants => true) { |t|
         "OKAY -- 'Smarty Pants'" }
-      assert_match /<p>OKAY &[nm]dash; &lsquo;Smarty Pants&rsquo;<\/p>/,
+      assert_match /<p>OKAY &ndash; &#39;Smarty Pants&#39;<\/p>/,
         template.render
     end
   end
 rescue LoadError => boom
-  warn "Tilt::RedcarpetTemplate (disabled)\n"
+  warn "Tilt::RedcarpetTemplate (disabled)"
 end

data/test/tilt_redclothtemplate_test.rb

@@ -18,7 +18,19 @@ begin
       template = Tilt::RedClothTemplate.new { |t| "h1. Hello World!" }
       3.times { assert_equal "<h1>Hello World!</h1>", template.render }
     end
+
+    test "ignores unknown options" do
+      template = Tilt::RedClothTemplate.new(:foo => "bar") { |t| "h1. Hello World!" }
+      3.times { assert_equal "<h1>Hello World!</h1>", template.render }
+    end
+
+    test "passes in RedCloth options" do
+      template = Tilt::RedClothTemplate.new { |t| "Hard breaks are\ninserted by default." }
+      assert_equal "<p>Hard breaks are<br />\ninserted by default.</p>", template.render
+      template = Tilt::RedClothTemplate.new(:hard_breaks => false) { |t| "But they can be\nturned off." }
+      assert_equal "<p>But they can be\nturned off.</p>", template.render
+    end
   end
 rescue LoadError => boom
-  warn "Tilt::RedClothTemplate (disabled)\n"
+  warn "Tilt::RedClothTemplate (disabled)"
 end

data/test/tilt_sasstemplate_test.rb

@@ -37,5 +37,5 @@ begin
   end
 
 rescue LoadError => boom
-  warn "Tilt::SassTemplate (disabled)\n"
+  warn "Tilt::SassTemplate (disabled)"
 end

data/test/tilt_stringtemplate_test.rb

@@ -119,7 +119,7 @@ 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