[Catalyst-commits] r11981 - in trunk/Catalyst-Plugin-SubRequest: . lib/Catalyst/Plugin t/lib t/lib/TestApp t/lib/TestApp/Controller

t0m at dev.catalyst.perl.org t0m at dev.catalyst.perl.org
Mon Nov 23 22:50:27 GMT 2009


Author: t0m
Date: 2009-11-23 22:50:27 +0000 (Mon, 23 Nov 2009)
New Revision: 11981

Added:
   trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp/
   trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp/Controller/
   trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp/Controller/Root.pm
Modified:
   trunk/Catalyst-Plugin-SubRequest/
   trunk/Catalyst-Plugin-SubRequest/Changes
   trunk/Catalyst-Plugin-SubRequest/Makefile.PL
   trunk/Catalyst-Plugin-SubRequest/README
   trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm
   trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp.pm
Log:
Update to work with latest Catalyst and not warn


Property changes on: trunk/Catalyst-Plugin-SubRequest
___________________________________________________________________
Name: svn:ignore
   + META.yml
pm_to_blib
blib
inc
Makefile
MANIFEST
MANIFEST.bak



Modified: trunk/Catalyst-Plugin-SubRequest/Changes
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/Changes	2009-11-23 22:41:11 UTC (rev 11980)
+++ trunk/Catalyst-Plugin-SubRequest/Changes	2009-11-23 22:50:27 UTC (rev 11981)
@@ -1,5 +1,10 @@
 Revision history for Perl extension Catalyst::Plugin::SubRequest
 
+0.15  2009-11-23 22:47:32 GMT
+        - Be compatible with Catalyst 5.80014 by not writing to the
+          request body directly.
+        - Remove deprecation warnings by moving actions out of the test app.
+
 0.14  2009-10-18 18:30:00 BST
         - Tweak copyright info to ease downstream packaging.
 

Modified: trunk/Catalyst-Plugin-SubRequest/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/Makefile.PL	2009-11-23 22:41:11 UTC (rev 11980)
+++ trunk/Catalyst-Plugin-SubRequest/Makefile.PL	2009-11-23 22:50:27 UTC (rev 11981)
@@ -4,10 +4,12 @@
 all_from 'lib/Catalyst/Plugin/SubRequest.pm';
 
 requires 'Catalyst::Runtime' => '5.7012';
-
 requires 'Test::More';
 
-auto_install;
+if ($Module::Install::AUTHOR) {
+    system("pod2text lib/Catalyst/Plugin/SubRequest.pm > README");
+}
+
 resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Plugin-SubRequest/';
 
 WriteAll;

Modified: trunk/Catalyst-Plugin-SubRequest/README
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/README	2009-11-23 22:41:11 UTC (rev 11980)
+++ trunk/Catalyst-Plugin-SubRequest/README	2009-11-23 22:50:27 UTC (rev 11981)
@@ -32,6 +32,10 @@
     SRI, for writing the awesome Catalyst framework
 
 COPYRIGHT
+    Copyright (c) 2005 - 2008 the Catalyst::Plugin::SubRequest "AUTHOR" as
+    listed above.
+
+LICENSE
     This program is free software, you can redistribute it and/or modify it
     under the same terms as Perl itself.
 

Modified: trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm	2009-11-23 22:41:11 UTC (rev 11980)
+++ trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm	2009-11-23 22:50:27 UTC (rev 11981)
@@ -1,9 +1,10 @@
 package Catalyst::Plugin::SubRequest;
 
 use strict;
+use warnings;
 use Time::HiRes qw/tv_interval/;
 
-our $VERSION = '0.14';
+our $VERSION = '0.15';
 
 =head1 NAME
 
@@ -61,6 +62,7 @@
     } else {
         $request_mods{path} = $path;
     }
+    $request_mods{_body} = delete $request_mods{body};
 
     my $fake_engine = bless(
         {
@@ -98,10 +100,12 @@
 
 L<Catalyst>.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
 Marcus Ramberg, C<mramberg at cpan.org>
 
+Tomas Doran (t0m) C<< bobtfish at bobtfish.net >>
+
 =head1 THANK YOU
 
 SRI, for writing the awesome Catalyst framework
@@ -109,7 +113,7 @@
 =head1 COPYRIGHT
 
 Copyright (c) 2005 - 2008
-the Catalyst::Plugin::SubRequest L</AUTHOR>
+the Catalyst::Plugin::SubRequest L</AUTHORS>
 as listed above.
 
 =head1 LICENSE

Added: trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp/Controller/Root.pm
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp/Controller/Root.pm	                        (rev 0)
+++ trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp/Controller/Root.pm	2009-11-23 22:50:27 UTC (rev 11981)
@@ -0,0 +1,38 @@
+package TestApp::Controller::Root;
+use strict;
+use warnings;
+
+use base qw/Catalyst::Controller/;
+
+sub begin : Private {
+    my ( $self, $c ) = @_;
+    $c->res->body('1');
+}
+
+sub subtest : Global {
+    my ( $self, $c ) = @_;
+    my $subreq= $c->res->body().
+                $c->subreq('/normal/4');
+    $c->res->body($subreq);
+}
+
+sub normal : Global {
+    my ( $self, $c, $arg ) = @_;
+    $c->res->body($c->res->body().$arg);
+}
+
+sub subtest_params : Global {
+    my ( $self, $c ) = @_;
+    my $before = $c->req->params->{value};
+    my $subreq = $c->subreq('/normal/2');
+    my $after = $c->req->params->{value};
+    $c->res->body($c->res->body().$after);
+}
+
+sub end : Private {
+    my ( $self, $c ) = @_;
+    $c->res->body($c->res->body().'3');
+}
+
+1;
+

Modified: trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp.pm
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp.pm	2009-11-23 22:41:11 UTC (rev 11980)
+++ trunk/Catalyst-Plugin-SubRequest/t/lib/TestApp.pm	2009-11-23 22:50:27 UTC (rev 11981)
@@ -1,4 +1,7 @@
 package TestApp;
+use strict;
+use warnings;
+use base qw/Catalyst/;
 
 use Catalyst qw[SubRequest];
 
@@ -8,35 +11,4 @@
 
 __PACKAGE__->setup();
 
-    sub begin : Private {
-        my ( $self, $c ) = @_;
-        $c->res->body('1');
-    }
-
-    sub subtest : Global {
-        my ( $self, $c ) = @_;
-        my $subreq= $c->res->body().
-                    $c->subreq('/normal/4');
-        $c->res->body($subreq);
-    }
-  
-    sub normal : Global {
-        my ( $self, $c, $arg ) = @_;
-        $c->res->body($c->res->body().$arg);
-    }
-    
-    sub subtest_params : Global {
-        my ( $self, $c ) = @_;
-        my $before = $c->req->params->{value};
-        my $subreq = $c->subreq('/normal/2');
-        my $after = $c->req->params->{value};
-        $c->res->body($c->res->body().$after);
-    }
-
-    sub end : Private {
-        my ( $self, $c ) = @_;
-        $c->res->body($c->res->body().'3');
-    }
-
-
 1;




More information about the Catalyst-commits mailing list