Merge commit 'toms/master'

diff --git a/.gitignore b/.gitignore
index c40818e..d34c747 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Catalyst-TraitFor-Request-ProxyBase*
 MANIFEST.bak
 cover_db
 META.yml

diff --git a/Changes b/Changes
index f611bad..570d1ff 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+0.000002
+
+ - Always apply the Request base to $c->req->base, not just on assignment.
 
 0.000001
 

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index e11782e..c108f5a 100644 (file)
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -1,3 +1,4 @@
+^Catalyst-TraitFor-Request-ProxyBase
 .gitignore
 .git/
 blib

diff --git a/lib/Catalyst/TraitFor/Request/ProxyBase.pm b/lib/Catalyst/TraitFor/Request/ProxyBase.pm
index 0872718..66197d5 100644 (file)
--- a/lib/Catalyst/TraitFor/Request/ProxyBase.pm
+++ b/lib/Catalyst/TraitFor/Request/ProxyBase.pm
@@ -3,7 +3,7 @@ use Moose::Role;
 use URI ();
 use namespace::autoclean;
 
-our $VERSION = '0.000001';
+our $VERSION = '0.000002';
 
 requires qw/
     base
@@ -12,11 +12,9 @@ requires qw/
 
 around 'base' => sub {
     my ($orig, $self, @args) = @_;
-    if (scalar @args) {
-        if (my $base = $self->header('X-Request-Base')) {
-            $base .= '/' unless $base =~ m|/$|;
-            @args = (URI->new($base));
-        }
+    if (my $base = $self->header('X-Request-Base')) {
+        $base .= '/' unless $base =~ m|/$|;
+        @args = (URI->new($base));
     }
     $self->$orig(@args);
 };