Skip to content
This repository was archived by the owner on Sep 18, 2021. It is now read-only.

add support for balanced parens in query #120

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add support for balanced parens in query #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9893d32
add support for balanced parens in query
markevaul Apr 24, 2014
8c7db23
unit tests for query balanced parens
Apr 24, 2014
eb40a37
replace tabs with spaces and align pluses
Apr 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions test/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,4 +306,11 @@ test("twttr.txt.extractUrls", function() {
var message_with_www_hyphenated_url = "Message with www.123-hyphenated-url.com";
equal(twttr.txt.extractUrls(message_with_hyphenated_url)[0], "hyphenated-url.com", "Should extract full url with hyphen.");
equal(twttr.txt.extractUrls(message_with_www_hyphenated_url)[0], "www.123-hyphenated-url.com", "Should extract full url with hyphen.");

var message_with_balanced_parens_query = "Message with http://balancedparensquery.com?q=@s=(1,2)";
var message_with_balanced_parens_query_in_parens = "Message with (http://balancedparensquery.com?q=@s=(1,2))";

equal(twttr.txt.extractUrls(message_with_balanced_parens_query)[0], "http://balancedparensquery.com?q=@s=(1,2)", "Should extract balanced parens at end of query.");
equal(twttr.txt.extractUrls(message_with_balanced_parens_query_in_parens)[0], "http://balancedparensquery.com?q=@s=(1,2)", "Should NOT extract extra paren after query.");

});
27 changes: 24 additions & 3 deletions twitter-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,29 @@
')|(?:@#{validGeneralUrlPathChars}+\/)'+
')', 'i');

twttr.txt.regexen.validUrlQueryChars = /[a-z0-9!?\*'@\(\);:&=\+\$\/%#\[\]\-_\.,~|]/i;
twttr.txt.regexen.validUrlQueryEndingChars = /[a-z0-9_&=#\/]/i;
twttr.txt.regexen.validUrlQueryChars = /[a-z0-9!?\*'@;:&=\+\$\/%#\[\]\-_\.,~|]/i;
twttr.txt.regexen.validUrlQueryBalancedParens = regexSupplant(
'\\(' +
'(?:' +
'#{validUrlQueryChars}+' +
'|' +
// allow one nested level of balanced parentheses
'(?:' +
'#{validUrlQueryChars}*' +
'\\(' +
'#{validUrlQueryChars}+' +
'\\)' +
'#{validUrlQueryChars}*' +
')' +
')' +
'\\)'
, 'i');
twttr.txt.regexen.validUrlQueryEndingChars = regexSupplant(/[a-z0-9_&=#\/]|(?:#{validUrlQueryBalancedParens})/i);
twttr.txt.regexen.validUrlQuery = regexSupplant('(?:' +
'#{validUrlQueryChars}*' +
'(?:#{validUrlQueryBalancedParens}#{validUrlQueryChars}*)*' +
'(?:#{validUrlQueryEndingChars})'+
')', 'i');
twttr.txt.regexen.extractUrl = regexSupplant(
'(' + // $1 total match
'(#{validUrlPrecedingChars})' + // $2 Preceeding chracter
Expand All @@ -304,7 +325,7 @@
'(#{validDomain})' + // $5 Domain(s)
'(?::(#{validPortNumber}))?' + // $6 Port number (optional)
'(\\/#{validUrlPath}*)?' + // $7 URL Path
'(\\?#{validUrlQueryChars}*#{validUrlQueryEndingChars})?' + // $8 Query String
'(\\?#{validUrlQuery})?' + // $8 Query String
')' +
')'
, 'gi');
Expand Down