X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FRequest.pm;h=ada6c155f088399da2ef14b49450270d3ecacff7;hp=09741abb441d09a3d854caf46bbb7aeafcbc73dd;hb=0ba80bce27a56d366c8d44c254332dd83f9ba0f9;hpb=8fbcd90cdb30aed53d22d1cdbad95880f1c11693

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index 09741ab..ada6c15 100644
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -3,41 +3,45 @@ package Catalyst::Request;
 use strict;
 use base 'Class::Accessor::Fast';
 
+use IO::Socket qw[AF_INET inet_aton];
+
 __PACKAGE__->mk_accessors(
-    qw/action address arguments body base cookies headers hostname match
-      method parameters path snippets uploads/
+    qw/action address arguments cookies headers match method
+      protocol query_parameters secure snippets uri user/
 );
 
-*args   = \&arguments;
-*input  = \&body;
-*params = \&parameters;
+*args         = \&arguments;
+*body_params  = \&body_parameters;
+*input        = \&body;
+*params       = \&parameters;
+*query_params = \&query_parameters;
+*path_info    = \&path;
 
 sub content_encoding { shift->headers->content_encoding(@_) }
-sub content_length   { shift->headers->content_length(@_)   }
-sub content_type     { shift->headers->content_type(@_)     }
-sub header           { shift->headers->header(@_)           }
-sub referer          { shift->headers->referer(@_)          }
-sub user_agent       { shift->headers->user_agent(@_)       }
+sub content_length   { shift->headers->content_length(@_) }
+sub content_type     { shift->headers->content_type(@_) }
+sub header           { shift->headers->header(@_) }
+sub referer          { shift->headers->referer(@_) }
+sub user_agent       { shift->headers->user_agent(@_) }
 
 =head1 NAME
 
-Catalyst::Request - Catalyst Request Class
+Catalyst::Request - provides information about the current client request
 
 =head1 SYNOPSIS
 
-
     $req = $c->request;
     $req->action;
     $req->address;
-    $req->args;
     $req->arguments;
+    $req->args;
     $req->base;
     $req->body;
-    $req->body_length;
-    $req->body_ref;
+    $req->body_parameters;
     $req->content_encoding;
     $req->content_length;
     $req->content_type;
+    $req->cookie;
     $req->cookies;
     $req->header;
     $req->headers;
@@ -46,148 +50,232 @@ Catalyst::Request - Catalyst Request Class
     $req->match;
     $req->method;
     $req->param;
-    $req->params;
     $req->parameters;
+    $req->params;
     $req->path;
+    $req->protocol;
+    $req->query_parameters;
+    $req->read;
     $req->referer;
+    $req->secure;
     $req->snippets;
     $req->upload;
     $req->uploads;
-    $req->user_agent
+    $req->uri;
+    $req->user;
+    $req->user_agent;
 
 See also L<Catalyst>.
 
 =head1 DESCRIPTION
 
-This is the Catalyst Request class, which provides a set of accessors to the
-request data.  The request object is prepared by the specialized Catalyst
-Engine module thus hiding the details of the particular engine implementation.
-
+This is the Catalyst Request class, which provides an interface to data for the
+current client request. The request object is prepared by L<Catalyst::Engine>,
+thus hiding the details of the particular engine implementation.
 
 =head1 METHODS
 
-=over 4
+=head2 $req->action
+
+Returns the requested action as a L<Catalyst::Action> object.
+
+=head2 $req->address
 
-=item $req->action
+Returns the IP address of the client.
 
-Contains the requested action.
+=head2 $req->arguments
 
-    print $c->request->action;
+Returns a reference to an array containing the arguments.
 
-=item $req->address
+    print $c->request->arguments->[0];
 
-Contains the remote address.
+For example, if your action was
 
-    print $c->request->address
+	package MyApp::C::Foo;
+	
+	sub moose : Local {
+		...
+	}
 
-=item $req->args
+and the URI for the request was C<http://.../foo/moose/bah>, the string C<bah>
+would be the first and only argument.
 
-Shortcut for arguments
+=head2 $req->args
 
-=item $req->arguments
+Shortcut for arguments.
 
-Returns a reference to an array containing the arguments.
+=head2 $req->base
 
-    print $c->request->arguments->[0];
+Contains the URI base. This will always have a trailing slash.
 
