Deprecated (undocumented anyway) raw_uri infavor of base and request_…

…uri.
plack · Jan 27, 2010 · 9f269c8 · 9f269c8
1 parent 8d07f70
commit 9f269c8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git a/lib/Plack/Request.pm b/lib/Plack/Request.pm
@@ -186,7 +186,7 @@ sub upload {
     return $self->uploads->get_all($key);
 }
 
-sub raw_uri {
+sub base {
     my $self = shift;
 
     my $env    = $self->env;
@@ -200,16 +200,20 @@ sub raw_uri {
     };
 
     my $uri = "$scheme\://$host" . $env->{REQUEST_URI};
-    return URI->new($uri);
+    $uri = URI->new($uri);
+    $uri->path_query($self->env->{SCRIPT_NAME} || "/");
+
+    return $uri;
 }
 
-sub base {
+sub raw_uri {
     my $self = shift;
+    _deprecated 'base';
 
-    my $uri = $self->raw_uri;
-    $uri->path_query($self->env->{SCRIPT_NAME} || "/");
+    my $base = $self->base;
+    $base->path_query($self->env->{REQUEST_URI});
 
-    return $uri;
+    $base;
 }
 
 sub uri {

diff --git a/t/Plack-Request/raw_uri.t b/t/Plack-Request/raw_uri.t
diff --git a/t/Plack-Request/request_uri.t b/t/Plack-Request/request_uri.t
@@ -0,0 +1,22 @@
+use strict;
+use Test::More;
+use Plack::Request;
+use Plack::Test;
+use HTTP::Request::Common;
+
+my $app = sub {
+    my $req = Plack::Request->new(shift);
+    return [ 200, [], [ $req->request_uri ] ];
+};
+
+test_psgi $app, sub {
+    my $cb = shift;
+
+    my $res = $cb->(GET "http://localhost/foo%20bar");
+    is $res->content, '/foo%20bar';
+
+    $res = $cb->(GET "http://localhost:2020/FOO/bar,baz");
+    is $res->content, '/FOO/bar,baz';
+};
+
+done_testing;