X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest.pm;h=f9ff7b327d4e4f968dd6315a6c42ad6c7f892bcb;hb=fabf3a100d2255ee3d0d4f7af57b57cd658feceb;hp=3dfbee48653ae141b25d16ca7d95f46256883962;hpb=b5ecfcf07b8ffe7e9984f0279c8781ce51c6ac6a;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index 3dfbee4..f9ff7b3 100644
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -4,6 +4,7 @@ use strict;
 use base 'Class::Accessor::Fast';
 
 use IO::Socket qw[AF_INET inet_aton];
+use Carp;
 
 __PACKAGE__->mk_accessors(
     qw/action address arguments cookies headers match method
@@ -251,7 +252,8 @@ Alias for $req->body.
 =head2 $req->match
 
 This contains the matching part of a Regex action. Otherwise
-it returns the same as 'action'.
+it returns the same as 'action', except for default actions,
+which return an empty string.
 
 =head2 $req->method
 
@@ -329,7 +331,16 @@ 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};
 }
 
@@ -356,7 +367,6 @@ sub 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;
 
@@ -480,6 +490,27 @@ sub uploads {
 
 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.
+
+=cut
+
+sub uri_with {
+    my( $self, $args ) = @_;
+    
+    carp( 'No arguments passed to uri_with()' ) unless $args;
+    
+    my $uri = $self->uri->clone;
+    
+    $uri->query_form( {
+        $uri->query_form,
+        %$args
+    } );
+    return $uri;
+}
+
 =head2 $req->user
 
 Returns the currently logged in user. Deprecated. The method recommended for