X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FWeb%2FSimple%2FApplication.pm;h=24d346302898ca6048f0f083adc82412cbfe3d97;hb=7b930ebb30cddbb0133a0ad20e72d60a5eed5d19;hp=f6804dc81da379e06d33ee3ba847891c958ae41c;hpb=82bc2f9c8e35b3fd80d2e88663a617227857967c;p=catagits%2FWeb-Simple.git

diff --git a/lib/Web/Simple/Application.pm b/lib/Web/Simple/Application.pm
index f6804dc..24d3463 100644
--- a/lib/Web/Simple/Application.pm
+++ b/lib/Web/Simple/Application.pm
@@ -1,5 +1,7 @@
 package Web::Simple::Application;
 
+use Scalar::Util 'weaken';
+
 use Moo;
 
 has 'config' => (
@@ -25,10 +27,22 @@ sub _build__dispatcher {
   require Web::Dispatch;
   require Web::Simple::DispatchNode;
   my $final = $self->_build_final_dispatcher;
+
+  # We need to weaken both the copy of $self that the
+  # app parameter will close over and the copy that'll
+  # be passed through as a node argument.
+  #
+  # To ensure that this doesn't then result in us being
+  # DESTROYed unexpectedly early, our to_psgi_app method
+  # 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 => { app_object => $self }
+    node_args => $node_args
   );
 }
 
@@ -57,14 +71,24 @@ sub _run_fcgi {
 
 sub to_psgi_app {
   my $self = ref($_[0]) ? $_[0] : $_[0]->new;
-  $self->_dispatcher->to_app;
+  my $app = $self->_dispatcher->to_app;
+
+  # Close over $self to keep $self alive even though
+  # we weakened the copies the dispatcher has; the
+  # if 0 causes the ops to be optimised away to
+  # minimise the performance impact and avoid void
+  # context warnings while still doing the closing
+  # over part. As Mithaldu said: "Gnarly." ...
+
+  return sub { $self if 0; goto &$app; };
 }
 
 sub run {
   my $self = shift;
   if (
     $ENV{PHP_FCGI_CHILDREN} || $ENV{FCGI_ROLE} || $ENV{FCGI_SOCKET_PATH}
-    || -S STDIN # STDIN is a socket, almost certainly FastCGI
+    || ( -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}) {
@@ -95,14 +119,19 @@ sub _test_request_spec_to_http_request {
     unless ($header =~ s/:$//) {
       push @params, $header, $value;
     }
-    $request->headers->push_header($header, $value);
+    $header =~ s/_/-/g;
+    if ($header eq 'Content') {
+      $request->content($value);
+    } else {
+      $request->headers->push_header($header, $value);
+    }
   }
 
-  if (($method eq 'POST' or $method eq 'PUT') and @rest) {
+  if (($method eq 'POST' or $method eq 'PUT') and @params) {
     my $content = do {
       require URI;
       my $url = URI->new('http:');
-      $url->query_form(@rest);
+      $url->query_form(@params);
       $url->query;
     };
     $request->header('Content-Type' => 'application/x-www-form-urlencoded');
@@ -248,6 +277,28 @@ that path -
   
   Hello world!
 
+You can also provide a method name -
+
+  $ perl -Ilib examples/hello-world/hello-world.cgi POST /
+  405 Method Not Allowed
+  Content-Type: text/plain
+  
+  Method not allowed
+
+For a POST or PUT request, pairs on the command line will be treated
+as form variables. For any request, pairs on the command line ending in :
+are treated as headers, and 'Content:' will set the request body -
+
+  $ ./myapp POST / Accept: text/html form_field_name form_field_value
+  
+  $ ./myapp POST / Content-Type: text/json Content: '{ "json": "here" }'
+
+The body of the response is sent to STDOUT and the headers to STDERR, so
+
+  $ ./myapp GET / >index.html
+
+will generally do the right thing.
+
 Additionally, you can treat the file as though it were a standard PSGI
 application file (*.psgi).  For example you can start up up with C<plackup>
 
@@ -305,9 +356,9 @@ you need it, so don't worry about it too much.
 
 =head2 run_test_request
 
-  my $res = $app->run_test_request(GET => '/');
+  my $res = $app->run_test_request(GET => '/' => %headers);
 
-  my $res = $app->run_test_request(POST => '/' => %form);
+  my $res = $app->run_test_request(POST => '/' => %headers_or_form);
 
   my $res = $app->run_test_request($http_request);
 
@@ -319,6 +370,24 @@ 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>.
 
+If pairs are passed where the key ends in :, it is instead treated as a
+headers, so:
+
+  my $res = $app->run_test_request(
+              POST => '/',
+             'Accept:' => 'text/html',
+              some_form_key => 'value'
+            );
+
+will do what you expect. You can also pass a special key of Content: to
+set the request body:
+
+  my $res = $app->run_test_request(
+              POST => '/',
+              'Content-Type:' => 'text/json',
+              'Content:' => '{ "json": "here" }',
+            );
+
 =head1 AUTHORS
 
 See L<Web::Simple> for authors.