tilt 1.4.0 → 2.0.0.beta1

data/test/tilt_markdown_test.rb

@@ -1,5 +1,6 @@
 # coding: UTF-8
 require 'tilt'
+require 'test_helper'
 
 begin
 require 'nokogiri'
@@ -38,9 +39,6 @@ module MarkdownTests
   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
@@ -77,9 +75,9 @@ module MarkdownTests
 end
 
 begin
-  require 'rdiscount'
+  require 'tilt/rdiscount'
 
-  class MarkdownRDiscountTest < Test::Unit::TestCase
+  class MarkdownRDiscountTest < Minitest::Test
     include MarkdownTests
     template Tilt::RDiscountTemplate
   end
@@ -88,17 +86,18 @@ rescue LoadError => boom
 end
 
 begin
-  require 'redcarpet'
+  require 'tilt/redcarpet'
 
-  class MarkdownRedcarpetTest < Test::Unit::TestCase
+  class MarkdownRedcarpetTest < Minitest::Test
     include MarkdownTests
     template Tilt::RedcarpetTemplate
     # Doesn't support escaping
     undef test_escape_html_true
 
     def test_smarty_pants_true
+      # Various versions of Redcarpet support various versions of Smart pants.
       html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
-      assert_equal "<p>Hello “World'' – This is — a test …</p>", html
+      assert_match /<p>Hello “World(''|”) – This is — a test …<\/p>/, html
     end
 
     def test_fenced_code_blocks_with_lang
@@ -117,9 +116,9 @@ rescue LoadError => boom
 end
 
 begin
-  require 'bluecloth'
+  require 'tilt/bluecloth'
 
-  class MarkdownBlueClothTest < Test::Unit::TestCase
+  class MarkdownBlueClothTest < Minitest::Test
     include MarkdownTests
     template Tilt::BlueClothTemplate
   end
@@ -128,9 +127,9 @@ rescue LoadError => boom
 end
 
 begin
-  require 'kramdown'
+  require 'tilt/kramdown'
 
-  class MarkdownKramdownTest < Test::Unit::TestCase
+  class MarkdownKramdownTest < Minitest::Test
     include MarkdownTests
     template Tilt::KramdownTemplate
     # Doesn't support escaping
@@ -146,9 +145,9 @@ end
 
 
 begin
-  require 'maruku'
+  require 'tilt/maruku'
 
-  class MarkdownMarukuTest < Test::Unit::TestCase
+  class MarkdownMarukuTest < Minitest::Test
     include MarkdownTests
     template Tilt::MarukuTemplate
     # Doesn't support escaping

data/test/tilt_marukutemplate_test.rb

@@ -1,27 +1,15 @@
-require 'contest'
+require 'test_helper'
 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
+  require 'tilt/maruku'
 
+  class MarukuTemplateTest < Minitest::Test
     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)
+        lazy = Tilt.lazy_map[ext]
+        kram_idx = lazy.index { |klass, file| klass == 'Tilt::KramdownTemplate' }
+        maru_idx = lazy.index { |klass, file| klass == 'Tilt::MarukuTemplate' }
         assert maru_idx > kram_idx,
           "#{maru_idx} should be higher than #{kram_idx}"
       end

data/test/tilt_metadata_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+require 'tilt/template'
+
+module Tilt
+  class TemplateMetadataTest < Minitest::Test
+    class MyTemplate < Template
+      metadata[:global] = 1
+      self.default_mime_type = 'text/html'
+
+      def prepare
+      end
+
+      def allows_script?
+        true
+      end
+    end
+
+    test "global metadata" do
+      assert MyTemplate.metadata
+      assert_equal 1, MyTemplate.metadata[:global]
+    end
+
+    test "instance metadata" do
+      tmpl = MyTemplate.new { '' }
+      assert_equal 1, tmpl.metadata[:global]
+    end
+
+    test "gracefully handles default_mime_type" do
+      assert_equal 'text/html', MyTemplate.metadata[:mime_type]
+    end
+
+    test "still allows .default_mime_type" do
+      assert_equal 'text/html', MyTemplate.default_mime_type
+    end
+
+    test "gracefully handles allows_script?" do
+      tmpl = MyTemplate.new { '' }
+      assert_equal true, tmpl.metadata[:allows_script]
+    end
+  end
+end
+

