Refactor link attributes to a shared constant

Author: aNsHuL5217

lib/rich_text.rb

@@ -4,6 +4,7 @@ module RichText
   DESCRIPTION_MAX_LENGTH = 500
   DESCRIPTION_WORD_BREAK_THRESHOLD_LENGTH = 450
   URL_UNSAFE_CHARS = "[^\\w!#$%&'*+,./:;=?@_~^\\-]"
+  LINK_ATTRIBUTES = 'rel="nofollow noopener noreferrer" dir="auto"'
 
   def self.new(format, text)
     case format
@@ -99,12 +100,16 @@ def linkify(text, mode = :urls)
     private
 
     def linkify_users(text)
-      text.gsub(/(?<!\w)@(?:(?:&quot;|["“”])(.+?)(?:&quot;|["“”])|(\w+))/) do |match|
-        name = ::Regexp.last_match(1) || ::Regexp.last_match(2)
-        slug = ERB::Util.url_encode(name)
-        safe_match = match.sub("@", "&#64;")
+      regex = /(?<!\w)@(?:“([^”]+?)”|”([^”]+?)”|‘([^’]+?)’|’([^’]+?)’|"([^"]+?)"|'([^']+?)'|(\w+))/
+
+      text.gsub(regex) do |match|
+        name = ::Regexp.last_match(1) || ::Regexp.last_match(2) || ::Regexp.last_match(3) || ::Regexp.last_match(4) || ::Regexp.last_match(5) || ::Regexp.last_match(6) || ::Regexp.last_match(7)
+        next match unless name
+        slug_name = name.tr("“”‘’", %q(""''))
+        slug = ERB::Util.url_encode(slug_name)
 
-        "<a href=\"/user/#{slug}\" rel=\"nofollow noopener noreferrer\">#{safe_match}</a>"
+        safe_match = match.sub("@", "&#64;")
+        "<a href=\"/user/#{slug}\" #{LINK_ATTRIBUTES}>#{safe_match}</a>"
       end
     end
 
@@ -139,8 +144,7 @@ def expand_host_shorthands(text)
     end
 
     def auto_link(text, mode)
-      link_attr = 'rel="nofollow noopener noreferrer" dir="auto"'
-      Rinku.auto_link(text, mode, link_attr) { |url| format_link_text(url) }
+      Rinku.auto_link(text, mode, LINK_ATTRIBUTES) { |url| format_link_text(url) }
     end
 
     def format_link_text(url)

test/lib/rich_text_test.rb

@@ -193,7 +193,6 @@ def test_markdown_to_html
   end
 
   def test_markdown_table_alignment
-    # Ensure that kramdown table alignment styles are converted to bootstrap classes
     markdown_table = <<~MARKDOWN
       | foo  | bar |
       |:----:|----:|
@@ -226,9 +225,11 @@ def test_text_to_html_linkify
   end
 
   def test_linkify_username_with_space
-    text = 'Hello @"Open Mapper"'
-    html = RichText.new("markdown", text).to_html
-    assert_match %r{<a href="/user/Open%20Mapper" rel="nofollow noopener noreferrer">&#64;”Open Mapper”</a>}, html
+    with_settings(:linkify => { :detection_rules => [{ :patterns => ["@(?<username>\\w+)"], :path_template => "user/\\k<username>" }] }) do
+      text = 'Hello @"Open Mapper"'
+      html = RichText.new("markdown", text).to_html
+      assert_match %r{<a href="/user/Open%20Mapper" #{RichText::LINK_ATTRIBUTES}>&#64;[“”]Open Mapper[“”]</a>}o, html
+    end
   end
 
   def test_text_to_html_linkify_replace
@@ -243,6 +244,18 @@ def test_text_to_html_linkify_replace
     end
   end
 
+  def test_linkify_username_with_quotes
+    text = "Hello @'\"Yo\"'"
+    html = RichText.new("markdown", text).to_html
+    assert_match %r{<a href="/user/%22Yo%22" #{RichText::LINK_ATTRIBUTES}>&#64;[‘'’]“Yo”[‘'’]</a>}o, html
+  end
+
+  def test_linkify_short_username
+    text = "Hello @Yo"
+    html = RichText.new("markdown", text).to_html
+    assert_match %r{<a href="/user/Yo" #{RichText::LINK_ATTRIBUTES}>&#64;Yo</a>}o, html
+  end
+
   def test_text_to_html_linkify_recognize
     with_settings(:linkify_hosts => ["replace-me.example.com"], :linkify_hosts_replacement => "repl.example.com") do
       r = RichText.new("text", "foo repl.example.com/some/path?query=te<st&limit=20>10#result12 bar")