From: Christian Walde <walde.christian@googlemail.com>
Date: Fri, 6 Jun 2014 20:57:33 +0000 (+0200)
Subject: refactor Web::Simple::Application::run for readability
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FWeb-Simple.git;a=commitdiff_plain;h=38faf2065659423101e87bb79673158cfe1b4894

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

diff --git a/lib/Web/Simple/Application.pm b/lib/Web/Simple/Application.pm
index f72142a..337cd4a 100644
--- a/lib/Web/Simple/Application.pm
+++ b/lib/Web/Simple/Application.pm
@@ -83,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] !~ /^[A-Z]/;
+  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 {