X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=4bd1a43e37cee4b668c0a9c35b8ca972e700ff43;hb=a268a0112398ac10d8fabd86ed28a183cbe4398e;hp=01f4bedf1ed9a5a245f6c7a4dbd80acf2e00d4c2;hpb=99fe1710ff4af72d62979c1b64092c0777660a4d;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index 01f4bed..4bd1a43 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -2,26 +2,16 @@ package Catalyst::Dispatcher; use strict; use base 'Class::Data::Inheritable'; -use Memoize; +use Catalyst::Utils; use Text::ASCIITable; use Tree::Simple; 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 ) ); - -memoize('_class2prefix'); - =head1 NAME -Catalyst::Dispatch - The Catalyst Dispatcher +Catalyst::Dispatcher - The Catalyst Dispatcher =head1 SYNOPSIS @@ -48,42 +38,44 @@ sub dispatch { unless ($namespace) { if ( my $result = $c->get_action($action) ) { - $namespace = _class2prefix( $result->[0]->[0]->[0] ); + $namespace = + Catalyst::Utils::class2prefix( $result->[0]->[0]->[0] ); } } 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 = 0; - for my $auto ( @{ $c->get_action( 'auto', $namespace ) } ) { + 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; - $auto++; } # Execute the action or last default - my $mkay = $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] ) { + 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 }; } @@ -128,18 +120,28 @@ sub forward { $namespace = $1 || '/'; $command = $2 || $command; $command =~ s/^\///; - warn "NAMESPACE: $namespace COMMAND: $command"; } - else { $namespace = _class2prefix($caller) || '/' } + else { $namespace = Catalyst::Utils::class2prefix($caller) || '/' } my $results = $c->get_action( $command, $namespace ); unless ( @{$results} ) { my $class = $command || ''; + my $path = $class . '.pm'; + $path =~ s/::/\//g; + + unless ( $INC{$path} ) { + my $error = + qq/Couldn't forward to "$class". Invalid or not loaded./; + $c->error($error); + $c->log->debug($error) if $c->debug; + return 0; + } - if ( $class =~ /[^\w\:]/ ) { - my $error = qq/Couldn't forward to "$class"/; + unless ( UNIVERSAL::isa( $class, 'Catalyst::Base' ) ) { + my $error = + qq/Can't forward to "$class". Class is not a Catalyst component./; $c->error($error); $c->log->debug($error) if $c->debug; return 0; @@ -153,7 +155,8 @@ sub forward { } else { - my $error = qq/Couldn't forward to "$class"/; + my $error = + qq/Couldn't forward to "$class". Does not implement "$method"/; $c->error($error); $c->log->debug($error) if $c->debug; @@ -171,24 +174,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; @@ -237,13 +240,7 @@ sub get_action { my $name = $c->actions->{compiled}->[$i]->[0]; my $regex = $c->actions->{compiled}->[$i]->[1]; - if ( $action =~ $regex ) { - my @snippets; - for my $i ( 1 .. 9 ) { - no strict 'refs'; - last unless ${$i}; - push @snippets, ${$i}; - } + if ( my @snippets = ( $action =~ $regex ) ) { return [ [ $c->actions->{regex}->{$name}, $name, \@snippets ] ]; } @@ -261,15 +258,17 @@ Set an action in a given namespace. sub set_action { my ( $c, $method, $code, $namespace, $attrs ) = @_; - my $prefix = _class2prefix($namespace) || ''; + my $prefix = Catalyst::Utils::class2prefix($namespace) || ''; 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 ) ) { @@ -348,12 +347,28 @@ 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 ( @{ $comp->_cache } ) { + for my $action ( @{ Catalyst::Utils::reflect_actions($comp) } ) { my ( $code, $attrs ) = @{$action}; my $name = ''; no strict 'refs'; @@ -387,6 +402,8 @@ sub setup_actions { } } + + return unless $self->debug; my $actions = $self->actions; my $privates = Text::ASCIITable->new; @@ -410,7 +427,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' ); @@ -425,7 +442,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' ); @@ -440,24 +457,7 @@ sub setup_actions { } $self->log->debug( 'Loaded regex actions', $regexes->draw ) - if ( @{ $regexes->{tbl_rows} } && $self->debug ); -} - -sub _prefix { - my ( $class, $name ) = @_; - my $prefix = _class2prefix($class); - $name = "$prefix/$name" if $prefix; - return $name; -} - -sub _class2prefix { - my $class = shift || ''; - my $prefix; - if ( $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/ ) { - $prefix = lc $2; - $prefix =~ s/\:\:/\//g; - } - return $prefix; + if ( @{ $regexes->{tbl_rows} } ); } =back