Support for Redcarpet 2.0

jekyll.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('cucumber', "= 1.1")
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('rdiscount', "~> 1.6")
-  s.add_development_dependency('redcarpet', "~> 1.9")
+  s.add_development_dependency('redcarpet', "~> 2.0")
 
   # = MANIFEST =
   s.files = %w[

lib/jekyll/converters/markdown.rb

@@ -13,7 +13,26 @@ def setup
         when 'redcarpet'
           begin
             require 'redcarpet'
-            @redcarpet_extensions = @config['redcarpet']['extensions'].map { |e| e.to_sym }
+            # Redcarpet 2.x, converter can be instantiated,
+            # and the format of renderer options is in hash, not in array
+
+            # convert extensions array to hash form
+            #    [ 'ext_a',        'ext_b',        'ext_c'        ]
+            # => { :ext_a => true, :ext_b => true, :ext_c => true }
+            redcarpet_extensions = Hash[@config['redcarpet']['extensions'].map { |e| [e.to_sym, true] }]
+            redcarpet_render_options = Hash[@config['redcarpet']['render_options'].map { |e| [e.to_sym, true] }] rescue {}
+
+            custom_redcarpet_class = Class.new(Redcarpet::Render::HTML)
+
+            # add SmartyPants module into the class if 'smart' is specified
+            if redcarpet_extensions[:smart] == true
+              custom_redcarpet_class.class_eval do
+                include Redcarpet::Render::SmartyPants
+              end
+            end
+
+            # TODO: support Renderer options
+            @converter = Redcarpet::Markdown.new(custom_redcarpet_class.new(redcarpet_render_options), redcarpet_extensions)
           rescue LoadError
             STDERR.puts 'You are missing a library required for Markdown. Please run:'
             STDERR.puts '  $ [sudo] gem install redcarpet'
@@ -88,7 +107,8 @@ def convert(content)
       setup
       case @config['markdown']
         when 'redcarpet'
-          Redcarpet.new(content, *@redcarpet_extensions).to_html
+          # Redcarpet 2.x, converter can be instantiated
+          @converter.render(content)
         when 'kramdown'
           # Check for use of coderay
           if @config['kramdown']['use_coderay']

test/test_redcarpet.rb

@@ -4,7 +4,10 @@ class TestRedcarpet < Test::Unit::TestCase
   context "redcarpet" do
     setup do
       config = {
-        'redcarpet' => { 'extensions' => ['smart'] },
+        'redcarpet' => {
+          'extensions' => ['strikethrough', 'smart'],
+          'render_options' => ['filter_html']
+        },
         'markdown' => 'redcarpet'
       }
       @markdown = MarkdownConverter.new config
@@ -14,8 +17,16 @@ class TestRedcarpet < Test::Unit::TestCase
       assert_equal "<h1>Some Header</h1>", @markdown.convert('# Some Header #').strip
     end
 
-    should "pass redcarpet extensions" do
+    should "pass redcarpet SmartyPants option" do
       assert_equal "<p>&ldquo;smart&rdquo;</p>", @markdown.convert('"smart"').strip
     end
+
+    should "pass redcarpet extensions" do
+      assert_equal "<p><del>deleted</del></p>", @markdown.convert('~~deleted~~').strip
+    end
+
+    should "pass redcarpet render options" do
+      assert_equal "<p><strong>bad code not here</strong>: i am bad</p>", @markdown.convert('**bad code not here**: <script>i am bad</script>').strip
+    end
   end
 end