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=7c5134be1463365e13358b65d4bc40e2f5804ae0;hp=504e9056864bd116df7d88e7bac7ff7a36572b9d;hb=f3414019f472b55682ef3af53f761b6db7955887;hpb=d1b0d31de6cde4caff6a36001f179564847d570e diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index 504e905..7c5134b 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -1,18 +1,38 @@ package Catalyst::Dispatcher; -use strict; -use base 'Class::Accessor::Fast'; +use Moose; +use Class::MOP; + use Catalyst::Exception; use Catalyst::Utils; use Catalyst::Action; -use Text::ASCIITable; +use Catalyst::ActionContainer; +use Catalyst::DispatchType::Default; +use Catalyst::DispatchType::Index; +use Text::SimpleTable; use Tree::Simple; use Tree::Simple::Visitor::FindByPath; +use Scalar::Util (); + +#do these belong as package vars or should we build these via a builder method? +# Preload these action types +our @PRELOAD = qw/Index Path Regex/; + +# Postload these action types +our @POSTLOAD = qw/Default/; -# Stringify to class -use overload '""' => sub { return ref shift }, fallback => 1; +has _tree => (is => 'rw'); +has _dispatch_types => (is => 'rw', default => sub { [] }, required => 1, lazy => 1); +has _registered_dispatch_types => (is => 'rw', default => sub { {} }, required => 1, lazy => 1); +has _method_action_class => (is => 'rw', default => 'Catalyst::Action'); +has _action_container_class => (is => 'rw', default => 'Catalyst::ActionContainer'); -__PACKAGE__->mk_accessors(qw/actions tree/); +has preload_dispatch_types => (is => 'rw', required => 1, lazy => 1, default => sub { [@PRELOAD] }); +has postload_dispatch_types => (is => 'rw', required => 1, lazy => 1, default => sub { [@POSTLOAD] }); +has _action_hash => (is => 'rw', required => 1, lazy => 1, default => sub { {} }); +has _container_hash => (is => 'rw', required => 1, lazy => 1, default => sub { {} }); + +no Moose; =head1 NAME @@ -24,82 +44,70 @@ See L. =head1 DESCRIPTION +This is the class that maps public urls to actions in your Catalyst +application based on the attributes you set. + =head1 METHODS -=over 4 +=head2 new -=item $self->detach( $c, $command [, \@arguments ] ) +Construct a new dispatcher. =cut -sub detach { - my ( $self, $c, $command, @args ) = @_; - $c->forward( $command, @args ) if $command; - die $Catalyst::DETACH; +sub BUILD { + my ($self, $params) = @_; + + my $container = + Catalyst::ActionContainer->new( { part => '/', actions => {} } ); + + $self->_tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) ); } -=item $self->dispatch($c) +=head2 $self->preload_dispatch_types -=cut +An arrayref of pre-loaded dispatchtype classes -sub dispatch { - my ( $self, $c ) = @_; - my $action = $c->req->action; - my $namespace = ''; - $namespace = ( join( '/', @{ $c->req->args } ) || '/' ) - if $action eq 'default'; - - unless ($namespace) { - if ( my $result = $c->get_action($action) ) { - $namespace = - Catalyst::Utils::class2prefix( $result->[0]->[0]->namespace, - $c->config->{case_sensitive} ); - } - } +Entries are considered to be available as C +To use a custom class outside the regular C namespace, prefix +it with a C<+>, like so: - my $default = $action eq 'default' ? $namespace : undef; - my $results = $c->get_action( $action, $default, $default ? 1 : 0 ); - $namespace ||= '/'; + +My::Dispatch::Type - if ( @{$results} ) { +=head2 $self->postload_dispatch_types - # Errors break the normal flow and the end action is instantly run - my $error = 0; +An arrayref of post-loaded dispatchtype classes - # Execute last begin - $c->state(1); - if ( my $begin = @{ $c->get_action( 'begin', $namespace, 1 ) }[-1] ) { - $begin->[0]->execute($c); - $error++ if scalar @{ $c->error }; - } +Entries are considered to be available as C +To use a custom class outside the regular C namespace, prefix +it with a C<+>, like so: - # Execute the auto chain - my $autorun = 0; - for my $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) { - last if $error; - $autorun++; - $auto->[0]->execute($c); - $error++ if scalar @{ $c->error }; - last unless $c->state; - } + +My::Dispatch::Type - # Execute the action or last default - my $mkay = $autorun ? $c->state ? 1 : 0 : 1; - if ( ( my $action = $c->req->action ) && $mkay ) { - unless ($error) { - if ( my $result = - @{ $c->get_action( $action, $default, 1 ) }[-1] ) - { - $result->[0]->execute($c); - $error++ if scalar @{ $c->error }; - } - } - } +=head2 $self->detach( $c, $command [, \@arguments ] ) - # Execute last end - if ( my $end = @{ $c->get_action( 'end', $namespace, 1 ) }[-1] ) { - $end->[0]->execute($c); - } +Documented in L + +=cut + +sub detach { + my ( $self, $c, $command, @args ) = @_; + $c->forward( $command, @args ) if $command; + die $Catalyst::DETACH; +} + +=head2 $self->dispatch($c) + +Delegate the dispatch to the action that matched the url, or return a +message about unknown resource + + +=cut + +sub dispatch { + my ( $self, $c ) = @_; + if ( my $action = $c->action ) { + $c->forward( join( '/', '', $action->namespace, '_DISPATCH' ) ); } else { @@ -112,474 +120,421 @@ sub dispatch { } } -=item $self->forward( $c, $command [, \@arguments ] ) +=head2 $self->forward( $c, $command [, \@arguments ] ) + +Documented in L =cut sub forward { - my $self = shift; - my $c = shift; - my $command = shift; + my ( $self, $c, $command, @extra_params ) = @_; unless ($command) { $c->log->debug('Nothing to forward to') if $c->debug; return 0; } - # Relative forwards from detach - my $caller = ( caller(1) )[0]->isa('Catalyst::Dispatcher') - && ( ( caller(2) )[3] =~ /::detach$/ ) ? caller(3) : caller(1); + my @args; - my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args; + if ( ref( $extra_params[-1] ) eq 'ARRAY' ) { + @args = @{ pop @extra_params } + } else { + # this is a copy, it may take some abuse from ->_invoke_as_path if the path had trailing parts + @args = @{ $c->request->arguments }; + } - my $results = []; + my $action; - my $command_copy = $command; + # forward to a string path ("/foo/bar/gorch") or action object which stringifies to that + $action = $self->_invoke_as_path( $c, "$command", \@args ); - unless ( $command_copy =~ s/^\/// ) { - my $namespace = - Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} ) || ''; - $command_copy = "${namespace}/${command}"; + # forward to a component ( "MyApp::*::Foo" or $c->component("...") - a path or an object) + unless ($action) { + my $method = @extra_params ? $extra_params[0] : "process"; + $action = $self->_invoke_as_component( $c, $command, $method ); } - unless ( $command_copy =~ /\// ) { - $results = $c->get_action( $command_copy, '/' ); + + unless ($action) { + my $error = + qq/Couldn't forward to command "$command": / + . qq/Invalid action or component./; + $c->error($error); + $c->log->debug($error) if $c->debug; + return 0; } - else { - my @extra_args; - DESCEND: while ( $command_copy =~ s/^(.*)\/(\w+)$/$1/ ) { - my $tail = $2; - $results = $c->get_action( $tail, $1 ); - if ( @{$results} ) { - $command = $tail; - push( @{$arguments}, @extra_args ); - last DESCEND; - } - unshift( @extra_args, $tail ); - } + + #push @$args, @_; + + no warnings 'recursion'; + + my $orig_args = $c->request->arguments(); + $c->request->arguments(\@args); + $action->dispatch( $c ); + $c->request->arguments($orig_args); + + return $c->state; +} + +sub _action_rel2abs { + my ( $self, $c, $path ) = @_; + + unless ( $path =~ m#^/# ) { + my $namespace = $c->stack->[-1]->namespace; + $path = "$namespace/$path"; } - unless ( @{$results} ) { + $path =~ s#^/##; + return $path; +} - unless ( $c->components->{$command} ) { - my $error = -qq/Couldn't forward to command "$command". Invalid action or component./; - $c->error($error); - $c->log->debug($error) if $c->debug; - return 0; - } +sub _invoke_as_path { + my ( $self, $c, $rel_path, $args ) = @_; - my $class = $command; - my $method = shift || 'process'; - - if ( my $code = $c->components->{$class}->can($method) ) { - my $action = Catalyst::Action->new( - { - code => $code, - reverse => "$class->$method", - namespace => $class, - } - ); - $results = [ [$action] ]; - } + my $path = $self->_action_rel2abs( $c, $rel_path ); + my ( $tail, @extra_args ); + while ( ( $path, $tail ) = ( $path =~ m#^(?:(.*)/)?(\w+)?$# ) ) + { # allow $path to be empty + if ( my $action = $c->get_action( $tail, $path ) ) { + push @$args, @extra_args; + return $action; + } else { - my $error = - qq/Couldn't forward to "$class". Does not implement "$method"/; - $c->error($error); - $c->log->debug($error) - if $c->debug; - return 0; + return + unless $path + ; # if a match on the global namespace failed then the whole lookup failed } + unshift @extra_args, $tail; } +} - local $c->request->{arguments} = [ @{$arguments} ]; +sub _find_component_class { + my ( $self, $c, $component ) = @_; - for my $result ( @{$results} ) { - $result->[0]->execute($c); - return if scalar @{ $c->error }; - last unless $c->state; - } + return ref($component) + || ref( $c->component($component) ) + || $c->component($component); +} - return $c->state; +sub _invoke_as_component { + my ( $self, $c, $component, $method ) = @_; + + my $class = $self->_find_component_class( $c, $component ) || return 0; + + if ( my $code = $class->can($method) ) { + return $self->_method_action_class->new( + { + name => $method, + code => $code, + reverse => "$class->$method", + class => $class, + namespace => Catalyst::Utils::class2prefix( + $class, $c->config->{case_sensitive} + ), + } + ); + } + else { + my $error = + qq/Couldn't forward to "$class". Does not implement "$method"/; + $c->error($error); + $c->log->debug($error) + if $c->debug; + return 0; + } } -=item $self->prepare_action($c) +=head2 $self->prepare_action($c) + +Find an dispatch type that matches $c->req->path, and set args from it. =cut sub prepare_action { my ( $self, $c ) = @_; - my $path = $c->req->path; - my @path = split /\//, $c->req->path; - $c->req->args( \my @args ); + my $req = $c->req; + my $path = $req->path; + my @path = split /\//, $req->path; + $req->args( \my @args ); + + unshift( @path, '' ); # Root action - while (@path) { + DESCEND: while (@path) { $path = join '/', @path; - if ( my $result = ${ $c->get_action($path) }[0] ) { - - # It's a regex - if ($#$result) { - my $match = $result->[1]; - my @snippets = @{ $result->[2] }; - $c->log->debug( - qq/Requested action is "$path" and matched "$match"/) - if $c->debug; - $c->log->debug( - 'Snippets are "' . join( ' ', @snippets ) . '"' ) - if ( $c->debug && @snippets ); - $c->req->action($match); - $c->req->snippets( \@snippets ); - } + $path =~ s#^/##; - else { - $c->req->action($path); - $c->log->debug(qq/Requested action is "$path"/) if $c->debug; - } + $path = '' if $path eq '/'; # Root action + + # Check out dispatch types to see if any will handle the path at + # this level - $c->req->match($path); - last; + foreach my $type ( @{ $self->_dispatch_types } ) { + last DESCEND if $type->match( $c, $path ); } - unshift @args, pop @path; - } - unless ( $c->req->action ) { - $c->req->action('default'); - $c->req->match(''); + # If not, move the last part path to args + my $arg = pop(@path); + $arg =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; + unshift @args, $arg; } + s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg for grep { defined } @{$req->captures||[]}; + + $c->log->debug( 'Path is "' . $req->match . '"' ) + if ( $c->debug && $req->match ); + $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' ) if ( $c->debug && @args ); } -=item $self->get_action( $c, $action, $namespace, $inherit ) +=head2 $self->get_action( $action, $namespace ) + +returns a named action from a given namespace. =cut sub get_action { - my ( $self, $c, $action, $namespace, $inherit ) = @_; - return [] unless $action; - $namespace ||= ''; - $inherit ||= 0; - - if ($namespace) { - $namespace = '' if $namespace eq '/'; - my $parent = $self->tree; - my @results; - - if ($inherit) { - #my $result = - # $self->actions->{private}->{ $parent->getUID }->{$action}; - #push @results, [$result] if $result; - my $visitor = Tree::Simple::Visitor::FindByPath->new; - - #warn "${namespace} ${action}"; - my @path = split(/\//, $namespace); - $visitor->setSearchPath( @path ); - $parent->accept($visitor); - - #warn join(', ', map { $_->getNodeValue } $visitor->getResults); - - my @match = $visitor->getResults; - @match = ($parent) unless @match; - - if (!defined $visitor->getResult) { - my $extra = $path[(scalar @match) - 1]; - last unless $extra; - $visitor->setSearchPath($extra); - $match[-1]->accept($visitor); - push(@match, $visitor->getResult) if defined $visitor->getResult; - } + my ( $self, $name, $namespace ) = @_; + return unless $name; - foreach my $child (@match) { - my $node = $self->actions->{private}->{$child->getUID}; - next unless $node; - push(@results, [ $node->{$action} ]) if defined $node->{$action}; - } + $namespace = join( "/", grep { length } split '/', $namespace || "" ); - #SEARCH: - # for my $part ( split '/', $namespace ) { - # $visitor->setSearchPath($part); - # $parent->accept($visitor); - # my $child = $visitor->getResult; - # my $uid = $child->getUID if $child; - # my $match = $self->actions->{private}->{$uid}->{$action} - # if $uid; - # push @results, [$match] if $match; - # if ($child) { - # $parent = $child; - # } - # else { - # last SEARCH; - # } - # } + return $self->_action_hash->{"${namespace}/${name}"}; +} - } +=head2 $self->get_action_by_path( $path ); - else { +Returns the named action by its full path. - if ($namespace) { - my $visitor = Tree::Simple::Visitor::FindByPath->new; - $visitor->setSearchPath( split '/', $namespace ); - $parent->accept($visitor); - my $child = $visitor->getResult; - my $uid = $child->getUID if $child; - my $match = $self->actions->{private}->{$uid}->{$action} - if $uid; - push @results, [$match] if $match; - } +=cut - else { - my $result = - $self->actions->{private}->{ $parent->getUID }->{$action}; - push @results, [$result] if $result; - } +sub get_action_by_path { + my ( $self, $path ) = @_; + $path =~ s/^\///; + $path = "/$path" unless $path =~ /\//; + $self->_action_hash->{$path}; +} - } - return \@results; - } +=head2 $self->get_actions( $c, $action, $namespace ) - elsif ( my $p = $self->actions->{plain}->{$action} ) { return [ [$p] ] } - elsif ( my $r = $self->actions->{regex}->{$action} ) { return [ [$r] ] } +=cut - else { +sub get_actions { + my ( $self, $c, $action, $namespace ) = @_; + return [] unless $action; - for my $i ( 0 .. $#{ $self->actions->{compiled} } ) { - my $name = $self->actions->{compiled}->[$i]->[0]; - my $regex = $self->actions->{compiled}->[$i]->[1]; + $namespace = join( "/", grep { length } split '/', $namespace || "" ); - if ( my @snippets = ( $action =~ $regex ) ) { - return [ - [ $self->actions->{regex}->{$name}, $name, \@snippets ] ]; - } + my @match = $self->get_containers($namespace); - } - } - return []; + return map { $_->get_action($action) } @match; } -=item $self->set_action( $c, $action, $code, $namespace, $attrs ) +=head2 $self->get_containers( $namespace ) + +Return all the action containers for a given namespace, inclusive =cut -sub set_action { - my ( $self, $c, $method, $code, $namespace, $attrs ) = @_; +sub get_containers { + my ( $self, $namespace ) = @_; + $namespace ||= ''; + $namespace = '' if $namespace eq '/'; - my $prefix = - Catalyst::Utils::class2prefix( $namespace, $c->config->{case_sensitive} ) - || ''; - my %flags; + my @containers; - for my $attr ( @{$attrs} ) { - if ( $attr =~ /^(Local|Relative)$/ ) { $flags{local}++ } - elsif ( $attr =~ /^(Global|Absolute)$/ ) { $flags{global}++ } - elsif ( $attr =~ /^Path\(\s*(.+)\s*\)$/i ) { - push @{ $flags{path} }, $1; - } - elsif ( $attr =~ /^Private$/i ) { $flags{private}++ } - elsif ( $attr =~ /^(Regex|Regexp)\(\s*(.+)\s*\)$/i ) { - push @{ $flags{regex} }, $2; - } + if ( length $namespace ) { + do { + push @containers, $self->_container_hash->{$namespace}; + } while ( $namespace =~ s#/[^/]+$## ); } - if ( $flags{private} && ( keys %flags > 1 ) ) { - $c->log->debug( 'Bad action definition "' - . join( ' ', @{$attrs} ) - . qq/" for "$namespace->$method"/ ) - if $c->debug; - return; - } - return unless keys %flags; + return reverse grep { defined } @containers, $self->_container_hash->{''}; + + #return (split '/', $namespace); # isnt this more clear? + my @parts = split '/', $namespace; +} - my $parent = $self->tree; - my $visitor = Tree::Simple::Visitor::FindByPath->new; +=head2 $self->uri_for_action($action, \@captures) - for my $part ( split '/', $prefix ) { - $visitor->setSearchPath($part); - $parent->accept($visitor); - my $child = $visitor->getResult; +Takes a Catalyst::Action object and action parameters and returns a URI +part such that if $c->req->path were this URI part, this action would be +dispatched to with $c->req->captures set to the supplied arrayref. - unless ($child) { - $child = $parent->addChild( Tree::Simple->new($part) ); - $visitor->setSearchPath($part); - $parent->accept($visitor); - $child = $visitor->getResult; - } +If the action object is not available for external dispatch or the dispatcher +cannot determine an appropriate URI, this method will return undef. - $parent = $child; +=cut + +sub uri_for_action { + my ( $self, $action, $captures) = @_; + $captures ||= []; + foreach my $dispatch_type ( @{ $self->_dispatch_types } ) { + my $uri = $dispatch_type->uri_for_action( $action, $captures ); + return( $uri eq '' ? '/' : $uri ) + if defined($uri); } + return undef; +} - my $reverse = $prefix ? "$prefix/$method" : $method; +=head2 $self->register( $c, $action ) - my $action = Catalyst::Action->new( - { - code => $code, - reverse => $reverse, - namespace => $namespace, - } - ); +Make sure all required dispatch types for this action are loaded, then +pass the action to our dispatch types so they can register it if required. +Also, set up the tree with the action containers. - my $uid = $parent->getUID; - $self->actions->{private}->{$uid}->{$method} = $action; +=cut - my @path; - for my $path ( @{ $flags{path} } ) { - $path =~ s/^\w+//; - $path =~ s/\w+$//; - if ( $path =~ /^\s*'(.*)'\s*$/ ) { $path = $1 } - if ( $path =~ /^\s*"(.*)"\s*$/ ) { $path = $1 } - push @path, $path; - } - $flags{path} = \@path; - - my @regex; - for my $regex ( @{ $flags{regex} } ) { - $regex =~ s/^\w+//; - $regex =~ s/\w+$//; - if ( $regex =~ /^\s*'(.*)'\s*$/ ) { $regex = $1 } - if ( $regex =~ /^\s*"(.*)"\s*$/ ) { $regex = $1 } - push @regex, $regex; - } - $flags{regex} = \@regex; +sub register { + my ( $self, $c, $action ) = @_; - if ( $flags{local} || $flags{global} ) { - push( @{ $flags{path} }, $prefix ? "/$prefix/$method" : "/$method" ) - if $flags{local}; + my $registered = $self->_registered_dispatch_types; - push( @{ $flags{path} }, "/$method" ) if $flags{global}; + #my $priv = 0; #seems to be unused + foreach my $key ( keys %{ $action->attributes } ) { + next if $key eq 'Private'; + my $class = "Catalyst::DispatchType::$key"; + unless ( $registered->{$class} ) { + #some error checking rethrowing here wouldn't hurt. + eval { Class::MOP::load_class($class) }; + push( @{ $self->_dispatch_types }, $class->new ) unless $@; + $registered->{$class} = 1; + } } - for my $path ( @{ $flags{path} } ) { - if ( $path =~ /^\// ) { $path =~ s/^\/// } - else { $path = $prefix ? "$prefix/$path" : $path } - $self->actions->{plain}->{$path} = $action; + # Pass the action to our dispatch types so they can register it if reqd. + foreach my $type ( @{ $self->_dispatch_types } ) { + $type->register( $c, $action ); } - for my $regex ( @{ $flags{regex} } ) { - push @{ $self->actions->{compiled} }, [ $regex, qr#$regex# ]; - $self->actions->{regex}->{$regex} = $action; - } + my $namespace = $action->namespace; + my $name = $action->name; + + my $container = $self->_find_or_create_action_container($namespace); + + # Set the method value + $container->add_action($action); + + $self->_action_hash->{"$namespace/$name"} = $action; + $self->_container_hash->{$namespace} = $container; } -=item $self->setup_actions( $class, $component ) +sub _find_or_create_action_container { + my ( $self, $namespace ) = @_; -=cut + my $tree ||= $self->_tree; -sub setup_actions { - my ( $self, $class ) = @_; - - # These are the core structures - $self->actions( - { - plain => {}, - private => {}, - regex => {}, - compiled => [] - } - ); + return $tree->getNodeValue unless $namespace; - # We use a tree - $self->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) ); + my @namespace = split '/', $namespace; + return $self->_find_or_create_namespace_node( $tree, @namespace ) + ->getNodeValue; +} - for my $comp ( keys %{ $class->components } ) { +sub _find_or_create_namespace_node { + my ( $self, $parent, $part, @namespace ) = @_; - # We only setup components that inherit from Catalyst::Base - next unless $comp->isa('Catalyst::Base'); + return $parent unless $part; - for my $action ( @{ Catalyst::Utils::reflect_actions($comp) } ) { - my ( $code, $attrs ) = @{$action}; - my $name = ''; - no strict 'refs'; - my @cache = ( $comp, @{"$comp\::ISA"} ); - my %namespaces; + my $child = + ( grep { $_->getNodeValue->part eq $part } $parent->getAllChildren )[0]; - while ( my $namespace = shift @cache ) { - $namespaces{$namespace}++; - for my $isa ( @{"$comp\::ISA"} ) { - next if $namespaces{$isa}; - push @cache, $isa; - $namespaces{$isa}++; - } - } + unless ($child) { + my $container = Catalyst::ActionContainer->new($part); + $parent->addChild( $child = Tree::Simple->new($container) ); + } - for my $namespace ( keys %namespaces ) { + $self->_find_or_create_namespace_node( $child, @namespace ); +} - for my $sym ( values %{ $namespace . '::' } ) { +=head2 $self->setup_actions( $class, $context ) - if ( *{$sym}{CODE} && *{$sym}{CODE} == $code ) { - $name = *{$sym}{NAME}; - $class->set_action( $name, $code, $comp, $attrs ); - last; - } +=cut - } +sub setup_actions { + my ( $self, $c ) = @_; - } - } + my @classes = + $self->_load_dispatch_types( @{ $self->preload_dispatch_types } ); + @{ $self->_registered_dispatch_types }{@classes} = (1) x @classes; + foreach my $comp ( values %{ $c->components } ) { + $comp->register_actions($c) if $comp->can('register_actions'); } - return unless $class->debug; + $self->_load_dispatch_types( @{ $self->postload_dispatch_types } ); - my $actions = $self->actions; - my $privates = Text::ASCIITable->new; - $privates->setCols( 'Private', 'Class' ); - $privates->setColWidth( 'Private', 36, 1 ); - $privates->setColWidth( 'Class', 37, 1 ); + return unless $c->debug; + my $privates = Text::SimpleTable->new( + [ 20, 'Private' ], + [ 36, 'Class' ], + [ 12, 'Method' ] + ); + + my $has_private = 0; my $walker = sub { my ( $walker, $parent, $prefix ) = @_; $prefix .= $parent->getNodeValue || ''; $prefix .= '/' unless $prefix =~ /\/$/; - my $uid = $parent->getUID; - - for my $action ( keys %{ $actions->{private}->{$uid} } ) { - my $action_obj = $actions->{private}->{$uid}->{$action}; - $privates->addRow( "$prefix$action", $action_obj->namespace ); + my $node = $parent->getNodeValue->actions; + + for my $action ( keys %{$node} ) { + my $action_obj = $node->{$action}; + next + if ( ( $action =~ /^_.*/ ) + && ( !$c->config->{show_internal_actions} ) ); + $privates->row( "$prefix$action", $action_obj->class, $action ); + $has_private = 1; } $walker->( $walker, $_, $prefix ) for $parent->getAllChildren; }; - $walker->( $walker, $self->tree, '' ); - $class->log->debug( "Loaded private actions:\n" . $privates->draw ) - if ( @{ $privates->{tbl_rows} } ); + $walker->( $walker, $self->_tree, '' ); + $c->log->debug( "Loaded Private actions:\n" . $privates->draw . "\n" ) + if $has_private; + + # List all public actions + $_->list($c) for @{ $self->_dispatch_types }; +} - my $publics = Text::ASCIITable->new; - $publics->setCols( 'Public', 'Private' ); - $publics->setColWidth( 'Public', 36, 1 ); - $publics->setColWidth( 'Private', 37, 1 ); +sub _load_dispatch_types { + my ( $self, @types ) = @_; - for my $plain ( sort keys %{ $actions->{plain} } ) { - my $action = $actions->{plain}->{$plain}; - $publics->addRow( "/$plain", "/$action" ); - } + my @loaded; - $class->log->debug( "Loaded public actions:\n" . $publics->draw ) - if ( @{ $publics->{tbl_rows} } ); + # Preload action types + for my $type (@types) { + my $class = + ( $type =~ /^\+(.*)$/ ) ? $1 : "Catalyst::DispatchType::${type}"; - my $regexes = Text::ASCIITable->new; - $regexes->setCols( 'Regex', 'Private' ); - $regexes->setColWidth( 'Regex', 36, 1 ); - $regexes->setColWidth( 'Private', 37, 1 ); + eval { Class::MOP::load_class($class) }; + Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ ) + if $@; + push @{ $self->_dispatch_types }, $class->new; - for my $regex ( sort keys %{ $actions->{regex} } ) { - my $action = $actions->{regex}->{$regex}; - $regexes->addRow( $regex, "/$action" ); + push @loaded, $class; } - $class->log->debug( "Loaded regex actions:\n" . $regexes->draw ) - if ( @{ $regexes->{tbl_rows} } ); + return @loaded; } -=back +no Moose; +__PACKAGE__->meta->make_immutable; + +=head2 meta + +Provided by Moose =head1 AUTHOR Sebastian Riedel, C +Matt S Trout, C =head1 COPYRIGHT