tilt 1.2.2 → 1.3.3

data/test/tilt_nokogiritemplate_test.rb

@@ -70,6 +70,17 @@ begin
         assert_equal 'strong', doc.root.name
       end
     end
+
+    test "doesn't modify self when template is a string" do
+      template = Tilt::NokogiriTemplate.new { "xml.root { xml.child @hello }" }
+      scope = Object.new
+      scope.instance_variable_set(:@hello, "Hello World!")
+
+      3.times do
+        doc = Nokogiri.XML(template.render(scope))
+        assert_equal "Hello World!", doc.text.strip
+      end
+    end
   end
 rescue LoadError
   warn "Tilt::NokogiriTemplate (disabled)"

data/test/tilt_radiustemplate_test.rb

@@ -2,11 +2,11 @@ require 'contest'
 require 'tilt'
 
 begin
+  require '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"
-
-  require 'radius'
+  raise LoadError if RUBY_VERSION >= "1.9.1" and Radius.version < "0.7"
 
   class RadiusTemplateTest < Test::Unit::TestCase
     test "registered for '.radius' files" do

data/test/tilt_rdiscounttemplate_test.rb

@@ -5,16 +5,26 @@ begin
   require 'rdiscount'
 
   class RDiscountTemplateTest < Test::Unit::TestCase
-    test "registered for '.markdown' files" do
-      assert_equal Tilt::RDiscountTemplate, Tilt['test.markdown']
-    end
-
     test "registered for '.md' files" do
-      assert_equal Tilt::RDiscountTemplate, Tilt['test.md']
+      assert Tilt.mappings['md'].include?(Tilt::RDiscountTemplate)
     end
 
     test "registered for '.mkd' files" do
-      assert_equal Tilt::RDiscountTemplate, Tilt['test.mkd']
+      assert Tilt.mappings['mkd'].include?(Tilt::RDiscountTemplate)
+    end
+
+    test "registered for '.markdown' files" do
+      assert Tilt.mappings['markdown'].include?(Tilt::RDiscountTemplate)
+    end
+
+    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)
+        assert rdis_idx < blue_idx,
+          "#{rdis_idx} should be lower than #{blue_idx}"
+      end
     end
 
     test "preparing and evaluating templates on #render" do

data/test/tilt_redcarpettemplate_test.rb

@@ -0,0 +1,59 @@
+require 'contest'
+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
+
+    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)
+        assert redc_idx < blue_idx,
+          "#{redc_idx} should be lower than #{blue_idx}"
+      end
+    end
+
+    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)
+        assert redc_idx < rdis_idx,
+          "#{redc_idx} should be lower than #{rdis_idx}"
+      end
+    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
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::RedcarpetTemplate.new { |t| "# Hello World!" }
+      3.times { assert_equal "<h1>Hello World!</h1>\n", template.render }
+    end
+
+    test "smartypants when :smart is set" do
+      template = Tilt::RedcarpetTemplate.new(:smart => true) { |t|
+        "OKAY -- 'Smarty Pants'" }
+      assert_match /<p>OKAY &[nm]dash; &lsquo;Smarty Pants&rsquo;<\/p>/,
+        template.render
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::RedcarpetTemplate (disabled)\n"
+end

data/test/tilt_sasstemplate_test.rb

@@ -2,7 +2,6 @@ require 'contest'
 require 'tilt'
 
 begin
-  require 'haml'
   require 'sass'
 
   class SassTemplateTest < Test::Unit::TestCase

data/test/tilt_stringtemplate_test.rb

@@ -48,9 +48,9 @@ class StringTemplateTest < Test::Unit::TestCase
       fail 'should have raised an exception'
     rescue => boom
       assert_kind_of NameError, boom
-      line = boom.backtrace.first
+      line = boom.backtrace.grep(/^test\.str:/).first
+      assert line, "Backtrace didn't contain test.str"
       file, line, meth = line.split(":")
-      assert_equal 'test.str', file
       assert_equal '13', line
     end
   end
