tilt 0.7 → 1.1

data/test/contest.rb

@@ -0,0 +1,68 @@
+require "test/unit"
+
+# Test::Unit loads a default test if the suite is empty, whose purpose is to
+# fail. Since having empty contexts is a common practice, we decided to
+# overwrite TestSuite#empty? in order to allow them. Having a failure when no
+# tests have been defined seems counter-intuitive.
+class Test::Unit::TestSuite
+  def empty?
+    false
+  end
+end
+
+# Contest adds +teardown+, +test+ and +context+ as class methods, and the
+# instance methods +setup+ and +teardown+ now iterate on the corresponding
+# blocks. Note that all setup and teardown blocks must be defined with the
+# block syntax. Adding setup or teardown instance methods defeats the purpose
+# of this library.
+class Test::Unit::TestCase
+  def self.setup(&block)
+    define_method :setup do
+      super(&block)
+      instance_eval(&block)
+    end
+  end
+
+  def self.teardown(&block)
+    define_method :teardown do
+      instance_eval(&block)
+      super(&block)
+    end
+  end
+
+  def self.context(name, &block)
+    subclass = Class.new(self)
+    remove_tests(subclass)
+    subclass.class_eval(&block) if block_given?
+    const_set(context_name(name), subclass)
+  end
+
+  def self.test(name, &block)
+    define_method(test_name(name), &block)
+  end
+
+  class << self
+    alias_method :should, :test
+    alias_method :describe, :context
+  end
+
+private
+
+  def self.context_name(name)
+    "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+  end
+
+  def self.test_name(name)
+    "test_#{sanitize_name(name).gsub(/\s+/,'_')}".to_sym
+  end
+
+  def self.sanitize_name(name)
+    name.gsub(/\W+/, ' ').strip
+  end
+
+  def self.remove_tests(subclass)
+    subclass.public_instance_methods.grep(/^test_/).each do |meth|
+      subclass.send(:undef_method, meth.to_sym)
+    end
+  end
+end

data/test/markaby/locals.mab

@@ -0,0 +1 @@
+li foo

data/test/markaby/markaby.mab

@@ -0,0 +1 @@
+text "hello from markaby!"

data/test/markaby/markaby_other_static.mab

@@ -0,0 +1 @@
+text "_why?"

data/test/markaby/render_twice.mab

@@ -0,0 +1 @@
+text "foo"

data/test/markaby/scope.mab

@@ -0,0 +1 @@
+li foo

data/test/markaby/yielding.mab

@@ -0,0 +1,2 @@
+text("Hey ")
+yield

data/test/tilt_cache_test.rb

@@ -14,10 +14,9 @@ class TiltCacheTest < Test::Unit::TestCase
 
   test "caching with multiple complex arguments to #fetch" do
     template = nil
-    args = ['hello', {:foo => 'bar', :baz => 'bizzle'}]
-    result = @cache.fetch(*args) { template = Tilt::StringTemplate.new {''} }
+    result = @cache.fetch('hello', {:foo => 'bar', :baz => 'bizzle'}) { template = Tilt::StringTemplate.new {''} }
     assert_same template, result
-    result = @cache.fetch(*args) { fail 'should be cached' }
+    result = @cache.fetch('hello', {:foo => 'bar', :baz => 'bizzle'}) { fail 'should be cached' }
     assert_same template, result
   end
 

data/test/tilt_coffeescripttemplate_test.rb

@@ -0,0 +1,25 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'coffee_script'
+
+  class CoffeeScriptTemplateTest < Test::Unit::TestCase
+    test "is registered for '.coffee' files" do
+      assert_equal Tilt::CoffeeScriptTemplate, Tilt['test.coffee']
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::CoffeeScriptTemplate.new { |t| "puts 'Hello, World!'\n" }
+      assert_equal "(function() {\n  puts('Hello, World!');\n})();\n", template.render
+    end
+
+    test "disabling coffee-script wrapper" do
+      template = Tilt::CoffeeScriptTemplate.new(:no_wrap => true) { |t| "puts 'Hello, World!'\n" }
+      assert_equal "puts('Hello, World!');", template.render
+    end
+  end
+
+rescue LoadError => boom
+  warn "Tilt::CoffeeScriptTemplate (disabled)\n"
+end

