[PATCH 2/2] www: make interface more OO

[Eric Wong <e@80x24.org>]

This allows multiple instances the WWW app from
running within the same process space
---
 examples/public-inbox.psgi |  7 ++-----
 lib/PublicInbox/WWW.pm     | 24 ++++++++++++++++++------
 public-inbox-httpd         |  7 ++-----
 public-inbox.cgi           |  7 ++-----
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index c4a8903..e3e4215 100644
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -10,7 +10,7 @@ PublicInbox::WWW->preload;
 use Plack::Request;
 use Plack::Builder;
 my $have_deflater = eval { require Plack::Middleware::Deflater; 1 };
-
+my $www = PublicInbox::WWW->new;
 builder {
 	enable 'Chunked';
 	if ($have_deflater) {
@@ -25,8 +25,5 @@ builder {
 	# See Plack::Middleware::ReverseProxy documentation for details
 	# enable 'ReverseProxy';
 	enable 'Head';
-	sub {
-		my $req = Plack::Request->new(@_);
-		PublicInbox::WWW::run($req, $req->method);
-	}
+	sub { $www->call(@_) };
 }
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 651c19e..e87e559 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -22,14 +22,26 @@ use PublicInbox::GitHTTPBackend;
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $MID_RE = qr!([^/]+)!;
 our $END_RE = qr!(f/|T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
-our $pi_config;
 
-sub run {
-	my ($cgi, $method) = @_;
+sub new {
+	my ($class, $pi_config) = @_;
 	$pi_config ||= PublicInbox::Config->new;
-	my $ctx = { cgi => $cgi, pi_config => $pi_config };
+	bless { pi_config => $pi_config }, $class;
+}
+
+# backwards compatibility, do not use
+sub run {
+	my ($req, $method) = @_;
+	PublicInbox::WWW->new->call($req->env);
+}
+
+sub call {
+	my ($self, $env) = @_;
+	my $cgi = Plack::Request->new($env);
+	my $ctx = { cgi => $cgi, pi_config => $self->{pi_config} };
 	my $path_info = $cgi->path_info;
 
+	my $method = $cgi->method;
 	if ($method eq 'POST' &&
 		 $path_info =~ m!$LISTNAME_RE/(git-upload-pack)\z!) {
 		my $path = $2;
@@ -107,7 +119,7 @@ sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
 # returns undef if valid, array ref response if invalid
 sub invalid_list {
 	my ($ctx, $listname) = @_;
-	my $git_dir = $pi_config->get($listname, "mainrepo");
+	my $git_dir = $ctx->{pi_config}->get($listname, "mainrepo");
 	if (defined $git_dir) {
 		$ctx->{git_dir} = $git_dir;
 		$ctx->{git} = PublicInbox::Git->new($git_dir);
@@ -264,7 +276,7 @@ sub footer {
 			join("\n", map { "\t$_" } @urls);
 	}
 
-	my $addr = $pi_config->get($listname, 'address');
+	my $addr = $ctx->{pi_config}->get($listname, 'address');
 	if (ref($addr) eq 'ARRAY') {
 		$addr = $addr->[0]; # first address is primary
 	}
diff --git a/public-inbox-httpd b/public-inbox-httpd
index 6436bd7..3635c9a 100644
--- a/public-inbox-httpd
+++ b/public-inbox-httpd
@@ -24,6 +24,7 @@ my $refresh = sub {
 "$0 runs in /, command-line paths must be absolute\n";
 		}
 	} else {
+		my $www = PublicInbox::WWW->new;
 		$app = eval {
 			my $deflate_types = eval {
 				require Plack::Middleware::Deflater;
@@ -37,11 +38,7 @@ my $refresh = sub {
 						content_type => $deflate_types
 				}
 				enable 'Head';
-				sub {
-					my $req = Plack::Request->new(@_);
-					PublicInbox::WWW::run($req,
-							$req->method);
-				};
+				sub { $www->call(@_) };
 			};
 		};
 	}
diff --git a/public-inbox.cgi b/public-inbox.cgi
index e73e23c..ee9510c 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -11,7 +11,7 @@ use Plack::Request;
 use Plack::Handler::CGI;
 use PublicInbox::WWW;
 BEGIN { PublicInbox::WWW->preload if $ENV{MOD_PERL} }
-
+my $www = PublicInbox::WWW->new;
 my $have_deflater = eval { require Plack::Middleware::Deflater; 1 };
 my $app = builder {
 	if ($have_deflater) {
@@ -27,9 +27,6 @@ my $app = builder {
 	# enable 'ReverseProxy';
 
 	enable 'Head';
-	sub {
-		my $req = Plack::Request->new(@_);
-		PublicInbox::WWW::run($req, $req->method);
-	}
+	sub { $www->call(@_) };
 };
 Plack::Handler::CGI->new->run($app);
-- 
EW