@@ -119,6 +119,12 @@ 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
+  end
+
   test "backtrace file and line reporting without locals" do
     data = File.read(__FILE__).split("\n__END__\n").last
     fail unless data[0] == ?<
@@ -129,8 +135,9 @@ class CompiledStringTemplateTest < Test::Unit::TestCase
     rescue => boom
       assert_kind_of NameError, boom
       line = boom.backtrace.first
+      line = boom.backtrace.grep(/^test\.str:/).first
+      assert line, "Backtrace didn't contain test.str"
       file, line, meth = line.split(":")
-      assert_equal 'test.str', file
       assert_equal '13', line
     end
   end

data/test/tilt_template_test.rb

@@ -121,6 +121,12 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert inst.prepared?
   end
 
+  test "template_source with locals of strings" do
+    inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{name}!' }
+    assert_equal "Hey Joe!", inst.render(Object.new, 'name' => 'Joe')
+    assert inst.prepared?
+  end
+
   class Person
     CONSTANT = "Bob"
 

data/test/tilt_wikiclothtemplate_test.rb

@@ -0,0 +1,32 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'wikicloth'
+
+  class WikiClothTemplateTest < Test::Unit::TestCase
+    test "is registered for '.mediawiki' files" do
+      assert_equal Tilt::WikiClothTemplate, Tilt['test.mediawiki']
+    end
+
+    test "is registered for '.mw' files" do
+      assert_equal Tilt::WikiClothTemplate, Tilt['test.mw']
+    end
+
+    test "is registered for '.wiki' files" do
+      assert_equal Tilt::WikiClothTemplate, Tilt['test.wiki']
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::WikiClothTemplate.new { |t| "= Hello World! =" }
+      assert_match /<h1>.*Hello World!.*<\/h1>/, template.render
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::WikiClothTemplate.new { |t| "= Hello World! =" }
+      3.times { assert_match /<h1>.*Hello World!.*<\/h1>/, template.render }
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::WikiClothTemplate (disabled)\n"
+end

data/test/tilt_yajltemplate_test.rb

@@ -0,0 +1,92 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'yajl'
+
+  class YajlTemplateTest < Test::Unit::TestCase
+    test "is registered for '.yajl' files" do
+      assert_equal Tilt::YajlTemplate, Tilt['test.yajl']
+    end
+
+    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
+    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 }
+    end
+
+    test "evaluating ruby code" do
+      template = Tilt::YajlTemplate.new { "json = { :integer => (3 * 2) }" }
+      assert_equal '{"integer":6}', template.render
+    end
+
+    test "evaluating in an object scope" do
+      template = Tilt::YajlTemplate.new { "json = { :string => 'Hey ' + @name + '!' }" }
+      scope = Object.new
+      scope.instance_variable_set :@name, 'Joe'
+      assert_equal '{"string":"Hey Joe!"}', template.render(scope)
+    end
+
+    test "passing locals" do
+      template = Tilt::YajlTemplate.new { "json = { :string => 'Hey ' + name + '!' }" }
+      assert_equal '{"string":"Hey Joe!"}', template.render(Object.new, :name => 'Joe')
+    end
+
+    test "passing a block for yield" do
+      template = Tilt::YajlTemplate.new { "json = { :string => 'Hey ' + yield + '!' }" }
+      assert_equal '{"string":"Hey Joe!"}', template.render { 'Joe' }
+      assert_equal '{"string":"Hey Moe!"}', template.render { 'Moe' }
+    end
+
+    test "template multiline" do
+      template = Tilt::YajlTemplate.new { %Q{
+        json = {
+          :string   => "hello"
+        }
+      } }
+      assert_equal '{"string":"hello"}', template.render
+    end
+
+    test "template can reuse existing json buffer" do
+      template = Tilt::YajlTemplate.new { "json.merge! :string => 'hello'" }
+      assert_equal '{"string":"hello"}', template.render
+    end
+
+    test "template can end with any statement" do
+      template = Tilt::YajlTemplate.new { %Q{
+        json = {
+          :string   => "hello"
+        }
+        four = 2 * 2
+        json[:integer] = four
+        nil
+      } }
+      assert_equal '{"string":"hello","integer":4}', template.render
+    end
+
+    test "option callback" do
+      options = { :callback => 'foo' }
+      template = Tilt::YajlTemplate.new(nil, options) { "json = { :string => 'hello' }" }
+      assert_equal 'foo({"string":"hello"});', template.render
+    end
+
+    test "option variable" do
+      options = { :variable => 'output' }
+      template = Tilt::YajlTemplate.new(nil, options) { "json = { :string => 'hello' }" }
+      assert_equal 'var output = {"string":"hello"};', template.render
+    end
+
+    test "option callback and variable" do
+      options = { :callback => 'foo', :variable => 'output' }
+      template = Tilt::YajlTemplate.new(nil, options) { "json = { :string => 'hello' }" }
+      assert_equal 'var output = {"string":"hello"}; foo(output);', template.render
+    end
+
+  end
+rescue LoadError
+  warn "Tilt::YajlTemplateTest (disabled)\n"
+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.2.2'
-  s.date = '2011-01-17'
+  s.version = '1.3.3'
+  s.date = '2011-08-25'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -15,11 +15,28 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     COPYING
+    Gemfile
     README.md
     Rakefile
     TEMPLATES.md
     bin/tilt
     lib/tilt.rb