data/test/tilt_compilesite_test.rb

@@ -1,5 +1,6 @@
 require 'contest'
 require 'tilt'
+require 'thread'
 
 class CompileSiteTest < Test::Unit::TestCase
   def setup
@@ -10,7 +11,7 @@ class CompileSiteTest < Test::Unit::TestCase
     def prepare
     end
 
-    def template_source
+    def precompiled_template(locals)
       @data.inspect
     end
   end
@@ -22,7 +23,7 @@ class CompileSiteTest < Test::Unit::TestCase
   test "compiling template source to a method" do
     template = CompilingTemplate.new { |t| "Hello World!" }
     template.render(Scope.new)
-    method_name = template.send(:compiled_method_name, [].hash)
+    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})"
@@ -32,7 +33,7 @@ class CompileSiteTest < Test::Unit::TestCase
 
   test 'garbage collecting compiled methods' do
     template = CompilingTemplate.new { '' }
-    method_name = template.send(:compiled_method_name, [].hash)
+    method_name = template.send(:compiled_method_name, [])
     template.render(Scope.new)
     assert Scope.new.respond_to?(method_name)
     Tilt::Template.send(
@@ -46,7 +47,7 @@ class CompileSiteTest < Test::Unit::TestCase
   def self.create_and_destroy_template
     template = CompilingTemplate.new { 'Hello World' }
     template.render(Scope.new)
-    method_name = template.send(:compiled_method_name, [].hash)
+    method_name = template.send(:compiled_method_name, [])
     method_name = method_name.to_sym if Symbol === Kernel.methods.first
     [template.object_id, method_name]
   end
@@ -59,4 +60,27 @@ class CompileSiteTest < Test::Unit::TestCase
     assert !Scope.new.respond_to?(finalized_method_name),
       "Scope.new.respond_to?(#{finalized_method_name.inspect})"
   end
+
+  # This test attempts to surface issues with compiling templates from
+  # multiple threads.
+  test "using compiled templates from multiple threads" do
+    template = CompilingTemplate.new { 'template' }
+    main_thread = Thread.current
+    10.times do |i|
+      threads =
+        (1..50).map do |j|
+          Thread.new {
+            begin
+              locals = { "local#{i}" => 'value' }
+              res = template.render(self, locals)
+              thread_id = Thread.current.object_id
+              res = template.render(self, "local#{thread_id.to_s}" => 'value')
+            rescue => boom
+              main_thread.raise(boom)
+            end
+          }
+        end
+      threads.each { |t| t.join }
+    end
+  end
 end

data/test/tilt_erbtemplate_test.rb

@@ -29,6 +29,23 @@ class ERBTemplateTest < Test::Unit::TestCase
     assert_equal "Hey Joe!", template.render(scope)
   end
 
+  class MockOutputVariableScope
+    attr_accessor :exposed_buffer
+  end
+
+  test "exposing the buffer to the template by default" do
+    begin
+      Tilt::ERBTemplate.default_output_variable = '@_out_buf'
+      template = Tilt::ERBTemplate.new { '<% self.exposed_buffer = @_out_buf %>hey' }
+      scope = MockOutputVariableScope.new
+      template.render(scope)
+      assert_not_nil scope.exposed_buffer
+      assert_equal scope.exposed_buffer, 'hey'
+    ensure
+      Tilt::ERBTemplate.default_output_variable = '_erbout'
+    end
+  end
+
   test "passing a block for yield" do
     template = Tilt::ERBTemplate.new { 'Hey <%= yield %>!' }
     assert_equal "Hey Joe!", template.render { 'Joe' }
@@ -102,7 +119,7 @@ class CompiledERBTemplateTest < Test::Unit::TestCase
   test "compiling template source to a method" do
     template = Tilt::ERBTemplate.new { |t| "Hello World!" }
     template.render(Scope.new)
-    method_name = template.send(:compiled_method_name, [].hash)
+    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})"

data/test/tilt_erubistemplate_test.rb

