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=219a7c15dddbfc951e872aa05448d2aaef2d5d23;hp=3aaa6aff85485748006c84b906dde9ccd61a2f7d;hb=fbb513f774337d5b48768491f0479b2b24e7fc4c;hpb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index 3aaa6af..219a7c1 100644
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -4,10 +4,13 @@ use strict;
 use base 'Class::Accessor::Fast';
 
 use IO::Socket qw[AF_INET inet_aton];
+use Carp;
+use utf8;
+use URI::QueryParam;
 
 __PACKAGE__->mk_accessors(
-    qw/action address arguments base cookies handle headers match method
-      protocol query_parameters secure snippets uri user/
+    qw/action address arguments cookies headers match method
+      protocol query_parameters secure captures uri user/
 );
 
 *args         = \&arguments;
@@ -16,6 +19,7 @@ __PACKAGE__->mk_accessors(
 *params       = \&parameters;
 *query_params = \&query_parameters;
 *path_info    = \&path;
+*snippets     = \&captures;
 
 sub content_encoding { shift->headers->content_encoding(@_) }
 sub content_length   { shift->headers->content_length(@_) }
@@ -26,16 +30,15 @@ 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_parameters;
@@ -44,7 +47,6 @@ Catalyst::Request - Catalyst Request Class
     $req->content_type;
     $req->cookie;
     $req->cookies;
-    $req->handle;
     $req->header;
     $req->headers;
     $req->hostname;
@@ -52,66 +54,88 @@ 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->captures; # previously knows as snippets
     $req->upload;
     $req->uploads;
     $req->uri;
     $req->user;
     $req->user_agent;
 
-See also L<Catalyst>.
+See also L<Catalyst>, L<Catalyst::Request::Upload>.
 
 =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
 
-=item $req->action
+Returns the requested action as a L<Catalyst::Action> object.
 
-Contains the requested action.
+=head2 $req->address
 
-    print $c->request->action;
+Returns the IP address of the client.
 
-=item $req->address
+=head2 $req->arguments
 
-Contains the remote address.
+Returns a reference to an array containing the arguments.
 
-    print $c->request->address
+    print $c->request->arguments->[0];
 
-=item $req->args
+For example, if your action was
 
-Shortcut for arguments
+	package MyApp::C::Foo;
+	
+	sub moose : Local {
+		...
+	}
 
-=item $req->arguments
+and the URI for the request was C<http://.../foo/moose/bah>, the string C<bah>
+would be the first and only argument.
 
-Returns a reference to an array containing the arguments.
+=head2 $req->args
 
-    print $c->request->arguments->[0];
+Shortcut for arguments.
 
-=item $req->base
+=head2 $req->base
 
-Contains the url base. This will always have a trailing slash.
+Contains the URI base. This will always have a trailing slash.
 
-=item $req->body
+If your application was queried with the URI
+C<http://localhost:3000/some/path> then C<base> is C<http://localhost:3000/>.
 
-Contains the message body of the request unless Content-Type is
-C<application/x-www-form-urlencoded> or C<multipart/form-data>.
+=cut
+
+sub base {
+    my ( $self, $base ) = @_;
+
+    return $self->{base} unless $base;
+
+    $self->{base} = $base;
+
+    # set the value in path for backwards-compat
+    if ( $self->uri ) {
+        $self->path;
+    }
+
+    return $self->{base};
+}
+
+=head2 $req->body
 
-    print $c->request->body
+Returns the message body of the request, unless Content-Type is
+C<application/x-www-form-urlencoded> or C<multipart/form-data>.
 
 =cut
 
@@ -121,17 +145,19 @@ sub body {
     return $self->{_body}->body;
 }
 
-=item $req->body_parameters
+=head2 $req->body_parameters
 
-Returns a reference to a hash containing body parameters. Values can
+Returns a reference to a hash containing body (POST) parameters. Values can
 be either a scalar or an arrayref containing scalars.
 
     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.
     
-=item $req->body_params
+=head2 $req->body_params
 
-An alias for body_parameters.
+Shortcut for body_parameters.
 
 =cut
 
@@ -142,21 +168,21 @@ sub body_parameters {
     return $self->{body_parameters};
 }
 
-=item $req->content_encoding
+=head2 $req->content_encoding
 
-Shortcut to $req->headers->content_encoding
+Shortcut for $req->headers->content_encoding.
 
-=item $req->content_length
+=head2 $req->content_length
 
-Shortcut to $req->headers->content_length
+Shortcut for $req->headers->content_length.
 
-=item $req->content_type
+=head2 $req->content_type
 
-Shortcut to $req->headers->content_type
+Shortcut for $req->headers->content_type.
 
-=item $req->cookie
+=head2 $req->cookie
 
-A convenient method to $req->cookies.
+A convenient method to access $req->cookies.
 
     $cookie  = $c->request->cookie('name');
     @cookies = $c->request->cookie;
@@ -182,31 +208,28 @@ sub cookie {
     }
 }
 
