my ($self, $env, @args) = @_;
my $next = $self->_has_match ? $self->next : undef;
if (my ($env_delta, @match) = $self->_match_against($env)) {
- if (my ($result) = $self->_execute_with(@args, @match)) {
+ if (my ($result) = $self->_execute_with(@args, @match, $env)) {
if ($self->_is_dispatcher($result)) {
$next = $result->set_next($next);
$env = { %$env, %$env_delta };
sub new {
my ($class, $data) = @_;
my $config = { $class->_default_config, %{($data||{})->{config}||{}} };
- bless({ config => $config }, $class);
+ my $new = bless({ config => $config }, $class);
+ $new->BUILDALL($data);
+ $new;
+}
+
+sub BUILDALL {
+ my ($self, $data) = @_;
+ my $targ = ref($self);
+ my @targ;
+ while ($targ->isa(__PACKAGE__) and $targ ne __PACKAGE__) {
+ push(@targ, "${targ}::BUILD")
+ if do { no strict 'refs'; defined *{"${targ}::BUILD"}{CODE} };
+ my @targ_isa = do { no strict 'refs'; @{"${targ}::ISA"} };
+ die "${targ} uses Multiple Inheritance: ISA is: ".join ', ', @targ_isa
+ if @targ_isa > 1;
+ $targ = $targ_isa[0];
+ }
+ $self->$_($data) for reverse @targ;
+ return;
}
sub _setup_default_config {
my $proto = prototype $spec;
my $parser = $class->_build_dispatch_parser;
my $matcher = (
- defined($proto)
+ defined($proto) && length($proto)
? $parser->parse_dispatch_specification($proto)
- : undef
+ : sub { ({}, $_[1]) }
);
return $class->_build_dispatcher({
match => $matcher,
shift->_build_dispatcher({
call => sub {
[
- 500, [ 'Content-type', 'text/plain' ],
- [ 'The management apologises but we have no idea how to handle that' ]
+ 404, [ 'Content-type', 'text/plain' ],
+ [ 'Not found' ]
]
}
})
}
sub run_if_script {
- return 1 if caller(1); # 1 so we can be the last thing in the file
- my $class = shift;
- my $self = $class->new;
+ # ->as_psgi_app is true for require() but also works for plackup
+ return $_[0]->as_psgi_app if caller(1);
+ my $self = ref($_[0]) ? $_[0] : $_[0]->new;
$self->run(@_);
}
sub _run_cgi {
my $self = shift;
- require Web::Simple::HackedPlack;
- Plack::Server::CGI->run(sub { $self->_dispatch(@_) });
+ require Plack::Server::CGI;
+ Plack::Server::CGI->run($self->as_psgi_app);
+}
+
+sub _run_fcgi {
+ my $self = shift;
+ require Plack::Server::FCGI;
+ Plack::Server::FCGI->run($self->as_psgi_app);
+}
+
+sub as_psgi_app {
+ my $self = shift;
+ ref($self) ? sub { $self->_dispatch(@_) } : sub { $self->new->_dispatch(@_) }
}
sub run {
my $self = shift;
- if ($ENV{GATEWAY_INTERFACE}) {
+ if ($ENV{PHP_FCGI_CHILDREN} || $ENV{FCGI_ROLE} || $ENV{FCGI_SOCKET_PATH}) {
+ return $self->_run_fcgi;
+ } elsif ($ENV{GATEWAY_INTERFACE}) {
return $self->_run_cgi;
}
my $path = shift(@ARGV) or die "No path passed - use $0 / for root";
- require HTTP::Request::AsCGI;
require HTTP::Request::Common;
+ require Plack::Test;
local *GET = \&HTTP::Request::Common::GET;
my $request = GET($path);
- my $c = HTTP::Request::AsCGI->new($request)->setup;
- $self->_run_cgi;
- $c->restore;
- print $c->response->as_string;
+ my $response;
+ Plack::Test::test_psgi($self->as_psgi_app, sub { $response = shift->($request) });
+ print $response->as_string;
}
1;