tilt 1.3 → 1.3.2

data/TEMPLATES.md

@@ -40,6 +40,7 @@ implementations (depending on which are available on your system):
 
  * [Markdown](#markdown) - Generic Markdown implementation
  * [RDiscount](#rdiscount) - `Tilt::RDiscountTemplate`
+ * Redcarpet - `Tilt::RedcarpetTemplate`
  * BlueCloth - `Tilt::BlueClothTemplate`
  * Kramdown - `Tilt::KramdownTemplate`
  * Maruku - `Tilt::MarukuTemplate`
@@ -427,6 +428,7 @@ formatted texts are readable.
 Markdown formatted texts are converted to HTML with one of these libraries:
 
   * [RDiscount](#rdiscount) - `Tilt::RDiscountTemplate`
+  * Redcarpet - `Tilt::RedcarpetTemplate`
   * BlueCloth - `Tilt::BlueClothTemplate`
   * Kramdown - `Tilt::KramdownTemplate`
   * Maruku - `Tilt::MarukuTemplate`

data/lib/tilt/coffee.rb

@@ -8,7 +8,7 @@ module Tilt
   class CoffeeScriptTemplate < Template
     self.default_mime_type = 'application/javascript'
 
-    @@default_bare = true
+    @@default_bare = false
 
     def self.default_bare
       @@default_bare

data/lib/tilt/nokogiri.rb

@@ -28,7 +28,7 @@ module Tilt
 
     def precompiled_preamble(locals)
       return super if locals.include? :xml
-      "xml = ::Nokogiri::XML::Builder.new\n#{super}"
+      "xml = ::Nokogiri::XML::Builder.new { |xml| }\n#{super}"
     end
 
     def precompiled_postamble(locals)

data/lib/tilt.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '1.3'
+  VERSION = '1.3.2'
 
   @preferred_mappings = Hash.new
   @template_mappings = Hash.new { |h, k| h[k] = [] }
@@ -17,9 +17,7 @@ module Tilt
   def self.register(template_class, *extensions)
     if template_class.respond_to?(:to_str)
       # Support register(ext, template_class) too
-      ext = template_class
-      template_class = extensions[0]
-      extensions = [ext]
+      extensions, template_class = [template_class], extensions[0]
     end
 
     extensions.each do |ext|
@@ -76,8 +74,8 @@ module Tilt
     end
 
     # Try to find a preferred engine.
-    klass = @preferred_mappings[pattern]
-    return klass if klass
+    preferred_klass = @preferred_mappings[pattern]
+    return preferred_klass if preferred_klass
 
     # Fall back to the general list of mappings.
     klasses = @template_mappings[pattern]

data/test/tilt_coffeescripttemplate_test.rb

@@ -40,7 +40,8 @@ begin
 
       test "no options" do
         template = Tilt::CoffeeScriptTemplate.new { |t| "puts 'Hello, World!'\n" }
-        assert_equal "puts('Hello, World!');", template.render
+        assert_match "puts('Hello, World!');", template.render
+        assert_match "(function() {", template.render
       end
 
       test "overridden by :bare" do

data/test/tilt_markdown_test.rb

@@ -36,6 +36,9 @@ module MarkdownTests
   end
 
   def test_escape_html_true
+    if self.class.template == Tilt::RedcarpetTemplate
+      flunk "redcarpet doesn't support :escape_html yet"
+    end
     html = nrender "Hello <b>World</b>", :escape_html => true
     assert_equal "<p>Hello &lt;b&gt;World&lt;/b&gt;</p>", html
   end
@@ -66,12 +69,8 @@ module MarkdownTests
   end
 
   def test_smarty_pants_true
-    if self.class.template == Tilt::RedcarpetTemplate
-      warn "\nsmartypants not yet fully supported by redcarpet (#{__FILE__}:#{__LINE__})"
-    else
-      html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
-      assert_equal "<p>Hello “World” — This is —– a test …</p>", html
-    end
+    html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
+    assert_equal "<p>Hello “World” — This is —– a test …</p>", html
   end
 end
 

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_redcarpettemplate_test.rb

@@ -47,7 +47,7 @@ begin
     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 &lt;blink&gt;WORLD&lt;/blink&gt;</p>\n", template.render
+      assert_equal "<p>HELLO WORLD</p>\n", template.render
     end
   end
 rescue LoadError => boom

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/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.3'
-  s.date = '2011-04-26'
+  s.version = '1.3.2'
+  s.date = '2011-05-26'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -72,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'
@@ -92,10 +90,8 @@ Gem::Specification.new do |s|
   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,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tilt
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: "1.3"
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -10,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
-default_executable: tilt
+date: 2011-05-26 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: contest
@@ -21,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -32,6 +40,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,6 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -54,6 +68,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 2
+        - 11
         version: 2.2.11
   type: :development
   version_requirements: *id004
@@ -65,6 +84,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -76,6 +98,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -87,6 +112,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -98,6 +126,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -109,6 +140,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -120,6 +154,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -131,6 +168,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -142,6 +182,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id012
@@ -153,6 +196,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id013
@@ -164,6 +210,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id014
@@ -175,6 +224,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id015
@@ -186,17 +238,34 @@ dependencies:
     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
@@ -272,17 +341,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.6.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Generic interface to multiple Ruby template engines