X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=5fc33c0d1345135ffde317b01644b747e1d471ca;hp=4c6c13942764a714a397f82cabecaa2d91359731;hb=684d10edf63074f94667d437db01d30b8d13cefc;hpb=f3b3f450e65aac37c01373a16579b4b902c8d5ba diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index 4c6c139..5fc33c0 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -192,12 +192,12 @@ sub prepare_action { if ( $c->debug && @args ); } -=item $self->get_action( $c, $action, $namespace ) +=item $self->get_action( $action, $namespace ) =cut sub get_action { - my ( $self, $c, $name, $namespace ) = @_; + my ( $self, $name, $namespace ) = @_; return unless $name; $namespace ||= ''; $namespace = '' if $namespace eq '/'; @@ -206,7 +206,7 @@ sub get_action { return unless @match; - if ( my $action = $match[-1]->get_action( $c, $name ) ) { + if ( my $action = $match[-1]->get_action($name) ) { return $action if $action->namespace eq $namespace; } } @@ -223,7 +223,7 @@ sub get_actions { my @match = $self->get_containers($namespace); - return map { $_->get_action( $c, $action ) } @match; + return map { $_->get_action($action) } @match; } =item $self->get_containers( $namespace ) @@ -361,7 +361,11 @@ sub setup_actions { return unless $c->debug; - my $privates = Text::SimpleTable->new( [ 36, 'Private' ], [ 37, 'Class' ] ); + my $privates = Text::SimpleTable->new( + [ 24, 'Private' ], + [ 23, 'Class' ], + [ 23, 'Method' ] + ); my $has_private = 0; my $walker = sub { @@ -375,7 +379,7 @@ sub setup_actions { next if ( ( $action =~ /^_.*/ ) && ( !$c->config->{show_internal_actions} ) ); - $privates->row( "$prefix$action", $action_obj->class ); + $privates->row( "$prefix$action", $action_obj->class, $action ); $has_private = 1; }