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=d038d9efd3d1b9a4938c999a4602804052f3a329;hp=94e5290f012a124f59e248f7d115dae0d11fe8f9;hb=28928de92c8bfea34d7e995bc92f1bf5632242d6;hpb=749472d6839708f3c04912c0ed39ce6141d4d500

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 94e5290..d038d9e 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -5,14 +5,29 @@ use base 'Class::Accessor::Fast';
 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;
 
 # Stringify to class
 use overload '""' => sub { return ref shift }, fallback => 1;
 
-__PACKAGE__->mk_accessors(qw/actions tree/);
+__PACKAGE__->mk_accessors(
+    qw/tree dispatch_types registered_dispatch_types
+      method_action_class action_container_class
+      preload_dispatch_types postload_dispatch_types
+      action_hash container_hash
+      /
+);
+
+# Preload these action types
+our @PRELOAD = qw/Index Path Regex/;
+
+# Postload these action types
+our @POSTLOAD = qw/Default/;
 
 =head1 NAME
 
@@ -24,82 +39,81 @@ See L<Catalyst>.
 
 =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 new {
+    my $self  = shift;
+    my $class = ref($self) || $self;
+
+    my $obj = $class->SUPER::new(@_);
+
+    # set the default pre- and and postloads
+    $obj->preload_dispatch_types( \@PRELOAD );
+    $obj->postload_dispatch_types( \@POSTLOAD );
+    $obj->action_hash(    {} );
+    $obj->container_hash( {} );
+
+    # Create the root node of the tree
+    my $container =
+      Catalyst::ActionContainer->new( { part => '/', actions => {} } );
+    $obj->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
+
+    return $obj;
 }
 
-=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<Catalyst::DispatchType::CLASS>
+To use a custom class outside the regular C<Catalyst> 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<Catalyst::DispatchType::CLASS>
+To use a custom class outside the regular C<Catalyst> 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<Catalyst>
+
+=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 ( $c->action ) {
+        $c->forward( join( '/', '', $c->action->namespace, '_DISPATCH' ) );
     }
 
     else {
@@ -112,104 +126,120 @@ sub dispatch {
     }
 }
 
-=item $self->forward( $c, $command [, \@arguments ] )
+=head2 $self->forward( $c, $command [, \@arguments ] )
+
+Documented in L<Catalyst>
 
 =cut
 
 sub forward {
-    my $self    = shift;
-    my $c       = shift;
-    my $command = shift;
+    my ( $self, $c, $command ) = splice( @_, 0, 3 );
 
     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 = [ @{ $c->request->arguments } ];
 
-    my $namespace = '/';
-    my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args;
+    @$args = @{ pop @_ } if ( ref( $_[-1] ) eq 'ARRAY' );
 
-    my $results = [];
+    my $action = $self->_invoke_as_path( $c, $command, $args )
+      || $self->_invoke_as_component( $c, $command, shift );
 
-    if ( $command =~ /^\// ) {
-        if ( $command =~ /^\/(\w+)$/ ) {
-            $results = $c->get_action( $1, $namespace );
-        }
-        else {
-            my $command_copy = $command;
-            my @extra_args;
-          DESCEND: while ( $command_copy =~ s/^\/(.*)\/(\w+)$/\/$1/ ) {
-                my $tail = $2;
-                if ( $results = $c->get_action( $tail, $1 ) ) {
-                    $command   = $tail;
-                    $namespace = $command_copy;
-                    push( @{$arguments}, @extra_args );
-                    last DESCEND;
-                }
-                unshift( @extra_args, $tail );
-            }
-        }
-        $command =~ s/^\///;
+    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 {
-        $namespace =
-          Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} )
-          || '/';
-        $results = $c->get_action( $command, $namespace );
+    #push @$args, @_;
+
+    local $c->request->{arguments} = $args;
+    $action->execute($c);
+
+    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] ];
-        }
+    return if ref $rel_path;    # it must be a string
+
+    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;
+    $method ||= "process";
+
+    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
 
@@ -219,347 +249,252 @@ sub prepare_action {
     my @path = split /\//, $c->req->path;
     $c->req->args( \my @args );
 
-    while (@path) {
+    unshift( @path, '' );    # Root action
+
+  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;
     }
 
+    $c->log->debug( 'Path is "' . $c->req->match . '"' )
+      if ( $c->debug && $c->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;
-
-          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;
-                }
-            }
+    my ( $self, $name, $namespace ) = @_;
+    return unless $name;
 
-        }
+    $namespace = join( "/", grep { length } split '/', $namespace || "" );
 
-        else {
+    return $self->action_hash->{"$namespace/$name"};
+}
 
-            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;
-            }
+=head2 $self->get_action_by_path( $path );
 
-            else {
-                my $result =
-                  $self->actions->{private}->{ $parent->getUID }->{$action};
-                push @results, [$result] if $result;
-            }
+returns the named action by it's full path.
 
-        }
-        return \@results;
-    }
+=cut
 
-    elsif ( my $p = $self->actions->{plain}->{$action} ) { return [ [$p] ] }
-    elsif ( my $r = $self->actions->{regex}->{$action} ) { return [ [$r] ] }
+sub get_action_by_path {
+    my ( $self, $path ) = @_;
+    $path = "/$path" unless $path =~ /\//;
+    $self->action_hash->{$path};
+}
 
