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=ffb20e9587f483d46801da89d5c929947a292e1c;hp=e8e37972d2ef1660b79116d9d4f576b70841bef2;hb=a2f2cde95194a17fe2401ae58c92b5494bac599f;hpb=0299ba2263bf6d87703fcb5b5ee5377d7a985d87

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index e8e3797..ffb20e9 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -2,6 +2,7 @@ package Catalyst::Dispatcher;
 
 use strict;
 use base 'Class::Data::Inheritable';
+use Catalyst::Exception;
 use Catalyst::Utils;
 use Text::ASCIITable;
 use Tree::Simple;
@@ -9,14 +10,6 @@ use Tree::Simple::Visitor::FindByPath;
 
 __PACKAGE__->mk_classdata($_) for qw/actions tree/;
 
-# These are the core structures
-__PACKAGE__->actions(
-    { plain => {}, private => {}, regex => {}, compiled => [], reverse => {} }
-);
-
-# We use a tree
-__PACKAGE__->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
-
 =head1 NAME
 
 Catalyst::Dispatcher - The Catalyst Dispatcher
@@ -31,6 +24,18 @@ See L<Catalyst>.
 
 =over 4
 
+=item $c->detach($command)
+
+Like C<forward> but doesn't return.
+
+=cut
+
+sub detach {
+    my ( $c, $command ) = @_;
+    $c->forward($command) if $command;
+    die $Catalyst::Engine::DETACH;
+}
+
 =item $c->dispatch
 
 Dispatch request to actions.
@@ -46,8 +51,8 @@ sub dispatch {
 
     unless ($namespace) {
         if ( my $result = $c->get_action($action) ) {
-            $namespace =
-              Catalyst::Utils::class2prefix( $result->[0]->[0]->[0] );
+            $namespace = Catalyst::Utils::class2prefix( $result->[0]->[0]->[0],
+                $c->config->{case_sensitive} );
         }
     }
 
@@ -65,15 +70,16 @@ sub dispatch {
         }
 
         # Execute the auto chain
-        my $auto;
-        for $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) {
+        my $autorun = 0;
+        for my $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) {
+            $autorun++;
             $c->execute( @{ $auto->[0] } );
             return if scalar @{ $c->error };
             last unless $c->state;
         }
 
         # Execute the action or last default
-        my $mkay = defined $auto ? $c->state ? 1 : 0 : 1;
+        my $mkay = $autorun ? $c->state ? 1 : 0 : 1;
         if ( ( my $action = $c->req->action ) && $mkay ) {
             if ( my $result = @{ $c->get_action( $action, $default, 1 ) }[-1] )
             {
@@ -129,7 +135,11 @@ sub forward {
         $command =~ s/^\///;
     }
 
-    else { $namespace = Catalyst::Utils::class2prefix($caller) || '/' }
+    else {
+        $namespace =
+          Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} )
+          || '/';
+    }
 
     my $results = $c->get_action( $command, $namespace );
 
@@ -265,7 +275,9 @@ Set an action in a given namespace.
 sub set_action {
     my ( $c, $method, $code, $namespace, $attrs ) = @_;
 
-    my $prefix = Catalyst::Utils::class2prefix($namespace) || '';
+    my $prefix =
+      Catalyst::Utils::class2prefix( $namespace, $c->config->{case_sensitive} )
+      || '';
     my %flags;
 
     for my $attr ( @{$attrs} ) {
@@ -354,10 +366,26 @@ Setup actions for a component.
 =cut
 
 sub setup_actions {
-    my ( $self, $comps ) = @_;
+    my $self = shift;
+
+    # These are the core structures
+    $self->actions(
+        {
+            plain    => {},
+            private  => {},
+            regex    => {},
+            compiled => [],
+            reverse  => {}
+        }
+    );
 
-    for my $comp (@$comps) {
-        $comp = ref $comp || $comp;
+    # We use a tree
+    $self->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
+
+    for my $comp ( keys %{ $self->components } ) {
+
+        # We only setup components that inherit from Catalyst::Base
+        next unless $comp->isa('Catalyst::Base');
 
         for my $action ( @{ Catalyst::Utils::reflect_actions($comp) } ) {
             my ( $code, $attrs ) = @{$action};
@@ -394,6 +422,8 @@ sub setup_actions {
 
     }
 
+    return unless $self->debug;
+
     my $actions  = $self->actions;
     my $privates = Text::ASCIITable->new;
     $privates->setCols( 'Private', 'Class' );
@@ -416,7 +446,7 @@ sub setup_actions {
 
     $walker->( $walker, $self->tree, '' );
     $self->log->debug( 'Loaded private actions', $privates->draw )
-      if ( @{ $privates->{tbl_rows} } && $self->debug );
+      if ( @{ $privates->{tbl_rows} } );
 
     my $publics = Text::ASCIITable->new;
     $publics->setCols( 'Public', 'Private' );
@@ -431,7 +461,7 @@ sub setup_actions {
     }
 
     $self->log->debug( 'Loaded public actions', $publics->draw )
-      if ( @{ $publics->{tbl_rows} } && $self->debug );
+      if ( @{ $publics->{tbl_rows} } );
 
     my $regexes = Text::ASCIITable->new;
     $regexes->setCols( 'Regex', 'Private' );
@@ -446,7 +476,7 @@ sub setup_actions {
     }
 
     $self->log->debug( 'Loaded regex actions', $regexes->draw )
-      if ( @{ $regexes->{tbl_rows} } && $self->debug );
+      if ( @{ $regexes->{tbl_rows} } );
 }
 
 =back