-=item $req->base
+If your application was queried with the URI
+C<http://localhost:3000/some/path> then C<base> is C<http://localhost:3000/>.
 
-Contains the url base. This will always have a trailing slash.
+=cut
 
-=item $req->body
+sub base {
+    my ( $self, $base ) = @_;
 
-Contains the message body of the request unless Content-Type is
-C<application/x-www-form-urlencoded> or C<multipart/form-data>.
+    return $self->{base} unless $base;
+
+    $self->{base} = $base;
 
-    print $c->request->body
+    # set the value in path for backwards-compat
+    if ( $self->uri ) {
+        $self->path;
+    }
 
-=item $req->body_length
+    return $self->{base};
+}
 
-Returns the length of body in bytes.
+=head2 $req->body
 
-    print $c->request->body_length
+Returns the message body of the request, unless Content-Type is
+C<application/x-www-form-urlencoded> or C<multipart/form-data>.
 
 =cut
 
-sub body_length {
-    my $self = shift;
-    
-    use bytes;
-    
-    return 0 unless $self->body;
-    return length($self->body);
+sub body {
+    my ( $self, $body ) = @_;
+    $self->{_context}->prepare_body;
+    return $self->{_body}->body;
 }
 
-=item $req->body_ref
+=head2 $req->body_parameters
+
+Returns a reference to a hash containing body (POST) parameters. Values can
+be either a scalar or an arrayref containing scalars.
 
-Returns a reference to body.
+    print $c->request->body_parameters->{field};
+    print $c->request->body_parameters->{field}->[0];
+
+These are the parameters from the POST part of the request, if any.
+    
+=head2 $req->body_params
+
+Shortcut for body_parameters.
 
 =cut
 
-sub body_ref {
-    my $self = shift;    
-    return \$self->{body};
+sub body_parameters {
+    my ( $self, $params ) = @_;
+    $self->{_context}->prepare_body;
+    $self->{body_parameters} = $params if $params;
+    return $self->{body_parameters};
 }
 
-=item $req->content_encoding
+=head2 $req->content_encoding
+
+Shortcut for $req->headers->content_encoding.
 
-Shortcut to $req->headers->content_encoding
+=head2 $req->content_length
 
-=item $req->content_length
+Shortcut for $req->headers->content_length.
 
-Shortcut to $req->headers->content_length
+=head2 $req->content_type
 
-=item $req->content_type
+Shortcut for $req->headers->content_type.
 
-Shortcut to $req->headers->content_type
+=head2 $req->cookie
 
-=item $req->cookies
+A convenient method to access $req->cookies.
+
+    $cookie  = $c->request->cookie('name');
+    @cookies = $c->request->cookie;
+
+=cut
+
+sub cookie {
+    my $self = shift;
+
+    if ( @_ == 0 ) {
+        return keys %{ $self->cookies };
+    }
+
+    if ( @_ == 1 ) {
+
+        my $name = shift;
+
+        unless ( exists $self->cookies->{$name} ) {
+            return undef;
+        }
+
+        return $self->cookies->{$name};
+    }
+}
+
+=head2 $req->cookies
 
 Returns a reference to a hash containing the cookies.
 
     print $c->request->cookies->{mycookie}->value;
 
-=item $req->header
+The cookies in the hash are indexed by name, and the values are L<CGI::Cookie>
+objects.
+
+=head2 $req->header
 
-Shortcut to $req->headers->header
+Shortcut for $req->headers->header.
 
-=item $req->headers
+=head2 $req->headers
 
-Returns an L<HTTP::Headers> object containing the headers.
+Returns an L<HTTP::Headers> object containing the headers for the current request.
 
     print $c->request->headers->header('X-Catalyst');
 
-=item $req->hostname
+=head2 $req->hostname
 
-Contains the hostname of the remote user.
+Returns the hostname of the client.
+    
+=cut
 
-    print $c->request->hostname
+sub hostname {
+    my $self = shift;
 
-=item $req->input
+    if ( @_ == 0 && not $self->{hostname} ) {
+        $self->{hostname} =
+          gethostbyaddr( inet_aton( $self->address ), AF_INET );
+    }
 
-Shortcut for $req->body.
+    if ( @_ == 1 ) {
+        $self->{hostname} = shift;
+    }
 
-=item $req->match
+    return $self->{hostname};
+}
 
-This contains be the matching part of a regexp action. otherwise it
-returns the same as 'action'.
+=head2 $req->input
 
-    print $c->request->match;
+Alias for $req->body.
 
-=item $req->method
+=head2 $req->match
 
-Contains the request method (C<GET>, C<POST>, C<HEAD>, etc).
+This contains the matching part of a Regex action. Otherwise
+it returns the same as 'action'.
 
-    print $c->request->method;
+=head2 $req->method
 
-=item $req->param
+Contains the request method (C<GET>, C<POST>, C<HEAD>, etc).
 
-Get request parameters with a CGI.pm like param method.
+=head2 $req->param
 
-    $value  = $c->request->param('foo');
-    @values = $c->request->param('foo');
+Returns GET and POST parameters with a CGI.pm-compatible param method. This 
+is an alternative method for accessing parameters in $c->req->parameters.
+
+    $value  = $c->request->param( 'foo' );
+    @values = $c->request->param( 'foo' );
     @params = $c->request->param;
 
+Like L<CGI>, and B<unlike> earlier versions of Catalyst, passing multiple
+arguments to this method, like this:
+
+	$c->request->param( 'foo', 'bar', 'gorch', 'quxx' );
+
+will set the parameter C<foo> to the multiple values C<bar>, C<gorch> and
+C<quxx>. Previously this would have added C<bar> as another value to C<foo>
+(creating it if it didn't exist before), and C<quxx> as another value for
+C<gorch>.
+
 =cut
 
 sub param {
@@ -197,22 +285,6 @@ sub param {
         return keys %{ $self->parameters };
     }
 
-    if ( @_ == 1 and ref( $_[0] ) eq 'ARRAY' ) {
-
-        while ( my ( $field, $value ) = splice( @{ $_[0] }, 0, 2 ) ) {
-
-            if ( exists $self->parameters->{$field} ) {
-                for ( $self->parameters->{$field} ) {
-                    $_ = [$_] unless ref($_) eq "ARRAY";
-                    push( @$_, $value );
-                }
-            }
-            else {
-                $self->parameters->{$field} = $value;
-            }
-        }
-    }
-    
     if ( @_ == 1 ) {
 
         my $param = shift;
@@ -231,40 +303,116 @@ sub param {
               ? ( $self->parameters->{$param} )
               : $self->parameters->{$param};
         }
-    }    
+    }
+    elsif ( @_ > 1 ) {
+        my $field = shift;
+        $self->parameters->{$field} = [@_];
+    }
 }
 
-=item $req->params
+=head2 $req->parameters
+
+Returns a reference to a hash containing GET and POST parameters. Values can
+be either a scalar or an arrayref containing scalars.
+
+    print $c->request->parameters->{field};
+    print $c->request->parameters->{field}->[0];
+
+This is the combination of C<query_parameters> and C<body_parameters>.
+
+=head2 $req->params
 
 Shortcut for $req->parameters.
 
-=item $req->parameters
+=cut
+
+sub parameters {
+    my ( $self, $params ) = @_;
+    $self->{_context}->prepare_body;
+    if ( $params ) {
+        if ( ref $params ) {
+            $self->{parameters} = $params;
+        }
+        else {
+            $self->{_context}->log->warn( 
+                "Attempt to retrieve '$params' with req->params(), " .
+                "you probably meant to call req->param('$params')" );
+        }
+    }
+    return $self->{parameters};
+}
+
+=head2 $req->path
 
-Returns a reference to a hash containing parameters. Values can
-be either a scalar or a arrayref containing scalars.
+Returns the path, i.e. the part of the URI after $req->base, for the current request.
 
-    print $c->request->parameters->{field};
-    print $c->request->parameters->{field}->[0];
+=head2 $req->path_info
+
+Alias for path, added for compability with L<CGI>.
+
+=cut
 
-=item $req->path
+sub path {
+    my ( $self, $params ) = @_;
 
-Contains the path.
+    if ($params) {
+        $self->uri->path($params);
+    }
+    else {
+        return $self->{path} if $self->{path};
+    }
+
+    my $path     = $self->uri->path;
+    my $location = $self->base->path;
+    $path =~ s/^(\Q$location\E)?//;
+    $path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
+    $path =~ s/^\///;
+    $self->{path} = $path;
+
+    return $path;
+}
+
+=head2 $req->protocol
+
+Returns the protocol (HTTP/1.0 or HTTP/1.1) used for the current request.
+
+=head2 $req->query_parameters
+
+Returns a reference to a hash containing query string (GET) parameters. Values can
+be either a scalar or an arrayref containing scalars.
 
-    print $c->request->path;
+    print $c->request->query_parameters->{field};
+    print $c->request->query_parameters->{field}->[0];
+    
+=head2 $req->read( [$maxlength] )
+
+Reads a chunk of data from the request body. This method is intended to be
+used in a while loop, reading $maxlength bytes on every call. $maxlength
+defaults to the size of the request if not specified.
+
+You have to set MyApp->config->{parse_on_demand} to use this directly.
+
+=cut
 
-=item $req->referer
+sub read { shift->{_context}->read(@_); }
 
-Shortcut to $req->headers->referer. Referring page.
+=head2 $req->referer
 
-=item $req->snippets
+Shortcut for $req->headers->referer. Returns the referring page.
+
+=head2 $req->secure
+
+Returns true or false, indicating whether the connection is secure (https).
+
+=head2 $req->snippets
 
 Returns a reference to an array containing regex snippets.
 
     my @snippets = @{ $c->request->snippets };
 
-=item $req->upload
+=head2 $req->upload
 
-A convenient method to $req->uploads.
+A convenient method to access $req->uploads.
 
     $upload  = $c->request->upload('field');
     @uploads = $c->request->upload('field');
@@ -283,22 +431,6 @@ sub upload {
         return keys %{ $self->uploads };
     }
 
-    if ( @_ == 1 and ref( $_[0] ) eq 'ARRAY' ) {
-
-        while ( my ( $field, $upload ) = splice( @{ $_[0] }, 0, 2 ) ) {
-
-            if ( exists $self->uploads->{$field} ) {
-                for ( $self->uploads->{$field} ) {
-                    $_ = [$_] unless ref($_) eq "ARRAY";
-                    push( @$_, $upload );
-                }
-            }
-            else {
-                $self->uploads->{$field} = $upload;
-            }
-        }
-    }
-
     if ( @_ == 1 ) {
 
         my $upload = shift;
@@ -314,29 +446,63 @@ sub upload {
         }
         else {
             return (wantarray)
-               ? ( $self->uploads->{$upload} )
-               : $self->uploads->{$upload};
+              ? ( $self->uploads->{$upload} )
+              : $self->uploads->{$upload};
+        }
+    }
+
+    if ( @_ > 1 ) {
+
+        while ( my ( $field, $upload ) = splice( @_, 0, 2 ) ) {
+
+            if ( exists $self->uploads->{$field} ) {
+                for ( $self->uploads->{$field} ) {
+                    $_ = [$_] unless ref($_) eq "ARRAY";
+                    push( @$_, $upload );
+                }
+            }
+            else {
+                $self->uploads->{$field} = $upload;
+            }
         }
     }
 }
 
-=item $req->uploads
+=head2 $req->uploads
 
 Returns a reference to a hash containing uploads. Values can be either a
-hashref or a arrayref containing C<Catalyst::Request::Upload> objects.
+hashref or a arrayref containing L<Catalyst::Request::Upload> objects.
 
     my $upload = $c->request->uploads->{field};
     my $upload = $c->request->uploads->{field}->[0];
 
-=item $req->user_agent
+=cut
+
+sub uploads {
+    my ( $self, $uploads ) = @_;
+    $self->{_context}->prepare_body;
+    $self->{uploads} = $uploads if $uploads;
+    return $self->{uploads};
+}
+
+=head2 $req->uri
 
-Shortcut to $req->headers->user_agent. User Agent version string.
+Returns a URI object for the current request. Stringifies to the URI text.
 
-=back
+=head2 $req->user
 
-=head1 AUTHOR
+Returns the currently logged in user. Deprecated. The method recommended for
+newer plugins is $c->user.
+
+=head2 $req->user_agent
+
+Shortcut to $req->headers->user_agent. Returns the user agent (browser)
+version string.
+
+=head1 AUTHORS
 
 Sebastian Riedel, C<sri@cpan.org>
+
 Marcus Ramberg, C<mramberg@cpan.org>
 
 =head1 COPYRIGHT