Make sure RDiscount autolinks URLs (silly RDiscount)

schneems · May 16, 2011 · 5043afc · 5043afc
1 parent 6fa0f32
commit 5043afc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/yard/templates/helpers/html_helper.rb b/lib/yard/templates/helpers/html_helper.rb
@@ -58,7 +58,12 @@ def htmlify(text, markup = options[:markup])
       # @since 0.6.0
       def html_markup_markdown(text)
         # TODO: other libraries might be more complex
-        markup_class(:markdown).new(text).to_html
+        provider = markup_class(:markdown)
+        if provider.to_s == 'RDiscount'
+          markup_class(:markdown).new(text, :autolink).to_html
+        else
+          markup_class(:markdown).new(text).to_html
+        end
       end
 
       # Converts Textile to HTML

diff --git a/spec/templates/helpers/html_helper_spec.rb b/spec/templates/helpers/html_helper_spec.rb
@@ -114,6 +114,13 @@ def options; {} end
       File.should_receive(:read).with('foo.rdoc').and_return('= HI')
       htmlify("{include:file:foo.rdoc}", :rdoc).gsub(/\s+/, '').should == "<p><h1>HI</h1></p>"
     end
+
+    it "should autolink URLs (markdown specific)" do
+      log.enter_level(Logger::FATAL) do
+        pending 'This test depends on markdown' unless markup_class(:markdown)
+      end
+      htmlify('http://example.com', :markdown).should include('<a href="http://example.com"')
+    end
   end
 
   describe "#link_object" do