[Catalyst-commits] r9536 - in Catalyst-Runtime/5.80/trunk: lib/Catalyst t/aggregate t/lib/TestApp/Controller

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-03-21 14:08:25 +0000 (Sat, 21 Mar 2009)
New Revision: 9536

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm
   Catalyst-Runtime/5.80/trunk/t/aggregate/live_recursion.t
   Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Root.pm
Log:
Merge up ashs r9505 from 5.70

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm	2009-03-20 17:43:33 UTC (rev 9535)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm	2009-03-21 14:08:25 UTC (rev 9536)
@@ -582,7 +582,12 @@
     $self->_load_dispatch_types( @{ $self->postload_dispatch_types } );
 
     return unless $c->debug;
+    $self->_display_action_tables($c);
+}
 
+sub _display_action_tables {
+    my ($self, $c) = @_;
+
     my $column_width = Catalyst::Utils::term_width() - 20 - 36 - 12;
     my $privates = Text::SimpleTable->new(
         [ 20, 'Private' ], [ 36, 'Class' ], [ $column_width, 'Method' ]
@@ -682,6 +687,20 @@
 
 Provided by Moose
 
+# Dont document this until someone else is happy with beaviour. Ash 2009/03/16
+sub dispatch_type {
+    my ($self, $name) = @_;
+
+    unless ($name =~ s/^\+//) {
+        $name = "Catalyst::DispatchType::" . $name;
+    }
+
+    for (@{ $self->dispatch_types }) {
+        return $_ if ref($_) eq $name;
+    }
+    return undef;
+}
+
 =head1 AUTHORS
 
 Catalyst Contributors, see Catalyst.pm

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_recursion.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_recursion.t	2009-03-20 17:43:33 UTC (rev 9535)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_recursion.t	2009-03-21 14:08:25 UTC (rev 9536)
@@ -23,3 +23,4 @@
     ok( !$response->is_success, 'Response Not Successful' );
     is( $response->header('X-Catalyst-Error'), 'Deep recursion detected calling "/recursion_test"', 'Deep Recursion Detected' );
 }
+

Modified: Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Root.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Root.pm	2009-03-20 17:43:33 UTC (rev 9535)
+++ Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Root.pm	2009-03-21 14:08:25 UTC (rev 9536)
@@ -20,4 +20,8 @@
     $c->forward('TestApp::View::Dump::Request');
 }
 
+sub chain_to_self : Chained('chain_to_self') PathPart('') CaptureArgs(1) { }
+
+sub chain_recurse_endoint : Chained('chain_to_self') Args(0) { }
+
 1;