tilt 0.6 → 1.1

data/test/tilt_radiustemplate_test.rb

@@ -0,0 +1,70 @@
+require 'contest'
+require 'tilt'
+
+begin
+  # 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"
+
+  require 'radius'
+
+  class RadiusTemplateTest < Test::Unit::TestCase
+    test "registered for '.radius' files" do
+      assert_equal Tilt::RadiusTemplate, Tilt['test.radius']
+    end
+
+    test "preparing and evaluating templates on #render" do
+      template = Tilt::RadiusTemplate.new { |t| "Hello World!" }
+      assert_equal "Hello World!", template.render
+    end
+
+    test "passing locals" do
+      template = Tilt::RadiusTemplate.new { "Hey <r:name />!" }
+      assert_equal "Hey Joe!", template.render(nil, :name => 'Joe')
+    end
+
+    class ExampleRadiusScope
+      def beer; 'wet'; end
+      def whisky; 'wetter'; end
+    end
+
+    test "combining scope and locals when scope responds" do
+      template = Tilt::RadiusTemplate.new {
+        'Beer is <r:beer /> but Whisky is <r:whisky />.'
+      }
+      scope = ExampleRadiusScope.new
+      assert_equal "Beer is wet but Whisky is wetter.", template.render(scope)
+    end
+
+    test "precedence when locals and scope define same variables" do
+      template = Tilt::RadiusTemplate.new {
+        'Beer is <r:beer /> but Whisky is <r:whisky />.'
+      }
+      scope = ExampleRadiusScope.new
+      assert_equal "Beer is great but Whisky is greater.",
+        template.render(scope, :beer => 'great', :whisky => 'greater')
+    end
+
+    #test "handles local scope" do
+    #  beer   = 'wet'
+    #  whisky = 'wetter'
+    #
+    #  template = Tilt::RadiusTemplate.new {
+    #    'Beer is <r:beer /> but Whisky is <r:whisky />.'
+    #  }
+    #  assert_equal "Beer is wet but Whisky is wetter.", template.render(self)
+    #end
+
+    test "passing a block for yield" do
+      template = Tilt::RadiusTemplate.new {
+        'Beer is <r:yield /> but Whisky is <r:yield />ter.'
+      }
+      assert_equal "Beer is wet but Whisky is wetter.",
+        template.render({}) { 'wet' }
+    end
+  end
+
+rescue LoadError => boom
+  warn "Tilt::RadiusTemplate (disabled)\n"
+end
+

data/test/tilt_rdiscounttemplate_test.rb

@@ -17,20 +17,20 @@ begin
       assert_equal Tilt::RDiscountTemplate, Tilt['test.mkd']
     end
 
-    test "compiling and evaluating templates on #render" do
+    test "preparing and evaluating templates on #render" do
       template = Tilt::RDiscountTemplate.new { |t| "# Hello World!" }
       assert_equal "<h1>Hello World!</h1>\n", template.render
     end
 
     test "smartypants when :smart is set" do
