tabs => spaces

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Request.pm

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index 42b3c8a..24e39bf 100644 (file)
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -9,7 +9,7 @@ use utf8;
 use URI::QueryParam;
 
 __PACKAGE__->mk_accessors(
-    qw/action address arguments cookies headers keywords match method
+    qw/action address arguments cookies headers match method
       protocol query_parameters secure captures uri user/
 );
 
@@ -51,7 +51,6 @@ Catalyst::Request - provides information about the current client request
     $req->headers;
     $req->hostname;
     $req->input;
-    $req->keywords;
     $req->match;
     $req->method;
     $req->param;
@@ -100,11 +99,11 @@ Returns a reference to an array containing the arguments.
 
 For example, if your action was
 
-       package MyApp::C::Foo;
-       
-       sub moose : Local {
-               ...
-       }
+    package MyApp::C::Foo;
+
+    sub moose : Local {
+        ...
+    }
 
 and the URI for the request was C<http://.../foo/moose/bah>, the string C<bah>
 would be the first and only argument.
@@ -260,15 +259,6 @@ sub hostname {
 
 Alias for $req->body.
 
-=head2 $req->keywords
-
-Contains the keywords portion of a query string, when no '=' signs are
-present.
-
-    http://localhost/path?some+keywords
-    
-    $c->request->keywords will contain 'some keywords'
-
 =head2 $req->match
 
 This contains the matching part of a Regex action. Otherwise
@@ -291,7 +281,7 @@ is an alternative method for accessing parameters in $c->req->parameters.
 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' );
+    $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>
@@ -375,22 +365,24 @@ Alias for path, added for compability with L<CGI>.
 =cut
 
 sub path {
-    my ( $self, $params ) = @_;
+    my ( $self, @params ) = @_;
 
-    if ($params) {
-        $self->uri->path($params);
+    if (@params) {
+        $self->uri->path(@params);
+        undef $self->{path};
     }
-    else {
-        return $self->{path} if $self->{path};
+    elsif ( defined( my $path = $self->{path} ) ) {
+        return $path;
     }
+    else {
+        my $path     = $self->uri->path;
+        my $location = $self->base->path;
+        $path =~ s/^(\Q$location\E)?//;
+        $path =~ s/^\///;
+        $self->{path} = $path;
 
-    my $path     = $self->uri->path;
-    my $location = $self->base->path;
-    $path =~ s/^(\Q$location\E)?//;
-    $path =~ s/^\///;
-    $self->{path} = $path;
-
-    return $path;
+        return $path;
+    }
 }
 
 =head2 $req->protocol