-    else {
+=head2 $self->get_actions( $c, $action, $namespace )
 
-        for my $i ( 0 .. $#{ $self->actions->{compiled} } ) {
-            my $name  = $self->actions->{compiled}->[$i]->[0];
-            my $regex = $self->actions->{compiled}->[$i]->[1];
+=cut
 
-            if ( my @snippets = ( $action =~ $regex ) ) {
-                return [
-                    [ $self->actions->{regex}->{$name}, $name, \@snippets ] ];
-            }
+sub get_actions {
+    my ( $self, $c, $action, $namespace ) = @_;
+    return [] unless $action;
 
-        }
-    }
-    return [];
+    $namespace = join( "/", grep { length } split '/', $namespace || "" );
+
+    my @match = $self->get_containers($namespace);
+
+    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;
-        }
-    }
+    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->{''};
 
-    my $parent  = $self->tree;
-    my $visitor = Tree::Simple::Visitor::FindByPath->new;
+    my @parts = split '/', $namespace;
+}
 
-    for my $part ( split '/', $prefix ) {
-        $visitor->setSearchPath($part);
-        $parent->accept($visitor);
-        my $child = $visitor->getResult;
+=head2 $self->register( $c, $action )
 
-        unless ($child) {
-            $child = $parent->addChild( Tree::Simple->new($part) );
-            $visitor->setSearchPath($part);
-            $parent->accept($visitor);
-            $child = $visitor->getResult;
-        }
-
-        $parent = $child;
-    }
+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 $reverse = $prefix ? "$prefix/$method" : $method;
+=cut
 
-    my $action = Catalyst::Action->new(
-        {
-            code      => $code,
-            reverse   => $reverse,
-            namespace => $namespace,
-        }
-    );
+sub register {
+    my ( $self, $c, $action ) = @_;
 
-    my $uid = $parent->getUID;
-    $self->actions->{private}->{$uid}->{$method} = $action;
+    my $registered = $self->registered_dispatch_types;
 
-    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;
+    my $priv = 0;
+    foreach my $key ( keys %{ $action->attributes } ) {
+        $priv++ if $key eq 'Private';
+        my $class = "Catalyst::DispatchType::$key";
+        unless ( $registered->{$class} ) {
+            eval "require $class";
+            push( @{ $self->dispatch_types }, $class->new ) unless $@;
+            $registered->{$class} = 1;
+        }
     }
-    $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;
+
+    # Pass the action to our dispatch types so they can register it if reqd.
+    my $reg = 0;
+    foreach my $type ( @{ $self->dispatch_types } ) {
+        $reg++ if $type->register( $c, $action );
     }
-    $flags{regex} = \@regex;
 
-    if ( $flags{local} || $flags{global} ) {
-        push( @{ $flags{path} }, $prefix ? "/$prefix/$method" : "/$method" )
-          if $flags{local};
+    return unless $reg + $priv;
 
-        push( @{ $flags{path} }, "/$method" ) if $flags{global};
-    }
+    my $namespace = $action->namespace;
+    my $name      = $action->name;
 
-    for my $path ( @{ $flags{path} } ) {
-        if ( $path =~ /^\// ) { $path =~ s/^\/// }
-        else { $path = $prefix ? "$prefix/$path" : $path }
-        $self->actions->{plain}->{$path} = $action;
-    }
+    my $container = $self->find_or_create_action_container($namespace);
 
-    for my $regex ( @{ $flags{regex} } ) {
-        push @{ $self->actions->{compiled} }, [ $regex, qr#$regex# ];
-        $self->actions->{regex}->{$regex} = $action;
-    }
+    # 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 ) = @_;
 
-            }
+    $self->dispatch_types( [] );
+    $self->registered_dispatch_types( {} );
+    $self->method_action_class('Catalyst::Action');
+    $self->action_container_class('Catalyst::ActionContainer');
 
-        }
+    my @classes =
+      $self->do_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->do_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' ],
+        [ 38, '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} } );
+    $c->log->debug( "Loaded Private actions:\n" . $privates->draw )
+      if ($has_private);
 
-    my $publics = Text::ASCIITable->new;
-    $publics->setCols( 'Public', 'Private' );
-    $publics->setColWidth( 'Public',  36, 1 );
-    $publics->setColWidth( 'Private', 37, 1 );
+    # List all public actions
+    $_->list($c) for @{ $self->dispatch_types };
+}
 
-    for my $plain ( sort keys %{ $actions->{plain} } ) {
-        my $action = $actions->{plain}->{$plain};
-        $publics->addRow( "/$plain", "/$action" );
-    }
+sub do_load_dispatch_types {
+    my ( $self, @types ) = @_;
 
-    $class->log->debug( "Loaded public actions:\n" . $publics->draw )
-      if ( @{ $publics->{tbl_rows} } );
+    my @loaded;
 
-    my $regexes = Text::ASCIITable->new;
-    $regexes->setCols( 'Regex', 'Private' );
-    $regexes->setColWidth( 'Regex',   36, 1 );
-    $regexes->setColWidth( 'Private', 37, 1 );
+    # Preload action types
+    for my $type (@types) {
+        my $class =
+          ( $type =~ /^\+(.*)$/ ) ? $1 : "Catalyst::DispatchType::${type}";
+        eval "require $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
-
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
 
 =head1 COPYRIGHT