Merge branch 'busticated-handle_twitter_parens'

Author: gregjacobs

src/Autolinker.js

@@ -137,7 +137,7 @@
 		 *    This also includes a path, url parameters, or hash anchors. Ex: google.com/path/to/file?q1=1&q2=2#myAnchor
 		 */
 		matcherRegex: (function() {
-			var twitterRegex = /(^|\s)@(\w{1,15})/,                 // For matching a twitter handle. Ex: @gregory_jacobs
+			var twitterRegex = /(^|[^\w])@(\w{1,15})/,              // For matching a twitter handle. Ex: @gregory_jacobs
 
 			    emailRegex = /(?:[\-;:&=\+\$,\w\.]+@)/,             // something@ for email addresses (a.k.a. local-part)
 

tests/AutolinkerSpec.js

@@ -486,6 +486,24 @@ describe( "Autolinker", function() {
 			} );
 
 
+			it( "should automatically link twitter handles surrounded by parentheses", function() {
+				var result = Autolinker.link( "Joe's twitter is (@joe_the_man12)" );
+				expect( result ).toBe( 'Joe\'s twitter is (<a href="https://twitter.com/joe_the_man12" target="_blank">@joe_the_man12</a>)' );
+			} );
+			
+			
+			it( "should automatically link twitter handles surrounded by braces", function() {
+				var result = Autolinker.link( "Joe's twitter is {@joe_the_man12}" );
+				expect( result ).toBe( 'Joe\'s twitter is {<a href="https://twitter.com/joe_the_man12" target="_blank">@joe_the_man12</a>}' );
+			} );
+			
+			
+			it( "should automatically link twitter handles surrounded by brackets", function() {
+				var result = Autolinker.link( "Joe's twitter is [@joe_the_man12]" );
+				expect( result ).toBe( 'Joe\'s twitter is [<a href="https://twitter.com/joe_the_man12" target="_blank">@joe_the_man12</a>]' );
+			} );
+			
+			
 			it( "should automatically link multiple twitter handles in a string", function() {
 				var result = Autolinker.link( "@greg is tweeting @joe with @josh" );
 				expect( result ).toBe( '<a href="https://twitter.com/greg" target="_blank">@greg</a> is tweeting <a href="https://twitter.com/joe" target="_blank">@joe</a> with <a href="https://twitter.com/josh" target="_blank">@josh</a>' );