+    lib/tilt/builder.rb
+    lib/tilt/coffee.rb
+    lib/tilt/css.rb
+    lib/tilt/erb.rb
+    lib/tilt/haml.rb
+    lib/tilt/liquid.rb
+    lib/tilt/markaby.rb
+    lib/tilt/markdown.rb
+    lib/tilt/nokogiri.rb
+    lib/tilt/radius.rb
+    lib/tilt/rdoc.rb
+    lib/tilt/string.rb
+    lib/tilt/template.rb
+    lib/tilt/textile.rb
+    lib/tilt/wiki.rb
+    lib/tilt/yajl.rb
     test/contest.rb
     test/markaby/locals.mab
     test/markaby/markaby.mab
@@ -32,33 +49,40 @@ Gem::Specification.new do |s|
     test/tilt_cache_test.rb
     test/tilt_coffeescripttemplate_test.rb
     test/tilt_compilesite_test.rb
+    test/tilt_creoletemplate_test.rb
     test/tilt_erbtemplate_test.rb
     test/tilt_erubistemplate_test.rb
+    test/tilt_fallback_test.rb
     test/tilt_hamltemplate_test.rb
+    test/tilt_kramdown_test.rb
     test/tilt_lesstemplate_test.rb
     test/tilt_liquidtemplate_test.rb
     test/tilt_markaby_test.rb
+    test/tilt_markdown_test.rb
+    test/tilt_marukutemplate_test.rb
     test/tilt_nokogiritemplate_test.rb
     test/tilt_radiustemplate_test.rb
     test/tilt_rdiscounttemplate_test.rb
     test/tilt_rdoctemplate_test.rb
+    test/tilt_redcarpettemplate_test.rb
     test/tilt_redclothtemplate_test.rb
     test/tilt_sasstemplate_test.rb
     test/tilt_stringtemplate_test.rb
     test/tilt_template_test.rb
     test/tilt_test.rb
+    test/tilt_wikiclothtemplate_test.rb
+    test/tilt_yajltemplate_test.rb
     tilt.gemspec
   ]
   # = MANIFEST =
 
-  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', '>= 2.2.11'
+  s.add_development_dependency 'sass'
   s.add_development_dependency 'rdiscount'
   s.add_development_dependency 'liquid'
   s.add_development_dependency 'less'
@@ -66,13 +90,20 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'nokogiri'
   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 'redcarpet'
+  s.add_development_dependency 'creole'
+  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'wikicloth'
+  s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'kramdown'
 
-  s.extra_rdoc_files = %w[COPYING]
-
-  s.has_rdoc = true
   s.homepage = "http://github.com/rtomayko/tilt/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tilt", "--main", "Tilt"]
   s.require_paths = %w[lib]
-  s.rubyforge_project = 'wink'
   s.rubygems_version = '1.1.1'
 end