diff options
author | Eric Wong <e@80x24.org> | 2019-04-18 22:47:01 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-04-18 22:50:09 +0000 |
commit | 348f6b2b271d3562509420070bd94d6ac00619dc (patch) | |
tree | 518417c4c984438987179731e90c433d5555e1d1 | |
parent | b241b1ac6f8b0b47c69dad47716ac9b184e4c098 (diff) | |
download | public-inbox-348f6b2b271d3562509420070bd94d6ac00619dc.tar.gz |
The URLs at the top of WwwStream.pm weren't getting linkified correctly.
-rw-r--r-- | lib/PublicInbox/Linkify.pm | 15 | ||||
-rw-r--r-- | t/linkify.t | 19 |
2 files changed, 30 insertions, 4 deletions
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm index aa472cdb..71193bc2 100644 --- a/lib/PublicInbox/Linkify.pm +++ b/lib/PublicInbox/Linkify.pm @@ -15,7 +15,7 @@ use warnings; use Digest::SHA qw/sha1_hex/; my $SALT = rand; -my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher):// +my $LINK_RE = qr{([\('!])?\b((?:ftps?|https?|nntps?|gopher):// [\@:\w\.-]+(?:/ (?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*) (?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)? @@ -25,6 +25,14 @@ my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher):// sub new { bless {}, $_[0] } +# try to distinguish paired punctuation chars from the URL itself +# Maybe other languages/formats can be supported here, too... +my %pairs = ( + "(" => qr/(\)[\.,;\+]?)\z/, # Markdown (,), Ruby (+) (, for arrays) + "'" => qr/('[\.,;\+]?)\z/, # Perl / Ruby + "!" => qr/(![\.,;\+]?)\z/, # Perl / Ruby +); + sub linkify_1 { $_[1] =~ s^$LINK_RE^ my $beg = $1 || ''; @@ -35,9 +43,8 @@ sub linkify_1 { # '.', ',' or ';' to denote the end of a statement; # assume the intent was to end the statement/sentence # in English - # Markdown compatibility: - if ($beg eq '(') { - if ($url =~ s/(\)[\.,;]?)\z//) { + if (defined(my $re = $pairs{$beg})) { + if ($url =~ s/$re//) { $end = $1; } } elsif ($url =~ s/([\.,;])\z//) { diff --git a/t/linkify.t b/t/linkify.t index f0b3a6d0..bef4ffd6 100644 --- a/t/linkify.t +++ b/t/linkify.t @@ -98,4 +98,23 @@ use PublicInbox::Linkify; 'Markdown-compatible end of sentence'); } +# Perl and Ruby code compatibility +{ + my $l = PublicInbox::Linkify->new; + my $u = 'http://example.com/'; + foreach my $q ("'%s'", '"%s"', 'q!%s!', 'q(%s)') { + # Perl + my $s = sprintf("my \$var = $q;", $u); + $s = $l->linkify_1($s); + $s = $l->linkify_2($s); + like($s, qr/>\Q$u\E</, "no quote($q) in URL"); + + # applies to Ruby, too + $s = sprintf("$q,", $u); + $s = $l->linkify_1($s); + $s = $l->linkify_2($s); + like($s, qr/>\Q$u\E</, "no quote($q) in URL array"); + } +} + done_testing(); |