$self no longer automatically in scope, fixing test

[catagits/Web-Simple.git] / lib / Web / Simple / Application.pm

diff --git a/lib/Web/Simple/Application.pm b/lib/Web/Simple/Application.pm
index cf2e54a..49b7fea 100644 (file)
--- a/lib/Web/Simple/Application.pm
+++ b/lib/Web/Simple/Application.pm
@@ -1,103 +1,91 @@
 package Web::Simple::Application;
 
-use strict;
-use warnings FATAL => 'all';
+use Moo;
 
-sub new {
-  my ($class, $data) = @_;
-  my $config = { $class->_default_config, %{($data||{})->{config}||{}} };
-  bless({ config => $config }, $class);
-}
+has 'config' => (is => 'ro', trigger => sub {
+  my ($self, $value) = @_;
+  my %default = $self->_default_config;
+  my @not = grep !exists $value->{$_}, keys %default;
+  @{$value}{@not} = @default{@not};
+});
+
+sub default_config { () }
+
+has '_dispatcher' => (is => 'lazy');
 
-sub config {
-  shift->{config};
+sub _build__dispatcher {
+  my $self = shift;
+  require Web::Dispatch;
+  require Web::Simple::DispatchNode;
+  my $final = $self->_build_final_dispatcher;
+  Web::Dispatch->new(
+    app => sub { $self->dispatch_request(@_), $final },
+    node_class => 'Web::Simple::DispatchNode',
+    node_args => { app_object => $self }
+  );
 }
 
-sub _construct_response_filter {
-  bless($_[1], 'Web::Simple::ResponseFilter');
+sub _build_final_dispatcher {
+  [ 404, [ 'Content-type', 'text/plain' ], [ 'Not found' ] ]
 }
 
-sub _is_response_filter {
-  # simple blessed() hack
-  "$_[1]" =~ /\w+=[A-Z]/
-    and $_[1]->isa('Web::Simple::ResponseFilter');
+sub run_if_script {
+  # ->to_psgi_app is true for require() but also works for plackup
+  return $_[0]->to_psgi_app if caller(1);
+  my $self = ref($_[0]) ? $_[0] : $_[0]->new;
+  $self->run(@_);
 }
 
-sub _dispatch_parser {
-  require Web::Simple::DispatchParser;
-  return Web::Simple::DispatchParser->new;
+sub _run_cgi {
+  my $self = shift;
+  require Plack::Server::CGI;
+  Plack::Server::CGI->run($self->to_psgi_app);
 }
 
-sub _setup_dispatchables {
-  my ($class, $dispatch_subs) = @_;
-  my $parser = $class->_dispatch_parser;
-  my @dispatchables;
-  foreach my $dispatch_sub (@$dispatch_subs) {
-    my $proto = prototype $dispatch_sub;
-    my $matcher = (
-      defined($proto)
-        ? $parser->parse_dispatch_specification($proto)
-        : sub { ({}) }
-    );
-    push @dispatchables, [ $matcher, $dispatch_sub ];
-  }
-  {
-    no strict 'refs';
-    *{"${class}::_dispatchables"} = sub { @dispatchables };
-  }
+sub _run_fcgi {
+  my $self = shift;
+  require Plack::Server::FCGI;
+  Plack::Server::FCGI->run($self->to_psgi_app);
 }
 
-sub handle_request {
-  my ($self, $env) = @_;
-  $self->_run_dispatch_for($env, [ $self->_dispatchables ]);
+sub to_psgi_app {
+  my $self = ref($_[0]) ? $_[0] : $_[0]->new;
+  $self->_dispatcher->to_app;
 }
 
-sub _run_dispatch_for {
-  my ($self, $env, $dispatchables) = @_;
-  my @disp = @$dispatchables;
-  while (my $disp = shift @disp) {
-    my ($match, $run) = @{$disp};
-    if (my ($env_delta, @args) = $match->($env)) {
-      my $new_env = { %$env, %$env_delta };
-      if (my ($result) = $self->_run_with_self($run, @args)) {
-        if ($self->_is_response_filter($result)) {
-          return $self->_run_with_self(
-            $result,
-            $self->_run_dispatch_for($new_env, \@disp)
-          );
-        }
-        return $result;
-      }
-    }
+sub run {
+  my $self = shift;
+  if ($ENV{PHP_FCGI_CHILDREN} || $ENV{FCGI_ROLE} || $ENV{FCGI_SOCKET_PATH}) {
+    return $self->_run_fcgi;
+  } elsif ($ENV{GATEWAY_INTERFACE}) {
+    return $self->_run_cgi;
+  }
+  unless (@ARGV && $ARGV[0] =~ m{^/}) {
+    return $self->_run_cli(@ARGV);
   }
-  return [
-    500, [ 'Content-type', 'text/plain' ],
-    'The management apologises but we have no idea how to handle that'
-  ];
-}
 
-sub _run_with_self {
-  my ($self, $run, @args) = @_;
-  my $class = ref($self);
-  no strict 'refs';
-  local *{"${class}::self"} = \$self;
-  $self->$run(@args);
-}
+  my $path = shift @ARGV;
 
-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;
-  $self->run(@_);
+  require HTTP::Request::Common;
+  require Plack::Test;
+  local *GET = \&HTTP::Request::Common::GET;
+
+  my $request = GET($path);
+  my $response;
+  Plack::Test::test_psgi($self->to_psgi_app, sub { $response = shift->($request) });
+  print $response->as_string;
 }
 
-sub run {
+sub _run_cli {
   my $self = shift;
-  unless ($ENV{GATEWAY_INTERFACE}) {
-    die "mst is an idiot and didn't fix non-CGI yet";
-  }
-  require Web::Simple::HackedPlack;
-  Plack::Server::CGI->run(sub { $self->handle_request(@_) });
+  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;