-=item $req->cookies
+=head2 $req->cookies
 
 Returns a reference to a hash containing the cookies.
 
     print $c->request->cookies->{mycookie}->value;
 
-=item $req->handle
-
-Request IO handle.
+The cookies in the hash are indexed by name, and the values are L<CGI::Cookie>
+objects.
 
-=item $req->header
+=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
 
-Lookup the current users DNS hostname.
-
-    print $c->request->hostname
+Returns the hostname of the client.
     
 =cut
 
@@ -225,32 +248,39 @@ sub hostname {
     return $self->{hostname};
 }
 
-=item $req->input
-
-Shortcut for $req->body.
+=head2 $req->input
 
-=item $req->match
+Alias for $req->body.
 
-This contains the matching part of a regexp action. Otherwise
-it returns the same as 'action'.
+=head2 $req->match
 
-    print $c->request->match;
+This contains the matching part of a Regex action. Otherwise
+it returns the same as 'action', except for default actions,
+which return an empty string.
 
-=item $req->method
+=head2 $req->method
 
 Contains the request method (C<GET>, C<POST>, C<HEAD>, etc).
 
-    print $c->request->method;
+=head2 $req->param
 
-=item $req->param
+Returns GET and POST parameters with a CGI.pm-compatible param method. This 
+is an alternative method for accessing parameters in $c->req->parameters.
 
-Get request parameters with a CGI.pm-compatible param method. This 
-is a method for accessing parameters in $c->req->parameters.
-
-    $value  = $c->request->param('foo');
-    @values = $c->request->param('foo');
+    $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 {
@@ -279,93 +309,89 @@ sub param {
               : $self->parameters->{$param};
         }
     }
-
-    if ( @_ > 1 ) {
-
-        while ( my ( $field, $value ) = splice( @_, 0, 2 ) ) {
-
-            next unless defined $field;
-
-            if ( exists $self->parameters->{$field} ) {
-                for ( $self->parameters->{$field} ) {
-                    $_ = [$_] unless ref($_) eq "ARRAY";
-                    push( @$_, $value );
-                }
-            }
-            else {
-                $self->parameters->{$field} = $value;
-            }
-        }
+    elsif ( @_ > 1 ) {
+        my $field = shift;
+        $self->parameters->{$field} = [@_];
     }
 }
 
-=item $req->params
+=head2 $req->parameters
 
-Shortcut for $req->parameters.
-
-=item $req->parameters
-
-Returns a reference to a hash containing parameters. Values can
+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.
+
 =cut
 
 sub parameters {
     my ( $self, $params ) = @_;
     $self->{_context}->prepare_body;
-    $self->{parameters} = $params if $params;
+    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};
 }
 
-=item $req->path
+=head2 $req->path
 
