Merge pull request #335 from mnishiguchi/mnishiguchi/autolink-configurability

Make AutolinkFilter configurable

Author: gjtorikian

lib/html/pipeline/autolink_filter.rb

@@ -8,6 +8,7 @@ class Pipeline
     #
     # Context options:
     #   :autolink  - boolean whether to autolink urls
+    #   :link_mode - :all, :urls or :email_addresses
     #   :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
@@ -22,7 +23,11 @@ def call
         flags = 0
         flags |= context[:flags] if context[:flags]
 
-        Rinku.auto_link(html, :urls, context[:link_attr], skip_tags, flags)
+        Rinku.auto_link(html, link_mode, context[:link_attr], skip_tags, flags)
+      end
+
+      def link_mode
+        context[:link_mode] || :urls
       end
     end
   end

test/html/pipeline/autolink_filter_test.rb

@@ -34,4 +34,24 @@ def test_autolink_skip_tags
     assert_equal '<code>"<a href="http://github.com">http://github.com</a>"</code>',
                  AutolinkFilter.to_html('<code>"http://github.com"</code>', skip_tags: %w[kbd script])
   end
+
+  def test_link_mode_default
+    assert_equal '<p>"<a href="http://www.github.com">http://www.github.com</a>"</p><p>"[email protected]"</p>',
+                 AutolinkFilter.to_html('<p>"http://www.github.com"</p><p>"[email protected]"</p>')
+  end
+
+  def test_link_mode_urls
+    assert_equal '<p>"<a href="http://www.github.com">http://www.github.com</a>"</p><p>"[email protected]"</p>',
+                 AutolinkFilter.to_html('<p>"http://www.github.com"</p><p>"[email protected]"</p>', link_mode: :urls)
+  end
+
+  def test_link_mode_all
+    assert_equal '<p>"<a href="http://www.github.com">http://www.github.com</a>"</p><p>"<a href="mailto:[email protected]">[email protected]</a>"</p>',
+                 AutolinkFilter.to_html('<p>"http://www.github.com"</p><p>"[email protected]"</p>', link_mode: :all)
+  end
+
+  def test_link_mode_email_addresses
+    assert_equal '<p>"http://www.github.com"</p><p>"<a href="mailto:[email protected]">[email protected]</a>"</p>',
+                 AutolinkFilter.to_html('<p>"http://www.github.com"</p><p>"[email protected]"</p>', link_mode: :email_addresses)
+  end
 end