data/test/tilt_nokogiritemplate_test.rb

@@ -1,9 +1,9 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'nokogiri'
-  class NokogiriTemplateTest < Test::Unit::TestCase
+  require 'tilt/nokogiri'
+  class NokogiriTemplateTest < Minitest::Test
     test "registered for '.nokogiri' files" do
       assert_equal Tilt::NokogiriTemplate, Tilt['test.nokogiri']
       assert_equal Tilt::NokogiriTemplate, Tilt['test.xml.nokogiri']

data/test/tilt_radiustemplate_test.rb

@@ -1,14 +1,14 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'radius'
+  require 'tilt/radius'
 
   # Disable radius tests under Ruby versions >= 1.9.1 since it's still buggy.
   # Remove when fixed upstream.
   raise LoadError if RUBY_VERSION >= "1.9.1" and Radius.version < "0.7"
 
-  class RadiusTemplateTest < Test::Unit::TestCase
+  class RadiusTemplateTest < Minitest::Test
     test "registered for '.radius' files" do
       assert_equal Tilt::RadiusTemplate, Tilt['test.radius']
     end

data/test/tilt_rdiscounttemplate_test.rb

@@ -1,27 +1,15 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'rdiscount'
-
-  class RDiscountTemplateTest < Test::Unit::TestCase
-    test "registered for '.md' files" do
-      assert Tilt.mappings['md'].include?(Tilt::RDiscountTemplate)
-    end
-
-    test "registered for '.mkd' files" do
-      assert Tilt.mappings['mkd'].include?(Tilt::RDiscountTemplate)
-    end
-
-    test "registered for '.markdown' files" do
-      assert Tilt.mappings['markdown'].include?(Tilt::RDiscountTemplate)
-    end
+  require 'tilt/rdiscount'
 
+  class RDiscountTemplateTest < Minitest::Test
     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)
+        lazy = Tilt.lazy_map[ext]
+        rdis_idx = lazy.index { |klass, file| klass == 'Tilt::RDiscountTemplate' }
+        blue_idx = lazy.index { |klass, file| klass == 'Tilt::BlueClothTemplate' }
         assert rdis_idx < blue_idx,
           "#{rdis_idx} should be lower than #{blue_idx}"
       end

data/test/tilt_rdoctemplate_test.rb

@@ -1,11 +1,9 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'rdoc'
-  require 'rdoc/markup'
-  require 'rdoc/markup/to_html'
-  class RDocTemplateTest < Test::Unit::TestCase
+  require 'tilt/rdoc'
+  class RDocTemplateTest < Minitest::Test
     test "is registered for '.rdoc' files" do
       assert_equal Tilt::RDocTemplate, Tilt['test.rdoc']
     end

data/test/tilt_redcarpettemplate_test.rb

@@ -1,27 +1,15 @@
-require 'contest'
+require 'test_helper'
 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
+  require 'tilt/redcarpet'
 
+  class RedcarpetTemplateTest < Minitest::Test
     test "registered above BlueCloth" do
       %w[md mkd markdown].each do |ext|
-        mappings = Tilt.mappings[ext]
-        blue_idx = mappings.index(Tilt::BlueClothTemplate)
-        redc_idx = mappings.index(Tilt::RedcarpetTemplate)
+        lazy = Tilt.lazy_map[ext]
+        blue_idx = lazy.index { |klass, file| klass == 'Tilt::BlueClothTemplate' }
+        redc_idx = lazy.index { |klass, file| klass == 'Tilt::RedcarpetTemplate' }
         assert redc_idx < blue_idx,
           "#{redc_idx} should be lower than #{blue_idx}"
       end
@@ -29,9 +17,9 @@ begin
 
     test "registered above RDiscount" do
       %w[md mkd markdown].each do |ext|
-        mappings = Tilt.mappings[ext]
-        rdis_idx = mappings.index(Tilt::RDiscountTemplate)
-        redc_idx = mappings.index(Tilt::RedcarpetTemplate)
+        lazy = Tilt.lazy_map[ext]
+        rdis_idx = lazy.index { |klass, file| klass == 'Tilt::RDiscountTemplate' }
+        redc_idx = lazy.index { |klass, file| klass == 'Tilt::RedcarpetTemplate' }
         assert redc_idx < rdis_idx,
           "#{redc_idx} should be lower than #{rdis_idx}"
       end
@@ -55,14 +43,14 @@ begin
     test "smartypants when :smart is set" do
       template = Tilt::RedcarpetTemplate.new(:smartypants => true) { |t|
         "OKAY -- 'Smarty Pants'" }
-      assert_match /<p>OKAY &ndash; &#39;Smarty Pants&#39;<\/p>/,
+      assert_match /<p>OKAY &ndash; (&#39;|&lsquo;)Smarty Pants(&#39;|&rsquo;)<\/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 &ndash; &#39;Smarty Pants&#39;<\/p>/,
+      assert_match /<p>OKAY &ndash; (&#39;|&lsquo;)Smarty Pants(&#39;|&rsquo;)<\/p>/,
         template.render
     end
   end

data/test/tilt_redclothtemplate_test.rb

@@ -1,10 +1,10 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'redcloth'
+  require 'tilt/redcloth'
 
-  class RedClothTemplateTest < Test::Unit::TestCase
+  class RedClothTemplateTest < Minitest::Test
     test "is registered for '.textile' files" do
       assert_equal Tilt::RedClothTemplate, Tilt['test.textile']
     end

data/test/tilt_sasstemplate_test.rb

@@ -1,10 +1,10 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'sass'
+  require 'tilt/sass'
 
-  class SassTemplateTest < Test::Unit::TestCase
+  class SassTemplateTest < Minitest::Test
     test "is registered for '.sass' files" do
       assert_equal Tilt::SassTemplate, Tilt['test.sass']
     end
@@ -20,7 +20,7 @@ begin
     end
   end
 
-  class ScssTemplateTest < Test::Unit::TestCase
+  class ScssTemplateTest < Minitest::Test
     test "is registered for '.scss' files" do
       assert_equal Tilt::ScssTemplate, Tilt['test.scss']
     end

data/test/tilt_stringtemplate_test.rb

@@ -1,7 +1,8 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
+require 'tilt/string'
 
-class StringTemplateTest < Test::Unit::TestCase
+class StringTemplateTest < Minitest::Test
   test "registered for '.str' files" do
     assert_equal Tilt::StringTemplate, Tilt['test.str']
   end
@@ -73,7 +74,7 @@ class StringTemplateTest < Test::Unit::TestCase
 end
 
 
-class CompiledStringTemplateTest < Test::Unit::TestCase
+class CompiledStringTemplateTest < Minitest::Test
   def teardown
     GC.start
   end

data/test/tilt_template_test.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
-require 'contest'
+require 'test_helper'
 require 'tilt'
+require 'tilt/template'
 require 'tempfile'
 
-class TiltTemplateTest < Test::Unit::TestCase
+class TiltTemplateTest < Minitest::Test
 
   class MockTemplate < Tilt::Template
     def prepare
@@ -11,7 +12,7 @@ class TiltTemplateTest < Test::Unit::TestCase
   end
 
   test "needs a file or block" do
-    assert_raise(ArgumentError) { Tilt::Template.new }
+    assert_raises(ArgumentError) { Tilt::Template.new }
   end
 
   test "initializing with a file" do
@@ -49,7 +50,7 @@ class TiltTemplateTest < Test::Unit::TestCase
 
   test "uses a default filename for #eval_file when no file provided" do
     inst = MockTemplate.new { 'Hi' }
-    assert_not_nil inst.eval_file
+    refute_nil inst.eval_file
     assert !inst.eval_file.include?("\n")
   end
 
@@ -81,43 +82,29 @@ class TiltTemplateTest < Test::Unit::TestCase
     end
   end
 
-  test "one-time template engine initialization" do
-    assert_nil InitializingMockTemplate.engine_initialized
-    assert_equal 0, InitializingMockTemplate.initialized_count
-
-    InitializingMockTemplate.new { "Hello World!" }
-    assert InitializingMockTemplate.engine_initialized
-    assert_equal 1, InitializingMockTemplate.initialized_count
-
-    InitializingMockTemplate.new { "Hello World!" }
-    assert_equal 1, InitializingMockTemplate.initialized_count
-  end
-
   class PreparingMockTemplate < Tilt::Template
-    include Test::Unit::Assertions
     def prepare
-      assert !data.nil?
+      raise "data must be set" if data.nil?
       @prepared = true
     end
     def prepared? ; @prepared ; end
   end
 
   test "raises NotImplementedError when #prepare not defined" do
-    assert_raise(NotImplementedError) { Tilt::Template.new { |template| "Hello World!" } }
+    assert_raises(NotImplementedError) { Tilt::Template.new { |template| "Hello World!" } }
   end
 
   test "raises NotImplementedError when #evaluate or #template_source not defined" do
     inst = PreparingMockTemplate.new { |t| "Hello World!" }
-    assert_raise(NotImplementedError) { inst.render }
+    assert_raises(NotImplementedError) { inst.render }
     assert inst.prepared?
   end
 
   class SimpleMockTemplate < PreparingMockTemplate
-    include Test::Unit::Assertions
     def evaluate(scope, locals, &block)
-      assert prepared?
-      assert !scope.nil?
-      assert !locals.nil?
+      raise "should be prepared" unless prepared?
+      raise "scope should be present" if scope.nil?
+      raise "locals should be present" if locals.nil?
       "<em>#{@data}</em>"
     end
   end
@@ -148,11 +135,40 @@ class TiltTemplateTest < Test::Unit::TestCase
 
   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) }
