tilt 1.3.1 → 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.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 
   @preferred_mappings = Hash.new
   @template_mappings = Hash.new { |h, k| h[k] = [] }

data/lib/tilt/css.rb

@@ -9,16 +9,15 @@ module Tilt
     self.default_mime_type = 'text/css'
 
     def self.engine_initialized?
-      defined?(::Sass::Engine) && defined?(::Sass::Plugin)
+      defined? ::Sass::Engine
     end
 
     def initialize_engine
       require_template_library 'sass'
-      require_template_library 'sass/plugin'
     end
 
     def prepare
-      @engine = ::Sass::Engine.new(data, ::Sass::Plugin.engine_options(sass_options))
+      @engine = ::Sass::Engine.new(data, sass_options)
     end
 
     def evaluate(scope, locals, &block)

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/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
@@ -19,17 +18,6 @@ begin
       template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
       3.times { assert_equal "#main {\n  background-color: #0000f1; }\n", template.render }
     end
-
-    test "uses configuration from Sass::Plugin.engine_options" do
-      begin
-        orig_style = Sass::Plugin.options[:style]
-        Sass::Plugin.options[:style] = :compressed
-        template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
-        assert_equal "#main{background-color:#0000f1}\n", template.render
-      ensure
-        Sass::Plugin.options[:style] = orig_style
-      end
-    end
   end
 
   class ScssTemplateTest < 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.1'
-  s.date = '2011-05-21'
+  s.version = '1.3.2'
+  s.date = '2011-05-26'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -90,6 +90,7 @@ 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.homepage = "http://github.com/rtomayko/tilt/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tilt", "--main", "Tilt"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tilt
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -07:00
+date: 2011-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -244,6 +244,20 @@ dependencies:
         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: