[Catalyst-commits] r10026 - in trunk/Catalyst-Controller-WrapCGI: . lib/Catalyst/Controller t t/lib/TestApp/Controller

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-05-06 20:17:12 +0000 (Wed, 06 May 2009)
New Revision: 10026

Modified:
   trunk/Catalyst-Controller-WrapCGI/Changes
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
   trunk/Catalyst-Controller-WrapCGI/t/lib/TestApp/Controller/Root.pm
   trunk/Catalyst-Controller-WrapCGI/t/wrap-cgi.t
Log:
C::C::WrapCGI - pass captures in SCRIPT_NAME, new release

Modified: trunk/Catalyst-Controller-WrapCGI/Changes
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/Changes	2009-05-06 15:34:03 UTC (rev 10025)
+++ trunk/Catalyst-Controller-WrapCGI/Changes	2009-05-06 20:17:12 UTC (rev 10026)
@@ -1,5 +1,8 @@
 Revision history for Catalyst-Controller-WrapCGI
 
+0.0037  2009-05-06 20:07:00
+    - pass captures in SCRIPT_NAME (caelum)
+
 0.0036  2009-05-05 19:45:20
     - fix deps (caelum)
 

Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2009-05-06 15:34:03 UTC (rev 10025)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2009-05-06 20:17:12 UTC (rev 10026)
@@ -23,11 +23,11 @@
 
 =head1 VERSION
 
-Version 0.014
+Version 0.015
 
 =cut
 
-our $VERSION = '0.014';
+our $VERSION = '0.015';
 
 =head1 SYNOPSIS
 

Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2009-05-06 15:34:03 UTC (rev 10025)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2009-05-06 20:17:12 UTC (rev 10026)
@@ -20,11 +20,11 @@
 
 =head1 VERSION
 
-Version 0.0036
+Version 0.0037
 
 =cut
 
-our $VERSION = '0.0036';
+our $VERSION = '0.0037';
 
 =head1 SYNOPSIS
 
@@ -214,7 +214,7 @@
               PATH_INFO => $path_info,
 # eww, this is likely broken:
               FILEPATH_INFO => '/'.$c->action.$path_info,
-              SCRIPT_NAME => $c->uri_for($c->action)->path
+              SCRIPT_NAME => $c->uri_for($c->action, $c->req->captures)->path
             );
 
   {

Modified: trunk/Catalyst-Controller-WrapCGI/t/lib/TestApp/Controller/Root.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/t/lib/TestApp/Controller/Root.pm	2009-05-06 15:34:03 UTC (rev 10025)
+++ trunk/Catalyst-Controller-WrapCGI/t/lib/TestApp/Controller/Root.pm	2009-05-06 20:17:12 UTC (rev 10026)
@@ -45,7 +45,9 @@
     });
 }
 
-sub test_script_name : Path('/cgi-bin/test_scriptname.cgi') {
+sub test_script_name_root : Chained('/') PathPart('cgi-bin') CaptureArgs(1) {}
+
+sub test_script_name : Chained('test_script_name_root') PathPart('test_scriptname.cgi') Args {
     my ($self, $c) = @_;
 
     $self->cgi_to_response($c, sub {

Modified: trunk/Catalyst-Controller-WrapCGI/t/wrap-cgi.t
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/t/wrap-cgi.t	2009-05-06 15:34:03 UTC (rev 10025)
+++ trunk/Catalyst-Controller-WrapCGI/t/wrap-cgi.t	2009-05-06 20:17:12 UTC (rev 10026)
@@ -49,6 +49,6 @@
 is($response->content, '/test_filepath_info/path/%2Finfo',
     'FILEPATH_INFO is correct (maybe)');
 
-$response = request '/cgi-bin/test_scriptname.cgi/foo/bar';
-is($response->content, '/cgi-bin/test_scriptname.cgi',
+$response = request '/cgi-bin/mtfnpy/test_scriptname.cgi/foo/bar';
+is($response->content, '/cgi-bin/mtfnpy/test_scriptname.cgi',
     'SCRIPT_NAME is correct');