Merge remote-tracking branch 'mjschultz/master'

Conflicts: lib/jekyll/filters.rb
chiraganand · May 30, 2011 · cae0eaf · cae0eaf
2 parents 70b1112 + 9e3ad69
commit cae0eaf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
@@ -12,6 +12,15 @@ def textilize(input)
       TextileConverter.new.convert(input)
     end
 
+    # Convert a Markdown string into HTML output using RDiscount.
+    #
+    # input - The Markdown String to convert.
+    #
+    # Returns the HTML formatted String.
+    def rdiscount(input)
+      RDiscount.new(input).to_html
+    end
+
     # Format a date in short format e.g. "27 Jan 2011".
     #
     # date - the Time to format.

diff --git a/test/test_filters.rb b/test/test_filters.rb
@@ -14,6 +14,10 @@ class JekyllFilter
       assert_equal "<p>something <strong>really</strong> simple</p>", @filter.textilize("something *really* simple")
     end
 
+    should "rdiscount with simple string" do
+      assert_equal "<p>something <strong>really</strong> simple</p>\n", @filter.rdiscount("something **really** simple")
+    end
+
     should "convert array to sentence string with no args" do
       assert_equal "", @filter.array_to_sentence_string([])
     end