tilt 1.3.3 → 1.3.4

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

@@ -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

data/test/tilt_template_test.rb

@@ -1,5 +1,6 @@
 require 'contest'
 require 'tilt'
+require 'tempfile'
 
 class TiltTemplateTest < Test::Unit::TestCase
 
@@ -23,6 +24,12 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert_equal 55, inst.line
   end
 
+  test "initializing with a tempfile" do
+    tempfile = Tempfile.new('tilt_template_test')
+    inst = MockTemplate.new(tempfile)
+    assert_equal File.basename(tempfile.path), inst.basename
+  end
+
   test "uses correct eval_file" do
     inst = MockTemplate.new('foo.erb', 55) {}
     assert_equal 'foo.erb', inst.eval_file
@@ -127,6 +134,12 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert inst.prepared?
   end
 
+  test "template_source with locals having non-variable keys raises error" do
+    inst = SourceGeneratingMockTemplate.new { |t| '1 + 2 = #{ANSWER}' }
+    err = assert_raise(RuntimeError) { inst.render(Object.new, 'ANSWER' => '3') }
+    assert_equal "invalid locals key: \"ANSWER\" (keys must be variable names)", err.message
+  end
+
   class Person
     CONSTANT = "Bob"
 

data/test/tilt_wikiclothtemplate_test.rb

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

data/test/tilt_yajltemplate_test.rb

@@ -11,12 +11,20 @@ begin
 
     test "compiles and evaluates the template on #render" do
       template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
-      assert_equal '{"integer":3,"string":"hello"}', template.render
+      output = template.render
+      result = Yajl::Parser.parse(output)
+      expect = {"integer" => 3,"string" => "hello"}
+      assert_equal expect, result
     end
 
     test "can be rendered more than once" do
       template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
-      3.times { assert_equal '{"integer":3,"string":"hello"}', template.render }
+      expect = {"integer" => 3,"string" => "hello"}
+      3.times do
+        output = template.render
+        result = Yajl::Parser.parse(output)
+        assert_equal expect, result
+      end
     end
 
     test "evaluating ruby code" do
@@ -65,7 +73,8 @@ begin
         json[:integer] = four
         nil
       } }
-      assert_equal '{"string":"hello","integer":4}', template.render
+      result = template.render
+      assert( (result == '{"string":"hello","integer":4}') || (result == '{"integer":4,"string":"hello"}') )
     end
 
     test "option callback" do
@@ -88,5 +97,5 @@ begin
 
   end
 rescue LoadError
-  warn "Tilt::YajlTemplateTest (disabled)\n"
+  warn "Tilt::YajlTemplateTest (disabled)"
 end

data/tilt.gemspec

@@ -3,11 +3,12 @@ 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.3.3'
-  s.date = '2011-08-25'
+  s.version = '1.3.4'
+  s.date = '2013-02-28'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
+  s.license     = "MIT"
 
   s.authors = ["Ryan Tomayko"]
   s.email = "r@tomayko.com"
@@ -16,20 +17,25 @@ Gem::Specification.new do |s|
   s.files = %w[
     COPYING
     Gemfile
+    HACKING
     README.md
     Rakefile
     TEMPLATES.md
     bin/tilt
     lib/tilt.rb
+    lib/tilt/asciidoc.rb
     lib/tilt/builder.rb
     lib/tilt/coffee.rb
     lib/tilt/css.rb
+    lib/tilt/csv.rb
     lib/tilt/erb.rb
+    lib/tilt/etanni.rb
     lib/tilt/haml.rb
     lib/tilt/liquid.rb
     lib/tilt/markaby.rb
     lib/tilt/markdown.rb
     lib/tilt/nokogiri.rb
+    lib/tilt/plain.rb
     lib/tilt/radius.rb
     lib/tilt/rdoc.rb
     lib/tilt/string.rb
@@ -44,17 +50,21 @@ Gem::Specification.new do |s|
     test/markaby/render_twice.mab
     test/markaby/scope.mab
     test/markaby/yielding.mab
+    test/tilt_asciidoctor_test.rb
     test/tilt_blueclothtemplate_test.rb
     test/tilt_buildertemplate_test.rb
     test/tilt_cache_test.rb
     test/tilt_coffeescripttemplate_test.rb
     test/tilt_compilesite_test.rb
     test/tilt_creoletemplate_test.rb
+    test/tilt_csv_test.rb
     test/tilt_erbtemplate_test.rb
     test/tilt_erubistemplate_test.rb
+    test/tilt_etannitemplate_test.rb
     test/tilt_fallback_test.rb
     test/tilt_hamltemplate_test.rb
     test/tilt_kramdown_test.rb
+    test/tilt_lesstemplate_test.less
     test/tilt_lesstemplate_test.rb
     test/tilt_liquidtemplate_test.rb
     test/tilt_markaby_test.rb
@@ -78,29 +88,29 @@ Gem::Specification.new do |s|
 
   s.executables = ['tilt']
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
-  s.add_development_dependency 'contest'
+  s.add_development_dependency 'asciidoctor', '>= 0.1.0'
+  s.add_development_dependency 'RedCloth'
+  s.add_development_dependency 'bluecloth'
   s.add_development_dependency 'builder'
+  s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'contest'
+  s.add_development_dependency 'creole'
   s.add_development_dependency 'erubis'
   s.add_development_dependency 'haml', '>= 2.2.11'
-  s.add_development_dependency 'sass'
-  s.add_development_dependency 'rdiscount'
-  s.add_development_dependency 'liquid'
+  s.add_development_dependency 'kramdown'
   s.add_development_dependency 'less'
-  s.add_development_dependency 'radius'
-  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'liquid'
   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.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'radius'
+  s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'rdoc'
   s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'creole'
-  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'sass'
   s.add_development_dependency 'wikicloth'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'kramdown'
+  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'rdoc'
 
   s.homepage = "http://github.com/rtomayko/tilt/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tilt", "--main", "Tilt"]