@@ -26,6 +26,23 @@ begin
       assert_equal "Hey Joe!", template.render(scope)
     end
 
+    class MockOutputVariableScope
+      attr_accessor :exposed_buffer
+    end
+
+    test "exposing the buffer to the template by default" do
+      begin
+        Tilt::ErubisTemplate.default_output_variable = '@_out_buf'
+        template = Tilt::ErubisTemplate.new { '<% self.exposed_buffer = @_out_buf %>hey' }
+        scope = MockOutputVariableScope.new
+        template.render(scope)
+        assert_not_nil scope.exposed_buffer
+        assert_equal scope.exposed_buffer, 'hey'
+      ensure
+        Tilt::ErubisTemplate.default_output_variable = '_erbout'
+      end
+    end
+
     test "passing a block for yield" do
       template = Tilt::ErubisTemplate.new { 'Hey <%= yield %>!' }
       assert_equal "Hey Joe!", template.render { 'Joe' }
@@ -77,6 +94,32 @@ begin
       assert_equal '2', template.render(scope)
       assert_equal 'original value', scope.instance_variable_get(:@buf)
     end
+
+    test "using Erubis::EscapedEruby subclass via :engine_class option" do
+      template = Tilt::ErubisTemplate.new(nil, :engine_class => ::Erubis::EscapedEruby) { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "&lt;p&gt;Hello World!&lt;/p&gt;", template.render
+    end
+
+    test "using :escape_html => true option" do
+      template = Tilt::ErubisTemplate.new(nil, :escape_html => true) { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "&lt;p&gt;Hello World!&lt;/p&gt;", template.render
+    end
+
+    test "using :escape_html => false option" do
+      template = Tilt::ErubisTemplate.new(nil, :escape_html => false) { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "<p>Hello World!</p>", template.render
+    end
+
+    test "erubis default does not escape html" do
+      template = Tilt::ErubisTemplate.new { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "<p>Hello World!</p>", template.render
+    end
+
+    test "does not modify options argument" do
+      options_hash = {:escape_html => true}
+      template = Tilt::ErubisTemplate.new(nil, options_hash) { |t| "Hello World!" }
+      assert_equal({:escape_html => true}, options_hash)
+    end
   end
 rescue LoadError => boom
   warn "Tilt::ErubisTemplate (disabled)\n"

data/test/tilt_hamltemplate_test.rb

@@ -71,6 +71,17 @@ begin
       include Tilt::CompileSite
     end
 
+    test "compiling template source to a method" do
+      template = Tilt::HamlTemplate.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 "passing locals" do
       template = Tilt::HamlTemplate.new { "%p= 'Hey ' + name + '!'" }
       assert_equal "<p>Hey Joe!</p>\n", template.render(Scope.new, :name => 'Joe')

data/test/tilt_markaby_test.rb

@@ -0,0 +1,73 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'markaby'
+
+  class MarkabyTiltTest <  Test::Unit::TestCase
+    def setup
+      @block = lambda do |t|
+        File.read(File.dirname(__FILE__) + "/#{t.file}")
+      end
+    end
+
+    test "should be able to render a markaby template with static html" do
+      tilt = Tilt::MarkabyTemplate.new("markaby/markaby.mab", &@block)
+      assert_equal "hello from markaby!", tilt.render
+    end
+
+    test "should use the contents of the template" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/markaby_other_static.mab", &@block)
+      assert_equal "_why?", tilt.render
+    end
+
+    test "should render from a string (given as data)" do
+      tilt = ::Tilt::MarkabyTemplate.new { "html do; end" }
+      assert_equal "<html></html>", tilt.render
+    end
+
+    test "should evaluate a template file in the scope given" do
+      scope = Object.new
+      def scope.foo
+        "bar"
+      end
+
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/scope.mab", &@block)
+      assert_equal "<li>bar</li>", tilt.render(scope)
+    end
+
+    test "should pass locals to the template" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/locals.mab", &@block)
+      assert_equal "<li>bar</li>", tilt.render(Object.new, { :foo => "bar" })
+    end
+
+    test "should yield to the block given" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/yielding.mab", &@block)
+      eval_scope = Markaby::Builder.new
+
+      output = tilt.render(Object.new, {}) do
+        text("Joe")
+      end
+
+      assert_equal "Hey Joe", output
+    end
+
+    test "should be able to render two templates in a row" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/render_twice.mab", &@block)
+
+      assert_equal "foo", tilt.render
+      assert_equal "foo", tilt.render
+    end
+
+    test "should retrieve a Tilt::MarkabyTemplate when calling Tilt['hello.mab']" do
+      assert_equal Tilt::MarkabyTemplate, ::Tilt['./markaby/markaby.mab']
+    end
+
+    test "should return a new instance of the implementation class (when calling Tilt.new)" do
+      assert ::Tilt.new(File.dirname(__FILE__) + "/markaby/markaby.mab").kind_of?(Tilt::MarkabyTemplate)
+    end
+  end
+
+rescue LoadError => boom
+  warn "Tilt::MarkabyTemplate (disabled)\n"
+end

data/test/tilt_nokogiritemplate_test.rb

@@ -0,0 +1,54 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'nokogiri'
+  class NokogiriTemplateTest < Test::Unit::TestCase
+    test "registered for '.nokogiri' files" do
+      assert_equal Tilt::NokogiriTemplate, Tilt['test.nokogiri']
+      assert_equal Tilt::NokogiriTemplate, Tilt['test.xml.nokogiri']
+    end
+
+    test "preparing and evaluating the template on #render" do
+      template = Tilt::NokogiriTemplate.new { |t| "xml.em 'Hello World!'" }
+      doc = Nokogiri.XML template.render
+      assert_equal 'Hello World!', doc.root.text
+      assert_equal 'em', doc.root.name
+    end
+
+    test "passing locals" do
+      template = Tilt::NokogiriTemplate.new { "xml.em('Hey ' + name + '!')" }
+      doc = Nokogiri.XML template.render(Object.new, :name => 'Joe')
+      assert_equal 'Hey Joe!', doc.root.text
+      assert_equal 'em', doc.root.name
+    end
+
+    test "evaluating in an object scope" do
+      template = Tilt::NokogiriTemplate.new { "xml.em('Hey ' + @name + '!')" }
+      scope = Object.new
+      scope.instance_variable_set :@name, 'Joe'
+      doc = Nokogiri.XML template.render(scope)
+      assert_equal 'Hey Joe!', doc.root.text
+      assert_equal 'em', doc.root.name
+    end
+
+    test "passing a block for yield" do
+      template = Tilt::NokogiriTemplate.new { "xml.em('Hey ' + yield + '!')" }
+      doc = Nokogiri.XML template.render { 'Joe' }
+      assert_equal 'Hey Joe!', doc.root.text
+      assert_equal 'em', doc.root.name
+    end
+
+    test "block style templates" do
+      template =
+        Tilt::NokogiriTemplate.new do |t|
+          lambda { |xml| xml.em('Hey Joe!') }
+        end
+      doc = Nokogiri.XML template.render template.render
+      assert_equal 'Hey Joe!', doc.root.text
+      assert_equal 'em', doc.root.name
+    end
+  end
+rescue LoadError
+  warn "Tilt::NokogiriTemplate (disabled)"
+end

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

@@ -80,7 +80,7 @@ class CompiledStringTemplateTest < Test::Unit::TestCase
   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, [].hash)
+    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})"

data/test/tilt_template_test.rb

@@ -110,7 +110,7 @@ class TiltTemplateTest < Test::Unit::TestCase
   end
 
   class SourceGeneratingMockTemplate < PreparingMockTemplate
-    def template_source
+    def precompiled_template(locals)
       "foo = [] ; foo << %Q{#{data}} ; foo.join"
     end
   end
@@ -122,6 +122,8 @@ class TiltTemplateTest < Test::Unit::TestCase
   end
 
   class Person
+    CONSTANT = "Bob"
+
     attr_accessor :name
     def initialize(name)
       @name = name
@@ -138,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.7'
-  s.date = '2010-03-04'
+  s.version = '1.1'
+  s.date = '2010-09-10'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -20,17 +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
@@ -42,15 +50,20 @@ 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]