refactor Web::Simple::Application::run for readability

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

diff --git a/lib/Web/Simple/Application.pm b/lib/Web/Simple/Application.pm
index febd830..337cd4a 100644 (file)
--- a/lib/Web/Simple/Application.pm
+++ b/lib/Web/Simple/Application.pm
@@ -25,7 +25,6 @@ has '_dispatcher' => (is => 'lazy');
 sub _build__dispatcher {
   my $self = shift;
   require Web::Dispatch;
-  require Web::Simple::DispatchNode;
   my $final = $self->_build_final_dispatcher;
 
   # We need to weaken both the copy of $self that the
@@ -37,13 +36,12 @@ sub _build__dispatcher {
   # closes back over $self
 
   weaken($self);
-  my $node_args = { app_object => $self };
-  weaken($node_args->{app_object});
-  Web::Dispatch->new(
-    app => sub { $self->dispatch_request(@_), $final },
-    node_class => 'Web::Simple::DispatchNode',
-    node_args => $node_args
+  my %dispatch_args = (
+    dispatch_app => sub { $self->dispatch_request(@_), $final },
+    dispatch_object => $self
   );
+  weaken($dispatch_args{dispatch_object});
+  Web::Dispatch->new(%dispatch_args);
 }
 
 sub _build_final_dispatcher {
@@ -85,24 +83,19 @@ sub to_psgi_app {
 
 sub run {
   my $self = shift;
-  if (
+  return $self->_run_fcgi if
     $ENV{PHP_FCGI_CHILDREN} || $ENV{FCGI_ROLE} || $ENV{FCGI_SOCKET_PATH}
-    || ( -S STDIN && !$ENV{GATEWAY_INTERFACE} )
+    || ( -S STDIN && !$ENV{GATEWAY_INTERFACE} );
     # If STDIN is a socket, almost certainly FastCGI, except for mod_cgid
-    ) {
-    return $self->_run_fcgi;
-  } elsif ($ENV{GATEWAY_INTERFACE}) {
-    return $self->_run_cgi;
-  }
-  unless (@ARGV && $ARGV[0] =~ m{^[A-Z/]}) {
-    return $self->_run_cli(@ARGV);
-  }
-
-  my @args = @ARGV;
-
-  unshift(@args, 'GET') if $args[0] =~ m{^/} or $args[0] =~ m{\@};
+  return $self->_run_cgi if $ENV{GATEWAY_INTERFACE};
+  return $self->_run_cli(@ARGV) if !@ARGV || $ARGV[0] !~ m{(^[A-Z/])|\@};
+  return $self->run_cli_request(@ARGV);
+}
 
-  $self->_run_cli_test_request(@args);
+sub run_cli_request {
+  my ($self, @args) = @_;
+  unshift @args, 'GET' if $args[0] !~ /^[A-Z]/;
+  return $self->_run_cli_test_request(@args);
 }
 
 sub _test_request_spec_to_http_request {
@@ -117,8 +110,6 @@ sub _test_request_spec_to_http_request {
     unshift @rest, 'Authorization:', 'Basic '.MIME::Base64::encode($basic);
   }
 
-  require HTTP::Request;
-
   my $request = HTTP::Request->new($method => $path);
 
   my @params;
@@ -153,6 +144,8 @@ sub _test_request_spec_to_http_request {
 sub run_test_request {
   my ($self, @req) = @_;
 
+  require HTTP::Request;
+
   require Plack::Test;
 
   my $request = $self->_test_request_spec_to_http_request(@req);