sub dispatch {
my ($self, $env, @args) = @_;
- my $next = $self->next;
+ 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 };
}
}
}
+ return () unless $next;
return $next->dispatch($env, @args);
}
+ sub call {
+ @_ > 1
+ ? $_[0]->{call} = $_[1]
+ : shift->{call}
+ }
+
+ sub _has_match { $_[0]->{match} }
+
sub _match_against {
return ({}, $_[1]) unless $_[0]->{match};
$_[0]->{match}->($_[1]);
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 $class = shift;
+ {
+ no strict 'refs';
+ if (${"${class}::_default_config"}{CODE}) {
+ $class->_cannot_call_twice('_setup_default_config', 'default_config');
+ }
+ }
+ my @defaults = (@_, $class->_default_config);
+ {
+ no strict 'refs';
+ *{"${class}::_default_config"} = sub { @defaults };
+ }
}
sub _default_config { () }
$_[0]->_build_dispatcher({
call => sub {
my ($d, $self, $env) = (shift, shift, shift);
- $self->_run_with_self($code, $d->next->dispatch($env, $self, @_));
+ my @next = $d->next->dispatch($env, $self, @_);
+ return unless @next;
+ $self->_run_with_self($code, @next);
},
});
}
call => sub {
shift;
my ($self, $env) = @_;
- $self->handle_request({ %{$env}, PATH_INFO => $new_path })
+ $self->_dispatch({ %{$env}, PATH_INFO => $new_path })
}
})
}
-sub _dispatch_parser {
+sub _build_dispatch_parser {
require Web::Simple::DispatchParser;
return Web::Simple::DispatchParser->new;
}
-sub _setup_dispatchables {
- my ($class, $dispatch_subs) = @_;
- my $parser = $class->_dispatch_parser;
- my @dispatchables;
- my ($root, $last);
- foreach my $dispatch_sub (@$dispatch_subs) {
- my $proto = prototype $dispatch_sub;
- my $matcher = (
- defined($proto)
- ? $parser->parse_dispatch_specification($proto)
- : undef
- );
- my $new = $class->_build_dispatcher({
- match => $matcher,
- call => sub { shift;
- shift->_run_with_self($dispatch_sub, @_)
- },
- });
- $root ||= $new;
- $last = $last ? $last->next($new) : $new;
- push @dispatchables, [ $matcher, $dispatch_sub ];
+sub _cannot_call_twice {
+ my ($class, $method, $sub) = @_;
+ my $error = "Cannot call ${method} twice for ${class}";
+ if ($sub) {
+ $error .= " - did you call Web::Simple's ${sub} export twice?";
}
- $last->next($class->_build_final_dispatcher);
+ die $error;
+}
+
+sub _setup_dispatcher {
+ my ($class, $dispatch_specs) = @_;
{
no strict 'refs';
- *{"${class}::_dispatch_root"} = sub { $root };
+ if (${"${class}::_dispatcher"}{CODE}) {
+ $class->_cannot_call_twice('_setup_dispatcher', 'dispatch');
+ }
+ }
+ my $chain = $class->_build_dispatch_chain(
+ [ @$dispatch_specs, $class->_build_final_dispatcher ]
+ );
+ {
+ no strict 'refs';
+ *{"${class}::_dispatcher"} = sub { $chain };
}
}
+sub _construct_subdispatch {
+ my ($class, $dispatch_spec) = @_;
+ my $disp = $class->_build_dispatcher_from_spec($dispatch_spec);
+ my $call = $disp->call;
+ $disp->call(sub {
+ my @res = $call->(@_);
+ return unless @res;
+ my $chain = $class->_build_dispatch_chain(@res);
+ return $class->_build_dispatcher({
+ call => sub {
+ my ($d, $self, $env) = (shift, shift, shift); pop; # lose trailing $env
+ return $chain->dispatch($env, $self, @_);
+ }
+ });
+ });
+ return $class->_build_dispatcher({
+ call => sub {
+ my ($d, $self, $env) = (shift, shift, shift); pop; # lose trailing $env
+ my @sub = $disp->dispatch($env, $self, @_);
+ return @sub if @sub;
+ return unless (my $next = $d->next);
+ return $next->dispatch($env, $self, @_);
+ },
+ });
+}
+
+sub _build_dispatcher_from_spec {
+ my ($class, $spec) = @_;
+ return $spec unless ref($spec) eq 'CODE';
+ my $proto = prototype $spec;
+ my $parser = $class->_build_dispatch_parser;
+ my $matcher = (
+ defined($proto) && length($proto)
+ ? $parser->parse_dispatch_specification($proto)
+ : sub { ({}, $_[1]) }
+ );
+ return $class->_build_dispatcher({
+ match => $matcher,
+ call => sub { shift;
+ shift->_run_with_self($spec, @_)
+ },
+ });
+}
+
+sub _build_dispatch_chain {
+ my ($class, $dispatch_specs) = @_;
+ my ($root, $last);
+ foreach my $dispatch_spec (@$dispatch_specs) {
+ my $new = $class->_build_dispatcher_from_spec($dispatch_spec);
+ $root ||= $new;
+ $last = $last ? $last->next($new) : $new;
+ }
+ return $root;
+}
+
sub _build_dispatcher {
bless($_[1], 'Web::Simple::Dispatcher');
}
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 handle_request {
+sub _dispatch {
my ($self, $env) = @_;
- $self->_dispatch_root->dispatch($env, $self);
+ $self->_dispatcher->dispatch($env, $self);
}
sub _run_with_self {
}
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->handle_request(@_) });
+ 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";
+ unless (@ARGV && $ARGV[0] =~ m{^/}) {
+ return $self->_run_cli;
+ }
+
+ my $path = shift @ARGV;
- 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;
+}
+
+sub _run_cli {
+ my $self = shift;
+ die $self->_cli_usage;
+}
+
+sub _cli_usage {
+ "To run this script in CGI test mode, pass a URL path beginning with /:\n".
+ "\n".
+ " $0 /some/path\n".
+ " $0 /\n"
}
1;
projects / catagits/Web-Simple.git / blobdiff