Merge remote-tracking branch 'upstream/master' into simple-dependency-management

Author: Simeon F. Willbanks

lib/html/pipeline/autolink_filter.rb

@@ -11,6 +11,7 @@ class Pipeline
     #
     # Context options:
     #   :autolink  - boolean whether to autolink urls
+    #   :link_attr - HTML attributes for the link that will be generated
     #   :skip_tags - HTML tags inside which autolinking will be skipped.
     #                See Rinku.skip_tags
     #   :flags     - additional Rinku flags. See https://github.com/vmg/rinku
@@ -24,7 +25,7 @@ def call
         flags = 0
         flags |= context[:flags] if context[:flags]
 
-        Rinku.auto_link(html, :urls, nil, skip_tags, flags)
+        Rinku.auto_link(html, :urls, context[:link_attr], skip_tags, flags)
       end
     end
   end

test/html/pipeline/autolink_filter_test.rb

@@ -19,6 +19,11 @@ def test_autolink_option
       AutolinkFilter.to_html('<p>"http://www.github.com"</p>', :autolink => false)
   end
 
+  def test_autolink_link_attr
+    assert_equal '<p>"<a href="http://www.github.com" target="_blank">http://www.github.com</a>"</p>',
+      AutolinkFilter.to_html('<p>"http://www.github.com"</p>', :link_attr => 'target="_blank"')
+  end
+
   def test_autolink_flags
     assert_equal '<p>"<a href="http://github">http://github</a>"</p>',
       AutolinkFilter.to_html('<p>"http://github"</p>', :flags => Rinku::AUTOLINK_SHORT_DOMAINS)