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=c0cc729b55f16fa85cfe769671217992b1bc2c86;hb=0ba80bce27a56d366c8d44c254332dd83f9ba0f9;hpb=245ae014f237e59c7b9f0596c6dddf19593512fa diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm index c0cc729..ada6c15 100644 --- a/lib/Catalyst/Request.pm +++ b/lib/Catalyst/Request.pm @@ -6,7 +6,7 @@ use base 'Class::Accessor::Fast'; use IO::Socket qw[AF_INET inet_aton]; __PACKAGE__->mk_accessors( - qw/address arguments cookies headers match method + qw/action address arguments cookies headers match method protocol query_parameters secure snippets uri user/ ); @@ -75,21 +75,15 @@ thus hiding the details of the particular engine implementation. =head1 METHODS -=over 4 - -=item $req->action +=head2 $req->action Returns the requested action as a L object. -=cut - -sub action { shift->{_context}->action(@_) } - -=item $req->address +=head2 $req->address Returns the IP address of the client. -=item $req->arguments +=head2 $req->arguments Returns a reference to an array containing the arguments. @@ -106,11 +100,11 @@ For example, if your action was and the URI for the request was C, the string C would be the first and only argument. -=item $req->args +=head2 $req->args Shortcut for arguments. -=item $req->base +=head2 $req->base Contains the URI base. This will always have a trailing slash. @@ -134,7 +128,7 @@ sub base { return $self->{base}; } -=item $req->body +=head2 $req->body Returns the message body of the request, unless Content-Type is C or C. @@ -147,7 +141,7 @@ sub body { return $self->{_body}->body; } -=item $req->body_parameters +=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. @@ -157,7 +151,7 @@ be either a scalar or an arrayref containing scalars. These are the parameters from the POST part of the request, if any. -=item $req->body_params +=head2 $req->body_params Shortcut for body_parameters. @@ -170,19 +164,19 @@ sub body_parameters { return $self->{body_parameters}; } -=item $req->content_encoding +=head2 $req->content_encoding Shortcut for $req->headers->content_encoding. -=item $req->content_length +=head2 $req->content_length Shortcut for $req->headers->content_length. -=item $req->content_type +=head2 $req->content_type Shortcut for $req->headers->content_type. -=item $req->cookie +=head2 $req->cookie A convenient method to access $req->cookies. @@ -210,7 +204,7 @@ sub cookie { } } -=item $req->cookies +=head2 $req->cookies Returns a reference to a hash containing the cookies. @@ -219,17 +213,17 @@ Returns a reference to a hash containing the cookies. The cookies in the hash are indexed by name, and the values are L objects. -=item $req->header +=head2 $req->header Shortcut for $req->headers->header. -=item $req->headers +=head2 $req->headers Returns an L object containing the headers for the current request. print $c->request->headers->header('X-Catalyst'); -=item $req->hostname +=head2 $req->hostname Returns the hostname of the client. @@ -250,20 +244,20 @@ sub hostname { return $self->{hostname}; } -=item $req->input +=head2 $req->input Alias for $req->body. -=item $req->match +=head2 $req->match This contains the matching part of a Regex action. Otherwise it returns the same as 'action'. -=item $req->method +=head2 $req->method Contains the request method (C, C, C, etc). -=item $req->param +=head2 $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. @@ -316,7 +310,7 @@ sub param { } } -=item $req->parameters +=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. @@ -326,7 +320,7 @@ be either a scalar or an arrayref containing scalars. This is the combination of C and C. -=item $req->params +=head2 $req->params Shortcut for $req->parameters. @@ -335,15 +329,24 @@ Shortcut for $req->parameters. 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 Returns the path, i.e. the part of the URI after $req->base, for the current request. -=item $req->path_info +=head2 $req->path_info Alias for path, added for compability with L. @@ -369,11 +372,11 @@ sub path { return $path; } -=item $req->protocol +=head2 $req->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 string (GET) parameters. Values can be either a scalar or an arrayref containing scalars. @@ -381,7 +384,7 @@ 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] ) 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 @@ -393,21 +396,21 @@ 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 for $req->headers->referer. Returns the referring page. -=item $req->secure +=head2 $req->secure Returns true or false, indicating whether the connection is secure (https). -=item $req->snippets +=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 access $req->uploads. @@ -465,7 +468,7 @@ 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 L objects. @@ -482,22 +485,20 @@ sub uploads { return $self->{uploads}; } -=item $req->uri +=head2 $req->uri Returns a URI object for the current request. Stringifies to the URI text. -=item $req->user +=head2 $req->user Returns the currently logged in user. Deprecated. The method recommended for newer plugins is $c->user. -=item $req->user_agent +=head2 $req->user_agent Shortcut to $req->headers->user_agent. Returns the user agent (browser) version string. -=back - =head1 AUTHORS Sebastian Riedel, C