tilt 1.3.3 → 1.3.4

data/lib/tilt/wiki.rb

@@ -24,6 +24,10 @@ module Tilt
     def evaluate(scope, locals, &block)
       @output ||= @engine.to_html
     end
+
+    def allows_script?
+      false
+    end
   end
 
   # WikiCloth implementation. See:
@@ -46,5 +50,9 @@ module Tilt
     def evaluate(scope, locals, &block)
       @output ||= @engine.to_html
     end
+
+    def allows_script?
+      false
+    end
   end
 end

data/test/tilt_asciidoctor_test.rb

@@ -0,0 +1,44 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'asciidoctor'
+
+  class AsciidoctorTemplateTest < Test::Unit::TestCase
+    HTML5_OUTPUT = "<div class=\"sect1\"><h2 id=\"_hello_world\">Hello World!</h2><div class=\"sectionbody\"></div></div>"
+    DOCBOOK_OUTPUT = "<section id=\"_hello_world\"><title>Hello World!</title></section>"
+
+    def strip_space(str)
+      str.gsub(/>\s+</, '><').strip
+    end
+
+    test "registered for '.ad' files" do
+      assert Tilt.mappings['ad'].include?(Tilt::AsciidoctorTemplate)
+    end
+
+    test "registered for '.adoc' files" do
+      assert Tilt.mappings['adoc'].include?(Tilt::AsciidoctorTemplate)
+    end
+
+    test "registered for '.asciidoc' files" do
+      assert Tilt.mappings['asciidoc'].include?(Tilt::AsciidoctorTemplate)
+    end
+
+    test "preparing and evaluating html5 templates on #render" do
+      template = Tilt::AsciidoctorTemplate.new(:attributes => {"backend" => 'html5'}) { |t| "== Hello World!" } 
+      assert_equal HTML5_OUTPUT, strip_space(template.render)
+    end
+
+    test "preparing and evaluating docbook templates on #render" do
+      template = Tilt::AsciidoctorTemplate.new(:attributes => {"backend" => 'docbook'}) { |t| "== Hello World!" } 
+      assert_equal DOCBOOK_OUTPUT, strip_space(template.render)
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::AsciidoctorTemplate.new(:attributes => {"backend" => 'html5'}) { |t| "== Hello World!" } 
+      3.times { assert_equal HTML5_OUTPUT, strip_space(template.render) }
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::AsciidoctorTemplate (disabled)"
+end

data/test/tilt_blueclothtemplate_test.rb

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

data/test/tilt_coffeescripttemplate_test.rb

@@ -5,10 +5,25 @@ begin
   require 'coffee_script'
 
   class CoffeeScriptTemplateTest < Test::Unit::TestCase
+
+    unless method_defined?(:assert_not_match)
+      # assert_not_match is missing on 1.8.7, which uses assert_no_match
+      def assert_not_match(a, b)
+        unless a.kind_of?(Regexp)
+          a = Regexp.new(Regexp.escape(a))
+        end
+        assert_no_match(a,b)
+      end
+    end
+
     test "is registered for '.coffee' files" do
       assert_equal Tilt::CoffeeScriptTemplate, Tilt['test.coffee']
     end
 
+    test "bare is disabled by default" do
+      assert_equal false, Tilt::CoffeeScriptTemplate.default_bare
+    end
+
     test "compiles and evaluates the template on #render" do
       template = Tilt::CoffeeScriptTemplate.new { |t| "puts 'Hello, World!'\n" }
       assert_match "puts('Hello, World!');", template.render
@@ -20,18 +35,25 @@ begin
     end
 
     test "disabling coffee-script wrapper" do
-      str = "puts 'Hello, World!'\n"
+      str = 'name = "Josh"; puts "Hello #{name}"'
+
+      template = Tilt::CoffeeScriptTemplate.new { str }
+      assert_match "(function() {", template.render
+      assert_match "puts(\"Hello \" + name);\n", template.render
 
       template = Tilt::CoffeeScriptTemplate.new(:bare => true) { str }
-      assert_equal "puts('Hello, World!');", template.render
+      assert_not_match "(function() {", template.render
+      assert_equal "var name;\n\nname = \"Josh\";\n\nputs(\"Hello \" + name);\n", template.render
 
       template2 = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { str}
-      assert_equal "puts('Hello, World!');", template.render
+      assert_not_match "(function() {", template.render
+      assert_equal "var name;\n\nname = \"Josh\";\n\nputs(\"Hello \" + name);\n", template.render
     end
 
-    context "disabling coffee-script wrapper globally" do
+    context "wrapper globally enabled" do
       setup do
         @bare = Tilt::CoffeeScriptTemplate.default_bare
+        Tilt::CoffeeScriptTemplate.default_bare = false
       end
 
       teardown do
@@ -39,23 +61,54 @@ begin
       end
 
       test "no options" do
-        template = Tilt::CoffeeScriptTemplate.new { |t| "puts 'Hello, World!'\n" }
-        assert_match "puts('Hello, World!');", template.render
+        template = Tilt::CoffeeScriptTemplate.new { |t| 'name = "Josh"; puts "Hello, #{name}"' }
+        assert_match "puts(\"Hello, \" + name);", 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
+        template = Tilt::CoffeeScriptTemplate.new(:bare => true) { |t| 'name = "Josh"; puts "Hello, #{name}"' }
+        assert_match "puts(\"Hello, \" + name);", template.render
+        assert_not_match "(function() {", 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
+        template = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { |t| 'name = "Josh"; puts "Hello, #{name}"' }
+        assert_match "puts(\"Hello, \" + name);", template.render
+        assert_not_match "(function() {", template.render
+      end
+    end
+
+    context "wrapper globally disabled" do
+      setup do
+        @bare = Tilt::CoffeeScriptTemplate.default_bare
+        Tilt::CoffeeScriptTemplate.default_bare = true
+      end
+
+      teardown do
+        Tilt::CoffeeScriptTemplate.default_bare = @bare
+      end
+
+      test "no options" do
+        template = Tilt::CoffeeScriptTemplate.new { |t| 'name = "Josh"; puts "Hello, #{name}"' }
+        assert_match "puts(\"Hello, \" + name);", template.render
+        assert_not_match "(function() {", template.render
+      end
+
+      test "overridden by :bare" do
+        template = Tilt::CoffeeScriptTemplate.new(:bare => false) { |t| 'name = "Josh"; puts "Hello, #{name}"' }
+        assert_match "puts(\"Hello, \" + name);", template.render
+        assert_match "(function() {", template.render
+      end
+
+      test "overridden by :no_wrap" do
+        template = Tilt::CoffeeScriptTemplate.new(:no_wrap => false) { |t| 'name = "Josh"; puts "Hello, #{name}"' }
+        assert_match "puts(\"Hello, \" + name);", template.render
+        assert_match "(function() {", template.render
       end
     end
   end
 
 rescue LoadError => boom
-  warn "Tilt::CoffeeScriptTemplate (disabled)\n"
+  warn "Tilt::CoffeeScriptTemplate (disabled)"
 end

data/test/tilt_creoletemplate_test.rb

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

data/test/tilt_csv_test.rb

@@ -0,0 +1,73 @@
+require 'contest'
+require 'tilt'
+
+begin
+  if RUBY_VERSION >= '1.9.0'
+    require 'csv'
+  else
+    require 'fastercsv'
+  end
+
+  class CSVTemplateTest < Test::Unit::TestCase
+
+    test "is registered for '.csv' files" do
+      assert_equal Tilt::CSVTemplate, Tilt['test.csv']
+    end
+
+    test "registered for '.csv' files" do
+      assert Tilt.mappings['csv'].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>