move precheck to MDA namespace

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

diff --git a/MANIFEST b/MANIFEST
index 3dba694221e858a2a9b376a55188da6ff1f1aa38..893cf3fd7e81ce9625bcb5c4cbe87e0ac84eaf90 100644 (file)
--- 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 cfa9d4bf9d9ca6dd8baf06eaf918fbb3a379e150..22879236e0b76dddda14df0aa605e3cdfedbe80f 100644 (file)
--- 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 1f4d339f63eaa1e561586cae84ed9334634d9d90..dd3dac80291c14a962c92673b2da7c92cec2498a 100755 (executable)
--- 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 acfd5e8b46f0530ccbc1672fdc7687d8204af7e8..42592bc271fc0448e0ab49d764b544913efa83c2 100644 (file)
--- 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();