Fixed MP19 uploads. Added request/response body. Added support in all Engines for...

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Request.pm

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index f076fbd..04b7338 100644 (file)
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -4,8 +4,8 @@ use strict;
 use base 'Class::Accessor::Fast';
 
 __PACKAGE__->mk_accessors(
-    qw/action address arguments base cookies headers hostname match method
-      parameters path snippets uploads/
+    qw/action address arguments base cookies headers input hostname match 
+      method parameters path snippets uploads/
 );
 
 *args   = \&arguments;
@@ -18,11 +18,10 @@ sub header           { shift->headers->header(@_)           }
 sub referer          { shift->headers->referer(@_)          }
 sub user_agent       { shift->headers->user_agent(@_)       }
 
-
 sub _assign_values {
     my ( $self, $map, $values ) = @_;
-    
-    while ( my ( $name, $value ) = splice( @{ $values }, 0, 2 ) ) {
+
+    while ( my ( $name, $value ) = splice( @{$values}, 0, 2 ) ) {
 
         if ( exists $map->{$name} ) {
             for ( $map->{$name} ) {
@@ -49,6 +48,7 @@ Catalyst::Request - Catalyst Request Class
     $req->args;
     $req->arguments;
     $req->base;
+    $req->body;
     $req->content_encoding;
     $req->content_length;
     $req->content_type;
@@ -56,6 +56,7 @@ Catalyst::Request - Catalyst Request Class
     $req->header;
     $req->headers;
     $req->hostname;
+    $req->input;
     $req->match;
     $req->method;
     $req->param;
@@ -107,6 +108,10 @@ Returns a reference to an array containing the arguments.
 
 Contains the url base. This will always have a trailing slash.
 
+=item $req->body
+
+Shortcut for $req->input.
+
 =item $req->content_encoding
 
 Shortcut to $req->headers->content_encoding
@@ -141,6 +146,13 @@ Contains the hostname of the remote user.
 
     print $c->request->hostname
 
+=item $req->input
+
+Contains the message body of the request unless Content-Type is
+C<application/x-www-form-urlencoded> or C<multipart/form-data>.
+
+    print $c->request->input
+
 =item $req->match
 
 This contains be the matching part of a regexp action. otherwise it
@@ -226,7 +238,7 @@ A convenient method to $req->uploads.
     @fields  = $c->request->upload;
     
     for my $upload ( $c->request->upload('field') ) {
-        print $upload->{filename};
+        print $upload->filename;
     }
 
 =cut
@@ -258,38 +270,12 @@ sub upload {
 
 =item $req->uploads
 
-Returns a reference to a hash containing uploads. Values can
-be either a hashref or a arrayref containing hashrefs.
+Returns a reference to a hash containing uploads. Values can be either a 
+hashref or a arrayref containing C<Catalyst::Request::Upload> objects.
 
     my $upload = $c->request->uploads->{field};
     my $upload = $c->request->uploads->{field}->[0];
 
-The upload hashref contains the following keys:
-
-=over 4
-
-=item * fh 
-
-Filehandle.
-
-=item * filename 
-
-Client supplied filename.
-
-=item * size
-
-Size of the file in bytes.
-
-=item * tempname
-
-Path to the temporary spool file.
-
-=item * type
-
-Client supplied Content-Type.
-
-=back
-
 =item $req->user_agent
 
 Shortcut to $req->headers->user_agent. User Agent version string.