user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/2] address: beef up the module with name list extaction
Date: Sat, 25 Jun 2016 09:44:04 +0000	[thread overview]
Message-ID: <20160625094405.9616-2-e@80x24.org> (raw)
In-Reply-To: <20160625094405.9616-1-e@80x24.org>

We may remove from_name in the future.

...And disallow quotes in email addresses.
Technically I believe they're allowed, but they're definitely
uncommon and unlikely to show up in legitimate mail.
---
 MANIFEST                   |  1 +
 lib/PublicInbox/Address.pm | 13 ++++++++++++-
 t/address.t                | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 t/address.t

diff --git a/MANIFEST b/MANIFEST
index 834cb5d..2156caf 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -99,6 +99,7 @@ scripts/import_slrnspool
 scripts/report-spam
 scripts/slrnspool2maildir
 scripts/ssoma-replay
+t/address.t
 t/cgi.t
 t/check-www-inbox.perl
 t/common.perl
diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 772aded..abba43d 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -7,7 +7,18 @@ use warnings;
 # very loose regexes, here.  We don't need RFC-compliance,
 # just enough to make thing sanely displayable and pass to git
 
-sub emails { ($_[0] =~ /([^<\s,]+\@[^>\s,]+)/g) }
+sub emails { ($_[0] =~ /([\w\.\+=\-]+\@[\w\.\-]+)>?\s*(?:,\s*|\z)/g) }
+
+sub names {
+	map {
+		tr/\r\n\t/ /;
+		s/\s*<([^<]+)\z//;
+		my $e = $1;
+		s/\A['"\s]*//;
+		s/['"\s]*\z//;
+		$_ =~ /\S/ ? $_ : $e;
+	} split(/\@+[\w\.\-]+>?\s*(?:,\s*|\z)/, $_[0]);
+}
 
 sub from_name {
 	my ($val) = @_;
diff --git a/t/address.t b/t/address.t
new file mode 100644
index 0000000..c488a8e
--- /dev/null
+++ b/t/address.t
@@ -0,0 +1,21 @@
+# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+use Test::More;
+use_ok 'PublicInbox::Address';
+
+is_deeply([qw(e@example.com e@example.org)],
+	[PublicInbox::Address::emails('User <e@example.com>, e@example.org')],
+	'address extraction works as expected');
+
+is_deeply([PublicInbox::Address::emails('"ex@example.com" <ex@example.com>')],
+	[qw(ex@example.com)]);
+
+my @names = PublicInbox::Address::names(
+	'User <e@e>, e@e, "John A. Doe" <j@d>, <x@x>');
+is_deeply(['User', 'e', 'John A. Doe', 'x'], \@names,
+	'name extraction works as expected');
+
+
+done_testing;
-- 
EW


  reply	other threads:[~2016-06-25  9:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-25  9:44 [PATCH 0/2] www: show To/Cc destinations in conversation view Eric Wong
2016-06-25  9:44 ` Eric Wong [this message]
2016-06-25  9:44 ` [PATCH 2/2] view: " Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160625094405.9616-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).