tilt 1.4.1 → 2.0.0.beta1

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,17 @@ 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
@@ -176,30 +169,6 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert_equal "1", inst.render
   end
 
-  # Special-case for Haml
-  # https://github.com/rtomayko/tilt/issues/193
-  test "supports Array pre/postambles" do
-    inst = CustomGeneratingMockTemplate.new(
-      :preamble => ['buf = ', '[]'],
-      :postamble => ['buf.', 'join']
-    ) { 'buf << 1' }
-
-    # TODO: Use assert_output when we swicth to MiniTest
-    warns = <<-EOF
-precompiled_preamble should return String (not Array)
-precompiled_postamble should return String (not Array)
-EOF
-
-    begin
-      require 'stringio'
-      $stderr = StringIO.new
-      assert_equal "1", inst.render
-      assert_equal warns, $stderr.string
-    ensure
-      $stderr = STDERR
-    end
-  end
-
   class Person
     CONSTANT = "Bob"
 
@@ -225,6 +194,23 @@ EOF
     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

data/tilt.gemspec

@@ -3,8 +3,8 @@ 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.4.1'
-  s.date = '2013-05-08'
+  s.version = '2.0.0.beta1'
+  s.date = '2013-07-16'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -21,36 +21,45 @@ Gem::Specification.new do |s|
     HACKING
     README.md
     Rakefile
-    TEMPLATES.md
     bin/tilt
+    docs/TEMPLATES.md
+    docs/common.css
     lib/tilt.rb
     lib/tilt/asciidoc.rb
+    lib/tilt/bluecloth.rb
     lib/tilt/builder.rb
     lib/tilt/coffee.rb
-    lib/tilt/css.rb
+    lib/tilt/creole.rb
     lib/tilt/csv.rb
     lib/tilt/erb.rb
+    lib/tilt/erubis.rb
     lib/tilt/etanni.rb
     lib/tilt/haml.rb
+    lib/tilt/kramdown.rb
+    lib/tilt/less.rb
     lib/tilt/liquid.rb
+    lib/tilt/mapping.rb
     lib/tilt/markaby.rb
-    lib/tilt/markdown.rb
+    lib/tilt/maruku.rb
     lib/tilt/nokogiri.rb
     lib/tilt/plain.rb
     lib/tilt/radius.rb
+    lib/tilt/rdiscount.rb
     lib/tilt/rdoc.rb
+    lib/tilt/redcarpet.rb
+    lib/tilt/redcloth.rb
+    lib/tilt/sass.rb
     lib/tilt/string.rb
     lib/tilt/template.rb
-    lib/tilt/textile.rb
-    lib/tilt/wiki.rb
+    lib/tilt/wikicloth.rb
     lib/tilt/yajl.rb
-    test/contest.rb
     test/markaby/locals.mab
     test/markaby/markaby.mab
     test/markaby/markaby_other_static.mab
     test/markaby/render_twice.mab
     test/markaby/scope.mab
     test/markaby/yielding.mab
+    test/test_helper.rb
     test/tilt_asciidoctor_test.rb
     test/tilt_blueclothtemplate_test.rb
     test/tilt_buildertemplate_test.rb
@@ -62,15 +71,16 @@ Gem::Specification.new do |s|
     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_mapping.rb
     test/tilt_markaby_test.rb
     test/tilt_markdown_test.rb
     test/tilt_marukutemplate_test.rb
+    test/tilt_metadata_test.rb
     test/tilt_nokogiritemplate_test.rb
     test/tilt_radiustemplate_test.rb
     test/tilt_rdiscounttemplate_test.rb
@@ -89,29 +99,6 @@ Gem::Specification.new do |s|
 
   s.executables = ['tilt']
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
-  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 'kramdown'
-  s.add_development_dependency 'less'
-  s.add_development_dependency 'liquid'
-  s.add_development_dependency 'markaby'
-  s.add_development_dependency 'maruku'
-  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 'sass'
-  s.add_development_dependency 'wikicloth'
-  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"]