tilt 1.2.2 → 1.3.2

data/test/tilt_redcarpettemplate_test.rb

@@ -0,0 +1,55 @@
+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)
+        rdis_idx = mappings.index(Tilt::RedcarpetTemplate)
+        assert rdis_idx < blue_idx,
+          "#{rdis_idx} should be lower than #{blue_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_equal "<p>OKAY &mdash; &lsquo;Smarty Pants&rsquo;</p>\n",
+        template.render
+    end
+
+    test "stripping HTML when :filter_html is set" do
+      template = Tilt::RedcarpetTemplate.new(:filter_html => true) { |t|
+        "HELLO <blink>WORLD</blink>" }
+      assert_equal "<p>HELLO WORLD</p>\n", 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/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.2'
+  s.date = '2011-05-26'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -20,6 +20,21 @@ Gem::Specification.new do |s|
     TEMPLATES.md
     bin/tilt
     lib/tilt.rb
+    lib/tilt/builder.rb
+    lib/tilt/coffee.rb
+    lib/tilt/creole.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
     test/contest.rb
     test/markaby/locals.mab
     test/markaby/markaby.mab
@@ -32,16 +47,22 @@ 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
@@ -51,9 +72,7 @@ Gem::Specification.new do |s|
   ]
   # = 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'
@@ -66,10 +85,13 @@ 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.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]

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tilt
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
+  - 3
   - 2
-  - 2
-  version: 1.2.2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -14,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -08:00
-default_executable: tilt
+date: 2011-05-26 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: contest
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,6 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,6 +68,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 2
         - 2
@@ -79,6 +84,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -92,6 +98,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -105,6 +112,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -118,6 +126,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -131,6 +140,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -144,6 +154,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -157,19 +168,104 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: creole
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: kramdown
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id017
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com
 executables: 
 - tilt
 extensions: []
 
-extra_rdoc_files: 
-- COPYING
+extra_rdoc_files: []
+
 files: 
 - COPYING
 - README.md
@@ -177,6 +273,21 @@ files:
 - TEMPLATES.md
 - bin/tilt
 - lib/tilt.rb
+- lib/tilt/builder.rb
+- lib/tilt/coffee.rb
+- lib/tilt/creole.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
 - test/contest.rb
 - test/markaby/locals.mab
 - test/markaby/markaby.mab
@@ -189,16 +300,22 @@ files:
 - 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
@@ -224,6 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -232,6 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -248,16 +367,22 @@ test_files:
 - 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