Update to work with latest Catalyst and not warn

[catagits/Catalyst-Plugin-SubRequest.git] / lib / Catalyst / Plugin / SubRequest.pm

diff --git a/lib/Catalyst/Plugin/SubRequest.pm b/lib/Catalyst/Plugin/SubRequest.pm
index e2c2b01..12c663a 100644 (file)
--- a/lib/Catalyst/Plugin/SubRequest.pm
+++ b/lib/Catalyst/Plugin/SubRequest.pm
@@ -1,9 +1,10 @@
 package Catalyst::Plugin::SubRequest;
 
 use strict;
+use warnings;
 use Time::HiRes qw/tv_interval/;
 
-our $VERSION = '0.12';
+our $VERSION = '0.15';
 
 =head1 NAME
 
@@ -26,7 +27,7 @@ dispatcher, so it will work like an external url call.
 
 =head1 METHODS
 
-=over 4 
+=over 4
 
 =item subreq [path as string or hash ref], [stash as hash ref], [parameters as hash ref]
 
@@ -36,7 +37,7 @@ Takes a full path to a path you'd like to dispatch to.
 If the path is passed as a hash ref then it can include body, action, match and path.
 Any additional parameters are put into the stash.
 
-=back 
+=back
 
 =cut
 
@@ -61,6 +62,7 @@ sub sub_request {
     } else {
         $request_mods{path} = $path;
     }
+    $request_mods{_body} = delete $request_mods{body};
 
     my $fake_engine = bless(
         {
@@ -80,18 +82,17 @@ sub sub_request {
     my $inner_ctx = $class->prepare;
 
     $inner_ctx->stash($stash || {});
-    
+
+
+    $c->stats->profile(
+        begin   => 'subrequest: /' . $path,
+        comment => '',
+    ) if ($c->debug);
+
     $inner_ctx->dispatch;
-    
-    if ($c->debug) {
-        $inner_ctx->stats->setNodeValue({
-            action => 'subrequest:',
-            comment => '',
-            elapsed => sprintf('%fs', tv_interval($inner_ctx->stats->getNodeValue)),
-        });
-        $c->stats->addChild($inner_ctx->stats);
-    }
-    
+
+    $c->stats->profile( end => 'subrequest: /' . $path ) if ($c->debug);
+
     return $inner_ctx->response->body;
 }
 
@@ -99,16 +100,24 @@ sub sub_request {
 
 L<Catalyst>.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
 Marcus Ramberg, C<mramberg@cpan.org>
 
+Tomas Doran (t0m) C<< bobtfish@bobtfish.net >>
+
 =head1 THANK YOU
 
 SRI, for writing the awesome Catalyst framework
 
 =head1 COPYRIGHT
 
+Copyright (c) 2005 - 2008
+the Catalyst::Plugin::SubRequest L</AUTHORS>
+as listed above.
+
+=head1 LICENSE
+
 This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
@@ -122,7 +131,7 @@ sub AUTOLOAD { return 1; } # yeah yeah yeah
 sub prepare {
     my ($self, $c) = @_;
     my $req = $c->request;
-    
+
     @{$req}{keys %{$self->{orig_request}}} = values %{$self->{orig_request}};
     while (my ($key,$value) = each %{$self->{request_mods}}) {
         if (my $mut = $req->can($key)) {