-      template = Tilt::RDiscountTemplate.new(nil, :smart => true) { |t|
+      template = Tilt::RDiscountTemplate.new(:smart => true) { |t|
         "OKAY -- 'Smarty Pants'" }
       assert_equal "<p>OKAY &mdash; &lsquo;Smarty Pants&rsquo;</p>\n",
         template.render
     end
 
     test "stripping HTML when :filter_html is set" do
-      template = Tilt::RDiscountTemplate.new(nil, :filter_html => true) { |t|
+      template = Tilt::RDiscountTemplate.new(:filter_html => true) { |t|
         "HELLO <blink>WORLD</blink>" }
       assert_equal "<p>HELLO &lt;blink>WORLD&lt;/blink></p>\n", template.render
     end

data/test/tilt_rdoctemplate_test.rb

@@ -9,7 +9,7 @@ begin
       assert_equal Tilt::RDocTemplate, Tilt['test.rdoc']
     end
 
-    test "compiling and evaluating the template with #render" do
+    test "preparing and evaluating the template with #render" do
       template = Tilt::RDocTemplate.new { |t| "= Hello World!" }
       assert_equal "<h1>Hello World!</h1>\n", template.render
     end

data/test/tilt_sasstemplate_test.rb

@@ -11,8 +11,19 @@ begin
     end
 
     test "compiles and evaluates the template on #render" do
-      template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000ff" }
-      assert_equal "#main {\n  background-color: #0000ff; }\n", template.render
+      template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
+      assert_equal "#main {\n  background-color: #0000f1; }\n", template.render
+    end
+  end
+
+  class ScssTemplateTest < Test::Unit::TestCase
+    test "is registered for '.scss' files" do
+      assert_equal Tilt::ScssTemplate, Tilt['test.scss']
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::ScssTemplate.new { |t| "#main {\n  background-color: #0000f1;\n}" }
+      assert_equal "#main {\n  background-color: #0000f1; }\n", template.render
     end
   end
 

data/test/tilt_stringtemplate_test.rb

@@ -6,7 +6,7 @@ class StringTemplateTest < Test::Unit::TestCase
     assert_equal Tilt::StringTemplate, Tilt['test.str']
   end
 
-  test "compiling and evaluating templates on #render" do
+  test "loading and evaluating templates on #render" do
     template = Tilt::StringTemplate.new { |t| "Hello World!" }
     assert_equal "Hello World!", template.render
   end
@@ -26,6 +26,7 @@ class StringTemplateTest < Test::Unit::TestCase
   test "passing a block for yield" do
     template = Tilt::StringTemplate.new { 'Hey #{yield}!' }
     assert_equal "Hey Joe!", template.render { 'Joe' }
+    assert_equal "Hey Moe!", template.render { 'Moe' }
   end
 
   test "multiline templates" do
@@ -66,6 +67,91 @@ class StringTemplateTest < Test::Unit::TestCase
   end
 end
 
+
+class CompiledStringTemplateTest < Test::Unit::TestCase
+  def teardown
+    GC.start
+  end
+
+  class Scope
+    include Tilt::CompileSite
+  end
+
+  test "compiling template source to a method" do
+    template = Tilt::StringTemplate.new { |t| "Hello World!" }
+    template.render(Scope.new)
+    method_name = template.send(:compiled_method_name, [])
+    method_name = method_name.to_sym if Symbol === Kernel.methods.first
+    assert Tilt::CompileSite.instance_methods.include?(method_name),
+      "CompileSite.instance_methods.include?(#{method_name.inspect})"
+    assert Scope.new.respond_to?(method_name),
+      "scope.respond_to?(#{method_name.inspect})"
+  end
+
+  test "loading and evaluating templates on #render" do
+    template = Tilt::StringTemplate.new { |t| "Hello World!" }
+    assert_equal "Hello World!", template.render(Scope.new)
+  end
+
+  test "passing locals" do
+    template = Tilt::StringTemplate.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::StringTemplate.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::StringTemplate.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::StringTemplate.new { "Hello\nWorld!\n" }
+    assert_equal "Hello\nWorld!\n", template.render(Scope.new)
+  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::StringTemplate.new('test.str', 11) { data }
+    begin
+      template.render(Scope.new)
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of NameError, boom
+      line = boom.backtrace.first
+      file, line, meth = line.split(":")
+      assert_equal 'test.str', file
+      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::StringTemplate.new('test.str') { 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.str', file
+      assert_equal '6', line
+    end
+  end
+end
+
 __END__
 <html>
 <body>

data/test/tilt_template_test.rb

@@ -2,44 +2,50 @@ require 'contest'
 require 'tilt'
 
 class TiltTemplateTest < Test::Unit::TestCase
+
+  class MockTemplate < Tilt::Template
+    def prepare
+    end
+  end
+
   test "needs a file or block" do
     assert_raise(ArgumentError) { Tilt::Template.new }
   end
 
   test "initializing with a file" do
-    inst = Tilt::Template.new('foo.erb')
+    inst = MockTemplate.new('foo.erb') {}
     assert_equal 'foo.erb', inst.file
   end
 
   test "initializing with a file and line" do
-    inst = Tilt::Template.new('foo.erb', 55)
+    inst = MockTemplate.new('foo.erb', 55) {}
     assert_equal 'foo.erb', inst.file
     assert_equal 55, inst.line
   end
 
   test "uses correct eval_file" do
-    inst = Tilt::Template.new('foo.erb', 55)
+    inst = MockTemplate.new('foo.erb', 55) {}
     assert_equal 'foo.erb', inst.eval_file
   end
 
   test "uses a default filename for #eval_file when no file provided" do
-    inst = Tilt::Template.new { 'Hi' }
+    inst = MockTemplate.new { 'Hi' }
     assert_not_nil inst.eval_file
     assert !inst.eval_file.include?("\n")
   end
 
   test "calculating template's #basename" do
-    inst = Tilt::Template.new('/tmp/templates/foo.html.erb')
+    inst = MockTemplate.new('/tmp/templates/foo.html.erb') {}
     assert_equal 'foo.html.erb', inst.basename
   end
 
   test "calculating the template's #name" do
-    inst = Tilt::Template.new('/tmp/templates/foo.html.erb')
+    inst = MockTemplate.new('/tmp/templates/foo.html.erb') {}
     assert_equal 'foo', inst.name
   end
 
   test "initializing with a data loading block" do
-    Tilt::Template.new { |template| "Hello World!" }
+    MockTemplate.new { |template| "Hello World!" }
   end
 
   class InitializingMockTemplate < Tilt::Template
@@ -52,7 +58,7 @@ class TiltTemplateTest < Test::Unit::TestCase
       @@initialized_count += 1
     end
 
-    def compile!
+    def prepare
     end
   end
 
@@ -68,44 +74,43 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert_equal 1, InitializingMockTemplate.initialized_count
   end
 
-  class CompilingMockTemplate < Tilt::Template
+  class PreparingMockTemplate < Tilt::Template
     include Test::Unit::Assertions
-    def compile!
+    def prepare
       assert !data.nil?
-      @compiled = true
+      @prepared = true
     end
-    def compiled? ; @compiled ; end
+    def prepared? ; @prepared ; end
   end
 
-  test "raises NotImplementedError when #compile! not defined" do
-    inst = Tilt::Template.new { |template| "Hello World!" }
-    assert_raise(NotImplementedError) { inst.render }
+  test "raises NotImplementedError when #prepare not defined" do
+    assert_raise(NotImplementedError) { Tilt::Template.new { |template| "Hello World!" } }
   end
 
   test "raises NotImplementedError when #evaluate or #template_source not defined" do
-    inst = CompilingMockTemplate.new { |t| "Hello World!" }
+    inst = PreparingMockTemplate.new { |t| "Hello World!" }
     assert_raise(NotImplementedError) { inst.render }
-    assert inst.compiled?
+    assert inst.prepared?
   end
 
-  class SimpleMockTemplate < CompilingMockTemplate
+  class SimpleMockTemplate < PreparingMockTemplate
     include Test::Unit::Assertions
     def evaluate(scope, locals, &block)
-      assert compiled?
+      assert prepared?
       assert !scope.nil?
       assert !locals.nil?
       "<em>#{@data}</em>"
     end
   end
 
-  test "compiles and evaluates the template on #render" do
+  test "prepares and evaluates the template on #render" do
     inst = SimpleMockTemplate.new { |t| "Hello World!" }
     assert_equal "<em>Hello World!</em>", inst.render
-    assert inst.compiled?
+    assert inst.prepared?
   end
 
-  class SourceGeneratingMockTemplate < CompilingMockTemplate
-    def template_source
+  class SourceGeneratingMockTemplate < PreparingMockTemplate
+    def precompiled_template(locals)
       "foo = [] ; foo << %Q{#{data}} ; foo.join"
     end
   end
@@ -113,10 +118,12 @@ class TiltTemplateTest < Test::Unit::TestCase
   test "template_source with locals" do
     inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{name}!' }
     assert_equal "Hey Joe!", inst.render(Object.new, :name => 'Joe')
-    assert inst.compiled?
+    assert inst.prepared?
   end
 
   class Person
+    CONSTANT = "Bob"
+
     attr_accessor :name
     def initialize(name)
       @name = name
@@ -133,4 +140,19 @@ class TiltTemplateTest < Test::Unit::TestCase
     inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{yield}!' }
     assert_equal "Hey Joe!", inst.render(Object.new){ 'Joe' }
   end
+
+  test "template which accesses a constant" do
+    inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{CONSTANT}!' }
+    assert_equal "Hey Bob!", inst.render(Person.new("Joe"))
+  end
+
+  class FastPerson < Person
+    include Tilt::CompileSite
+  end
+
+  test "template which accesses a constant with Tilt::CompileSite" do
+    flunk "known broken under 1.9.1" if RUBY_VERSION =~ /^1.9.1/
+    inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{CONSTANT}!' }
+    assert_equal "Hey Bob!", inst.render(FastPerson.new("Joe"))
+  end
 end

data/test/tilt_test.rb

@@ -14,15 +14,23 @@ class TiltTest < Test::Unit::TestCase
     Tilt.register('mock', MockTemplate)
   end
 
+  test "an extension is registered if explicit handle is found" do
+    Tilt.register('mock', MockTemplate)
+    assert Tilt.registered?('mock')
+  end
+
   test "registering template classes by symbol file extension" do
     Tilt.register(:mock, MockTemplate)
   end
 
-  test "looking up template classes by file extension" do
+  test "looking up template classes by exact file extension" do
     Tilt.register('mock', MockTemplate)
     impl = Tilt['mock']
     assert_equal MockTemplate, impl
+  end
 
+  test "looking up template classes by implicit file extension" do
+    Tilt.register('mock', MockTemplate)
     impl = Tilt['.mock']
     assert_equal MockTemplate, impl
   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 = '0.6'
-  s.date = '2010-02-22'
+  s.version = '1.1'
+  s.date = '2010-09-10'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -20,16 +20,25 @@ Gem::Specification.new do |s|
     TEMPLATES.md
     bin/tilt
     lib/tilt.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/tilt_buildertemplate_test.rb
     test/tilt_cache_test.rb
-    test/tilt_coffeetemplate_test.rb
+    test/tilt_coffeescripttemplate_test.rb
+    test/tilt_compilesite_test.rb
     test/tilt_erbtemplate_test.rb
     test/tilt_erubistemplate_test.rb
     test/tilt_hamltemplate_test.rb
     test/tilt_lesstemplate_test.rb
     test/tilt_liquidtemplate_test.rb
-    test/tilt_mustache_views/external.rb
-    test/tilt_mustachetemplate_test.rb
+    test/tilt_markaby_test.rb
+    test/tilt_nokogiritemplate_test.rb
+    test/tilt_radiustemplate_test.rb
     test/tilt_rdiscounttemplate_test.rb
     test/tilt_rdoctemplate_test.rb
     test/tilt_redclothtemplate_test.rb
@@ -41,15 +50,21 @@ Gem::Specification.new do |s|
   ]
   # = MANIFEST =
 
-  s.test_files = s.files.select {|path| path =~ /^test\/spec_.*.rb/}
+  s.default_executable = 'tilt'
+  s.executables = ['tilt']
+
+  s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
   s.add_development_dependency 'contest'
   s.add_development_dependency 'builder'
   s.add_development_dependency 'erubis'
-  s.add_development_dependency 'haml'
-  s.add_development_dependency 'mustache'
+  s.add_development_dependency 'haml', '>= 2.2.11'
   s.add_development_dependency 'rdiscount'
   s.add_development_dependency 'liquid'
   s.add_development_dependency 'less'
+  s.add_development_dependency 'radius'
+  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'markaby'
+  s.add_development_dependency 'coffee-script'
 
   s.extra_rdoc_files = %w[COPYING]