[Catalyst-commits] r7352 - in trunk/Catalyst-Plugin-SubRequest: . lib/Catalyst/Plugin

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2008-01-06 21:50:33 +0000 (Sun, 06 Jan 2008)
New Revision: 7352

Modified:
   trunk/Catalyst-Plugin-SubRequest/Changes
   trunk/Catalyst-Plugin-SubRequest/Makefile.PL
   trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm
Log:
Fix subrequest to work with latest catalyst

Modified: trunk/Catalyst-Plugin-SubRequest/Changes
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/Changes	2008-01-04 22:26:51 UTC (rev 7351)
+++ trunk/Catalyst-Plugin-SubRequest/Changes	2008-01-06 21:50:33 UTC (rev 7352)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::SubRequest
 
+0.13  2008-01-06 22:33:00 CET
+        - Update to work with new Stats package.
+
 0.12  2007-09-12 13:08:00 CET
         - Switch to Module::Install
         - Fixed README (RT #16459)

Modified: trunk/Catalyst-Plugin-SubRequest/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/Makefile.PL	2008-01-04 22:26:51 UTC (rev 7351)
+++ trunk/Catalyst-Plugin-SubRequest/Makefile.PL	2008-01-06 21:50:33 UTC (rev 7352)
@@ -3,7 +3,7 @@
 name 'Catalyst-Plugin-SubRequest';
 all_from 'lib/Catalyst/Plugin/SubRequest.pm';
 
-requires 'Catalyst::Runtime';
+requires 'Catalyst::Runtime' => '5.7012';
 
 requires 'Test::More';
 

Modified: trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm
===================================================================
--- trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm	2008-01-04 22:26:51 UTC (rev 7351)
+++ trunk/Catalyst-Plugin-SubRequest/lib/Catalyst/Plugin/SubRequest.pm	2008-01-06 21:50:33 UTC (rev 7352)
@@ -3,7 +3,7 @@
 use strict;
 use Time::HiRes qw/tv_interval/;
 
-our $VERSION = '0.12';
+our $VERSION = '0.13';
 
 =head1 NAME
 
@@ -81,17 +81,16 @@
 
     $inner_ctx->stash($stash || {});
     
+    
+    $c->stats->profile(
+        begin   => 'subrequest: /' . $path,
+        comment => '',
+    ) if ($c->debug); 
+        
     $inner_ctx->dispatch;
+
+    $c->stats->profile( end => 'subrequest: /' . $path ) if ($c->debug);
     
-    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);
-    }
-    
     return $inner_ctx->response->body;
 }