+    err = assert_raises(RuntimeError) { inst.render(Object.new, 'ANSWER' => 3) }
     assert_equal "invalid locals key: \"ANSWER\" (keys must be variable names)", err.message
     assert_equal "1 + 2 = 3", inst.render(Object.new, '_answer' => 3)
   end
 
+  test "template_source with nil locals" do
+    inst = SourceGeneratingMockTemplate.new { |t| 'Hey' }
+    assert_equal 'Hey', inst.render(Object.new, nil)
+    assert inst.prepared?
+  end
+
+  class CustomGeneratingMockTemplate < PreparingMockTemplate
+    def precompiled_template(locals)
+      data
+    end
+
+    def precompiled_preamble(locals)
+      options.fetch(:preamble)
+    end
+
+    def precompiled_postamble(locals)
+      options.fetch(:postamble)
+    end
+  end
+
+  test "supports pre/postamble" do
+    inst = CustomGeneratingMockTemplate.new(
+      :preamble => 'buf = []',
+      :postamble => 'buf.join'
+    ) { 'buf << 1' }
+
+    assert_equal "1", inst.render
+  end
+
   class Person
     CONSTANT = "Bob"
 
@@ -178,6 +194,23 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert_equal "Hey Bob!", inst.render(Person.new("Joe"))
   end
 
