Merge pull request rtomayko#139 from DAddYE/master

Redcarpet 2
lilith · Feb 25, 2012 · 10a8ffa · 10a8ffa
2 parents 7233eef + 87f0358
commit 10a8ffa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/tilt/markdown.rb b/lib/tilt/markdown.rb
@@ -53,7 +53,7 @@ def initialize_engine
     end
 
     def prepare
-      klass = [Redcarpet1, Redcarpet2].detect { |e| e.engine_initialized? }
+      klass = [Redcarpet2, Redcarpet1].detect { |e| e.engine_initialized? }
       @engine = klass.new(file, line, options) { data }
     end
 

diff --git a/test/tilt_markdown_test.rb b/test/tilt_markdown_test.rb
@@ -98,7 +98,7 @@ class MarkdownRedcarpetTest < Test::Unit::TestCase
 
     def test_smarty_pants_true
       html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
-      assert_equal "<p>Hello “World” – This is — a test …</p>", html
+      assert_equal "<p>Hello “World'' – This is — a test …</p>", html
     end
   end
 rescue LoadError => boom

diff --git a/test/tilt_redcarpettemplate_test.rb b/test/tilt_redcarpettemplate_test.rb
@@ -37,6 +37,11 @@ class RedcarpetTemplateTest < Test::Unit::TestCase
       end
     end
 
+    test "redcarpet2 is our default choice" do
+      template = Tilt::RedcarpetTemplate.new {}
+      assert_equal Tilt::RedcarpetTemplate::Redcarpet2, template.prepare.class
+    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
@@ -48,9 +53,9 @@ class RedcarpetTemplateTest < Test::Unit::TestCase
     end
 
     test "smartypants when :smart is set" do
-      template = Tilt::RedcarpetTemplate.new(:smart => true) { |t|
+      template = Tilt::RedcarpetTemplate.new(:smartypants => true) { |t|
         "OKAY -- 'Smarty Pants'" }
-      assert_match /<p>OKAY &[nm]dash; &lsquo;Smarty Pants&rsquo;<\/p>/,
+      assert_match /<p>OKAY &ndash; &#39;Smarty Pants&#39;<\/p>/,
         template.render
     end
   end