Merge pull request #10 from aflock/support-parens

Support parentheses within url
bryanwoods · Nov 6, 2013 · 4a80913 · 4a80913
2 parents 3812d87 + 5a0a6b1
commit 4a80913
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/autolink.coffee b/autolink.coffee
@@ -3,8 +3,8 @@ autoLink = (options...) ->
     (^|\s) # Capture the beginning of string or leading whitespace
     (
       (?:https?|ftp):// # Look for a valid URL protocol (non-captured)
-      [\-A-Z0-9+\u0026@#/%?=~_|!:,.;]* # Valid URL characters (any number of times)
-      [\-A-Z0-9+\u0026@#/%=~_|] # String must end in a valid URL character
+      [\-A-Z0-9+\u0026@#/%?=()~_|!:,.;]* # Valid URL characters (any number of times)
+      [\-A-Z0-9+\u0026@#/%=~()_|] # String must end in a valid URL character
     )
   ///gi
 

diff --git a/autolink.js b/autolink.js
diff --git a/test/autolink-spec.coffee b/test/autolink-spec.coffee
@@ -56,6 +56,12 @@ describe "autolink", ->
       "Go here now <a href='http://twitter.com/#!/PostDeskUK'>http://twitter.com/#!/PostDeskUK</a>"
     )
 
+  it "correctly handles parentheses ()", ->
+    expect("My favorite Wikipedia Article http://en.wikipedia.org/wiki/Culture_of_honor_(Southern_United_States)".autoLink()).
+    toEqual(
+      "My favorite Wikipedia Article <a href='http://en.wikipedia.org/wiki/Culture_of_honor_(Southern_United_States)'>http://en.wikipedia.org/wiki/Culture_of_honor_(Southern_United_States)</a>"
+    )
+
   it "correctly handles FTP links", ->
     expect("Click here ftp://ftp.google.com".autoLink()).
     toEqual(

diff --git a/test/autolink-spec.js b/test/autolink-spec.js