+  test "populates Tilt.current_template during rendering" do
+    inst = SourceGeneratingMockTemplate.new { '#{$inst = Tilt.current_template}' }
+    inst.render
+    assert_equal inst, $inst
+    assert_nil Tilt.current_template
+  end
+
+  test "populates Tilt.current_template in nested rendering" do
+    inst1 = SourceGeneratingMockTemplate.new { '#{$inst.render; $inst1 = Tilt.current_template}' }
+    inst2 = SourceGeneratingMockTemplate.new { '#{$inst2 = Tilt.current_template}' }
+    $inst = inst2
+    inst1.render
+    assert_equal inst1, $inst1
+    assert_equal inst2, $inst2
+    assert_nil Tilt.current_template
+  end
+
   ##
   # Encodings
 

data/test/tilt_test.rb

@@ -1,7 +1,7 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
-class TiltTest < Test::Unit::TestCase
+class TiltTest < Minitest::Test
   class MockTemplate
     attr_reader :args, :block
     def initialize(*args, &block)
@@ -11,38 +11,38 @@ class TiltTest < Test::Unit::TestCase
   end
 
   test "registering template implementation classes by file extension" do
-    Tilt.register('mock', MockTemplate)
+    Tilt.register(MockTemplate, 'mock')
   end
 
   test "an extension is registered if explicit handle is found" do
-    Tilt.register('mock', MockTemplate)
+    Tilt.register(MockTemplate, 'mock')
     assert Tilt.registered?('mock')
   end
 
   test "registering template classes by symbol file extension" do
-    Tilt.register(:mock, MockTemplate)
+    Tilt.register(MockTemplate, :mock)
   end
 
   test "looking up template classes by exact file extension" do
-    Tilt.register('mock', MockTemplate)
+    Tilt.register(MockTemplate, 'mock')
     impl = Tilt['mock']
     assert_equal MockTemplate, impl
   end
 
   test "looking up template classes by implicit file extension" do
-    Tilt.register('mock', MockTemplate)
+    Tilt.register(MockTemplate, 'mock')
     impl = Tilt['.mock']
     assert_equal MockTemplate, impl
   end
 
   test "looking up template classes with multiple file extensions" do
-    Tilt.register('mock', MockTemplate)
+    Tilt.register(MockTemplate, 'mock')
     impl = Tilt['index.html.mock']
     assert_equal MockTemplate, impl
   end
 
   test "looking up template classes by file name" do
-    Tilt.register('mock', MockTemplate)
+    Tilt.register(MockTemplate, 'mock')
     impl = Tilt['templates/test.mock']
     assert_equal MockTemplate, impl
   end
@@ -51,13 +51,8 @@ class TiltTest < Test::Unit::TestCase
     assert_nil Tilt['none']
   end
 
-  test "accessing template class mappings at Tilt::mappings" do
-    assert Tilt.respond_to?(:mappings)
-    assert Tilt.mappings.respond_to?(:[])
-  end
-
   test "creating new template instance with a filename" do
-    Tilt.register('mock', MockTemplate)
+    Tilt.register(MockTemplate, 'mock')
     template = Tilt.new('foo.mock', 1, :key => 'val') { 'Hello World!' }
     assert_equal ['foo.mock', 1, {:key => 'val'}], template.args
     assert_equal 'Hello World!', template.block.call

data/test/tilt_wikiclothtemplate_test.rb

@@ -1,10 +1,10 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'wikicloth'
+  require 'tilt/wikicloth'
 
-  class WikiClothTemplateTest < Test::Unit::TestCase
+  class WikiClothTemplateTest < Minitest::Test
     test "is registered for '.mediawiki' files" do
       assert_equal Tilt::WikiClothTemplate, Tilt['test.mediawiki']
     end

data/test/tilt_yajltemplate_test.rb

@@ -1,10 +1,10 @@
-require 'contest'
+require 'test_helper'
 require 'tilt'
 
 begin
-  require 'yajl'
+  require 'tilt/yajl'
 
-  class YajlTemplateTest < Test::Unit::TestCase
+  class YajlTemplateTest < Minitest::Test
     test "is registered for '.yajl' files" do
       assert_equal Tilt::YajlTemplate, Tilt['test.yajl']
     end