X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest.pm;h=dca909c1f9749ace9ade6e454cd4d39696bff17f;hb=908e3d9e7a61974b3807b7ab37862550452b2456;hp=cd53311d95f6a0bf5a56e916d930b9fee12becf2;hpb=e669e88a53601a58917a17f6bec1822262225ab6;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm index cd53311..dca909c 100644 --- a/lib/Catalyst/Request.pm +++ b/lib/Catalyst/Request.pm @@ -10,7 +10,7 @@ use URI::QueryParam; __PACKAGE__->mk_accessors( qw/action address arguments cookies headers match method - protocol query_parameters secure snippets uri user/ + protocol query_parameters secure captures uri user/ ); *args = \&arguments; @@ -19,6 +19,7 @@ __PACKAGE__->mk_accessors( *params = \¶meters; *query_params = \&query_parameters; *path_info = \&path; +*snippets = \&captures; sub content_encoding { shift->headers->content_encoding(@_) } sub content_length { shift->headers->content_length(@_) } @@ -61,14 +62,14 @@ Catalyst::Request - provides information about the current client request $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. +See also L, L. =head1 DESCRIPTION @@ -80,7 +81,11 @@ thus hiding the details of the particular engine implementation. =head2 $req->action -Returns the requested action as a L object. +[DEPRECATED] Returns the name of the requested action. + + +Use C<< $c->action >> instead (which returns a +L object). =head2 $req->address @@ -407,11 +412,16 @@ Shortcut for $req->headers->referer. Returns the referring page. Returns true or false, indicating whether the connection is secure (https). -=head2 $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 }; + +=head2 $req->snippets + +C used to be called snippets. This is still available for backwoards +compatibility, but is considered deprecated. =head2 $req->upload @@ -494,8 +504,9 @@ Returns a URI object for the current request. Stringifies to the URI text. =head2 $req->uri_with( { key => 'value' } ); -Returns a rewriten URI object for the current uri. Key/value pairs passed in -will override existing parameters. Unmodified pairs will be preserved. +Returns a rewritten URI object for the current request. Key/value pairs +passed in will override existing parameters. Unmodified pairs will be +preserved. =cut @@ -503,14 +514,14 @@ sub uri_with { my( $self, $args ) = @_; carp( 'No arguments passed to uri_with()' ) unless $args; - + for my $value ( values %$args ) { - my $isa_ref = ref $value; - if( $isa_ref and $isa_ref ne 'ARRAY' ) { - croak( "Non-array reference ($isa_ref) passed to uri_with()" ); + for ( ref $value eq 'ARRAY' ? @$value : $value ) { + $_ = "$_"; + utf8::encode( $_ ); } - utf8::encode( $_ ) for $isa_ref ? @$value : $value; }; + my $uri = $self->uri->clone; $uri->query_form( {