-Contains the path.
+Returns the path, i.e. the part of the URI after $req->base, for the current request.
 
-    print $c->request->path;
+=head2 $req->path_info
 
-=item $req->path_info
-
-alias for path, added for compability with L<CGI>
+Alias for path, added for compability with L<CGI>.
 
 =cut
 
 sub path {
     my ( $self, $params ) = @_;
-    
-    if ( $params ) {
-        # base must always have a trailing slash
-        $params .= '/' unless ( $params =~ /\/$/ );
-        $self->uri->path( $params );
+
+    if ($params) {
+        $self->uri->path($params);
+    }
+    else {
+        return $self->{path} if $self->{path};
     }
 
-    my $path = $self->uri->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;
 }
 
-=item $req->protocol
+=head2 $req->protocol
 
-Contains the protocol.
+Returns the protocol (HTTP/1.0 or HTTP/1.1) used for the current request.
 
-=item $req->query_parameters
+=head2 $req->query_parameters
 
-Returns a reference to a hash containing query parameters. Values can
+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->query_parameters->{field};
     print $c->request->query_parameters->{field}->[0];
     
-=item $req->read( [$maxlength] )
+=head2 $req->read( [$maxlength] )
 
-Read a chunk of data from the request body.  This method is designed to be
-used in a while loop, reading $maxlength bytes on every call.  $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.
@@ -374,23 +400,28 @@ You have to set MyApp->config->{parse_on_demand} to use this directly.
 
 sub read { shift->{_context}->read(@_); }
 
-=item $req->referer
+=head2 $req->referer
 
-Shortcut to $req->headers->referer. Referring page.
+Shortcut for $req->headers->referer. Returns the referring page.
 
-=item $req->secure
+=head2 $req->secure
 
-Contains a boolean whether the communciation is secure.
+Returns true or false, indicating whether the connection is secure (https).
 
-=item $req->snippets
+=head2 $req->captures
 
-Returns a reference to an array containing regex snippets.
+Returns a reference to an array containing regex captures.
 
-    my @snippets = @{ $c->request->snippets };
+    my @captures = @{ $c->request->captures };
 
-=item $req->upload
+=head2 $req->snippets
 
-A convenient method to $req->uploads.
+C<captures> used to be called snippets. This is still available for backwoards
+compatibility, but is considered deprecated.
+
+=head2 $req->upload
+
+A convenient method to access $req->uploads.
 
     $upload  = $c->request->upload('field');
     @uploads = $c->request->upload('field');
@@ -446,10 +477,10 @@ sub 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];
@@ -463,23 +494,53 @@ sub uploads {
     return $self->{uploads};
 }
 
-=item $req->uri
+=head2 $req->uri
+
+Returns a URI object for the current request. Stringifies to the URI text.
+
+=head2 $req->uri_with( { key => 'value' } );
 
-Returns a URI object for the request.
+Returns a rewritten URI object for the current request. Key/value pairs
+passed in will override existing parameters. Unmodified pairs will be
+preserved.
 
-=item $req->user
+=cut
 
-Contains the user name of user if authentication check was successful.
+sub uri_with {
+    my( $self, $args ) = @_;
+    
+    carp( 'No arguments passed to uri_with()' ) unless $args;
 
-=item $req->user_agent
+    for my $value ( values %$args ) {
+        for ( ref $value eq 'ARRAY' ? @$value : $value ) {
+            $_ = "$_";
+            utf8::encode( $_ );
+        }
+    };
+    
+    my $uri = $self->uri->clone;
+    
+    $uri->query_form( {
+        %{ $uri->query_form_hash },
+        %$args
+    } );
+    return $uri;
+}
+
+=head2 $req->user
 
-Shortcut to $req->headers->user_agent. User Agent version string.
+Returns the currently logged in user. Deprecated. The method recommended for
+newer plugins is $c->user.
 
-=back
+=head2 $req->user_agent
 
-=head1 AUTHOR
+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