X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FWeb%2FSimple%2FApplication.pm;h=51fa78e3d4f56ad6782b6a28394fcc4ec613ffa6;hb=9f3d2dd904535ac70f07f0189fd2e0f0c643812a;hp=92fbca091ee2a6e791e1a805beb8e9e6e2b4799f;hpb=12b3e9a3a9202abfd0565e4a02ae116c6bf5afdb;p=catagits%2FWeb-Simple.git

diff --git a/lib/Web/Simple/Application.pm b/lib/Web/Simple/Application.pm
index 92fbca0..51fa78e 100644
--- a/lib/Web/Simple/Application.pm
+++ b/lib/Web/Simple/Application.pm
@@ -45,14 +45,14 @@ sub run_if_script {
 
 sub _run_cgi {
   my $self = shift;
-  require Plack::Server::CGI;
-  Plack::Server::CGI->run($self->to_psgi_app);
+  require Plack::Handler::CGI;
+  Plack::Handler::CGI->new->run($self->to_psgi_app);
 }
 
 sub _run_fcgi {
   my $self = shift;
-  require Plack::Server::FCGI;
-  Plack::Server::FCGI->run($self->to_psgi_app);
+  require Plack::Handler::FCGI;
+  Plack::Handler::FCGI->new->run($self->to_psgi_app);
 }
 
 sub to_psgi_app {
@@ -62,25 +62,81 @@ sub to_psgi_app {
 
 sub run {
   my $self = shift;
-  if ($ENV{PHP_FCGI_CHILDREN} || $ENV{FCGI_ROLE} || $ENV{FCGI_SOCKET_PATH}) {
+  if (
+    $ENV{PHP_FCGI_CHILDREN} || $ENV{FCGI_ROLE} || $ENV{FCGI_SOCKET_PATH}
+    || -S STDIN # STDIN is a socket, almost certainly FastCGI
+    ) {
     return $self->_run_fcgi;
   } elsif ($ENV{GATEWAY_INTERFACE}) {
     return $self->_run_cgi;
   }
-  unless (@ARGV && $ARGV[0] =~ m{^/}) {
+  unless (@ARGV && $ARGV[0] =~ m{^[A-Z/]}) {
     return $self->_run_cli(@ARGV);
   }
 
-  my $path = shift @ARGV;
+  my @args = @ARGV;
 
-  require HTTP::Request::Common;
+  unshift(@args, 'GET') if $args[0] =~ m{^/};
+
+  $self->_run_cli_test_request(@args);
+}
+
+sub _test_request_spec_to_http_request {
+  my ($self, $method, $path, @rest) = @_;
+
+  # if it's a reference, assume a request object
+  return $method if ref($method);
+
+  my $request = HTTP::Request->new($method => $path);
+
+  my @params;
+
+  while (my ($header, $value) = splice(@rest, 0, 2)) {
+    unless ($header =~ s/:$//) {
+      push @params, $header, $value;
+    }
+    $request->headers->push_header($header, $value);
+  }
+
+  if (($method eq 'POST' or $method eq 'PUT') and @params) {
+    my $content = do {
+      require URI;
+      my $url = URI->new('http:');
+      $url->query_form(@params);
+      $url->query;
+    };
+    $request->header('Content-Type' => 'application/x-www-form-urlencoded');
+    $request->header('Content-Length' => length($content));
+    $request->content($content);
+  }
+
+  return $request;
+}
+
+sub run_test_request {
+  my ($self, @req) = @_;
+
+  require HTTP::Request;
   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;
+  my $request = $self->_test_request_spec_to_http_request(@req);
+
+  Plack::Test::test_psgi(
+    $self->to_psgi_app, sub { shift->($request) }
+  );
+}
+
+sub _run_cli_test_request {
+  my ($self, @req) = @_;
+  my $response = $self->run_test_request(@req);
+
+  binmode(STDOUT); binmode(STDERR); # for win32
+
+  print STDERR $response->status_line."\n";
+  print STDERR $response->headers_as_string("\n")."\n";
+  my $content = $response->content;
+  $content .= "\n" if length($content) and $content !~ /\n\z/;
+  print STDOUT $content if $content;
 }
 
 sub _run_cli {
@@ -242,29 +298,33 @@ calls ->new, or as an object method ... in which case it doesn't.
 
 =head2 run
 
-Used for running your application under stand-alone CGI and FCGI modes. Also
-useful for testing:
+Used for running your application under stand-alone CGI and FCGI modes.
+
+I should document this more extensively but run_if_script will call it when
+you need it, so don't worry about it too much.
+
+=head2 run_test_request
 
-    my $app = MyWebSimpleApp::Web->new;
-    my $c = HTTP::Request::AsCGI->new(@args)->setup;
-    $app->run;
+  my $res = $app->run_test_request(GET => '/');
 
-=head1 AUTHOR
+  my $res = $app->run_test_request(POST => '/' => %form);
 
-Matt S. Trout <mst@shadowcat.co.uk>
+  my $res = $app->run_test_request($http_request);
 
-=head1 CONTRIBUTORS
+Accepts either an L<HTTP::Request> object or ($method, $path) and runs that
+request against the application, returning an L<HTTP::Response> object.
 
-None required yet. Maybe this module is perfect (hahahahaha ...).
+If the HTTP method is POST or PUT, then a series of pairs can be passed after
+this to create a form style message body. If you need to test an upload, then
+create an L<HTTP::Request> object by hand or use the C<POST> subroutine
+provided by L<HTTP::Request::Common>.
 
-=head1 COPYRIGHT
+=head1 AUTHORS
 
-Copyright (c) 2010 the Web::Simple L</AUTHOR> and L</CONTRIBUTORS>
-as listed above.
+See L<Web::Simple> for authors.
 
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
 
-This library is free software and may be distributed under the same terms
-as perl itself.
+See L<Web::Simple> for the copyright and license.
 
 =cut