From: Eric Wong <e@80x24.org>
Date: Sat, 19 Apr 2014 23:11:00 +0000 (+0000)
Subject: move precheck to MDA namespace
X-Git-Tag: v1.0.0~1231
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;ds=sidebyside;h=4024aae69fe08c0aa14a69a12d55ca2b7dd4a4ab;p=public-inbox.git

move precheck to MDA namespace

We will be combining common code between -learn and -mda
---

diff --git a/MANIFEST b/MANIFEST
index 3dba6942..893cf3fd 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -6,7 +6,7 @@ MANIFEST
 Makefile.PL
 README
 examples/public-inbox-config
-lib/PublicInbox.pm
+lib/PublicInbox/MDA.pm
 lib/PublicInbox/Config.pm
 lib/PublicInbox/Feed.pm
 lib/PublicInbox/Filter.pm
diff --git a/lib/PublicInbox.pm b/lib/PublicInbox/MDA.pm
similarity index 98%
rename from lib/PublicInbox.pm
rename to lib/PublicInbox/MDA.pm
index cfa9d4bf..22879236 100644
--- a/lib/PublicInbox.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,6 +1,6 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
-package PublicInbox;
+package PublicInbox::MDA;
 use strict;
 use warnings;
 use Email::Address;
diff --git a/public-inbox-mda b/public-inbox-mda
index 1f4d339f..dd3dac80 100755
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -12,7 +12,7 @@ use Encode::MIME::Header;
 use File::Path::Expand qw/expand_filename/;
 use IPC::Run qw(run);
 use constant MDA => 'ssoma-mda';
-use PublicInbox;
+use PublicInbox::MDA;
 use PublicInbox::Filter;
 use PublicInbox::Config;
 
@@ -33,7 +33,7 @@ defined $dst or exit(1);
 my $main_repo = $dst->{mainrepo} or exit(1);
 my $filtered; # string dest
 
-if (PublicInbox->precheck($filter, $recipient) &&
+if (PublicInbox::MDA->precheck($filter, $recipient) &&
     do_spamc($filter->simple, \$filtered)) {
 	# update our message with SA headers (in case our filter rejects it)
 	my $simple = Email::Simple->new($filtered);
diff --git a/t/precheck.t b/t/precheck.t
index acfd5e8b..42592bc2 100644
--- a/t/precheck.t
+++ b/t/precheck.t
@@ -5,26 +5,26 @@ use warnings;
 use Test::More;
 use Email::Simple;
 use Email::Filter;
-use PublicInbox;
+use PublicInbox::MDA;
 
 sub do_checks {
 	my ($s) = @_;
 
 	my $f = Email::Filter->new(data => $s->as_string);
 
-	ok(PublicInbox->precheck($f, undef),
+	ok(PublicInbox::MDA->precheck($f, undef),
 		"RECIPIENT unset is OK");
 
 	my $recipient = 'foo@example.com';
-	ok(!PublicInbox->precheck($f, $recipient),
+	ok(!PublicInbox::MDA->precheck($f, $recipient),
 		"wrong RECIPIENT rejected");
 
 	$recipient = 'b@example.com';
-	ok(PublicInbox->precheck($f, $recipient),
+	ok(PublicInbox::MDA->precheck($f, $recipient),
 		"RECIPIENT in To: is OK");
 
 	$recipient = 'c@example.com';
-	ok(PublicInbox->precheck($f, $recipient),
+	ok(PublicInbox::MDA->precheck($f, $recipient),
 		"RECIPIENT in Cc: is OK");
 }
 
@@ -72,7 +72,8 @@ sub do_checks {
 		body => "hello world\n",
 	);
 	my $f = Email::Filter->new(data => $s->as_string);
-	ok(!PublicInbox->precheck($f, $recipient), "missing From: is rejected");
+	ok(!PublicInbox::MDA->precheck($f, $recipient),
+		"missing From: is rejected");
 }
 
 done_testing();