X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=cb916a07b0e9e608b9ceb4cf130d8601e6caaee3;hb=12e2816523c154b30f6bca1096502dd8a3544e8e;hp=91e39a5845e4059f0bc9681ce913c67ece1156a6;hpb=3e93ee3b67452c2c7f1af70be3a91e2784320576;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 91e39a5..cb916a0 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -9,14 +9,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
@@ -52,21 +44,21 @@ sub dispatch {
     }
 
     my $default = $action eq 'default' ? $namespace : undef;
-    my $results = $c->get_action( $action, $default );
+    my $results = $c->get_action( $action, $default, $default ? 1 : 0 );
     $namespace ||= '/';
 
     if ( @{$results} ) {
 
         # Execute last begin
         $c->state(1);
-        if ( my $begin = @{ $c->get_action( 'begin', $namespace ) }[-1] ) {
+        if ( my $begin = @{ $c->get_action( 'begin', $namespace, 1 ) }[-1] ) {
             $c->execute( @{ $begin->[0] } );
             return if scalar @{ $c->error };
         }
 
         # Execute the auto chain
         my $auto;
-        for $auto ( @{ $c->get_action( 'auto', $namespace ) } ) {
+        for $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) {
             $c->execute( @{ $auto->[0] } );
             return if scalar @{ $c->error };
             last unless $c->state;
@@ -75,13 +67,14 @@ sub dispatch {
         # Execute the action or last default
         my $mkay = defined $auto ? $c->state ? 1 : 0 : 1;
         if ( ( my $action = $c->req->action ) && $mkay ) {
-            if ( my $result = @{ $c->get_action( $action, $default ) }[-1] ) {
+            if ( my $result = @{ $c->get_action( $action, $default, 1 ) }[-1] )
+            {
                 $c->execute( @{ $result->[0] } );
             }
         }
 
         # Execute last end
-        if ( my $end = @{ $c->get_action( 'end', $namespace ) }[-1] ) {
+        if ( my $end = @{ $c->get_action( 'end', $namespace, 1 ) }[-1] ) {
             $c->execute( @{ $end->[0] } );
             return if scalar @{ $c->error };
         }
@@ -180,24 +173,24 @@ sub forward {
     return $c->state;
 }
 
-=item $c->get_action( $action, $namespace )
+=item $c->get_action( $action, $namespace, $inherit )
 
 Get an action in a given namespace.
 
 =cut
 
 sub get_action {
-    my ( $c, $action, $namespace ) = @_;
+    my ( $c, $action, $namespace, $inherit ) = @_;
     return [] unless $action;
     $namespace ||= '';
+    $inherit   ||= 0;
 
     if ($namespace) {
         $namespace = '' if $namespace eq '/';
         my $parent = $c->tree;
         my @results;
-        my %allowed = ( begin => 1, auto => 1, default => 1, end => 1 );
 
-        if ( $allowed{$action} ) {
+        if ($inherit) {
             my $result = $c->actions->{private}->{ $parent->getUID }->{$action};
             push @results, [$result] if $result;
             my $visitor = Tree::Simple::Visitor::FindByPath->new;
@@ -268,11 +261,13 @@ sub set_action {
     my %flags;
 
     for my $attr ( @{$attrs} ) {
-        if    ( $attr =~ /^(Local|Relative)$/ )        { $flags{local}++ }
-        elsif ( $attr =~ /^(Global|Absolute)$/ )       { $flags{global}++ }
-        elsif ( $attr =~ /^Path\((.+)\)$/i )           { $flags{path} = $1 }
-        elsif ( $attr =~ /^Private$/i )                { $flags{private}++ }
-        elsif ( $attr =~ /^(Regex|Regexp)\((.+)\)$/i ) { $flags{regex} = $2 }
+        if    ( $attr =~ /^(Local|Relative)$/ )    { $flags{local}++ }
+        elsif ( $attr =~ /^(Global|Absolute)$/ )   { $flags{global}++ }
+        elsif ( $attr =~ /^Path\(\s*(.+)\s*\)$/i ) { $flags{path} = $1 }
+        elsif ( $attr =~ /^Private$/i )            { $flags{private}++ }
+        elsif ( $attr =~ /^(Regex|Regexp)\(\s*(.+)\s*\)$/i ) {
+            $flags{regex} = $2;
+        }
     }
 
     if ( $flags{private} && ( keys %flags > 1 ) ) {
@@ -353,6 +348,20 @@ Setup actions for a component.
 sub setup_actions {
     my ( $self, $comps ) = @_;
 
+    # These are the core structures
+    $self->actions(
+        {
+            plain    => {},
+            private  => {},
+            regex    => {},
+            compiled => [],
+            reverse  => {}
+        }
+    );
+
+    # We use a tree
+    $self->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
+
     for my $comp (@$comps) {
         $comp = ref $comp || $comp;