user/dev discussion of public-inbox itself
 help / color / Atom feed
* [PATCH] linkify: don't get confused by URLs in Perl code, at least
@ 2019-04-18 22:47 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2019-04-18 22:47 UTC (permalink / raw)
  To: meta

The URLs at the top of WwwStream.pm weren't getting linkified
correctly.
---
 lib/PublicInbox/Linkify.pm | 15 +++++++++++----
 t/linkify.t                | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index aa472cd..71193bc 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -15,7 +15,7 @@ package PublicInbox::Linkify;
 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 @@ package PublicInbox::Linkify;
 
 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 f0b3a6d..bef4ffd 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();
-- 
EW


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-18 22:47 [PATCH] linkify: don't get confused by URLs in Perl code, at least Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox