X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=18e6f6e2d02ee2bc0a49b7086e94d2ec57a4d7a3;hp=f667feae78ff1036921744167e9424af625888ce;hb=649fd1fa74ee22fb2f5220dbdcb25d02427034b2;hpb=158c88c0db581dcee202cd854c77186590c2992c diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm index f667fea..18e6f6e 100644 --- a/lib/Catalyst/Base.pm +++ b/lib/Catalyst/Base.pm @@ -8,9 +8,10 @@ use Catalyst::Utils; use Class::Inspector; use NEXT; -__PACKAGE__->mk_classdata($_) for qw/_dispatch_steps/; +__PACKAGE__->mk_classdata($_) for qw/_dispatch_steps _action_class/; __PACKAGE__->_dispatch_steps( [qw/_BEGIN _AUTO _ACTION/] ); +__PACKAGE__->_action_class('Catalyst::Action'); sub _DISPATCH : Private { my ( $self, $c ) = @_; @@ -24,7 +25,7 @@ sub _DISPATCH : Private { sub _BEGIN : Private { my ( $self, $c ) = @_; - my $begin = ($c->get_actions( 'begin', $c->namespace))[-1]; + my $begin = ( $c->get_actions( 'begin', $c->namespace ) )[-1]; return 1 unless $begin; $begin->execute($c); return !@{ $c->error }; @@ -32,7 +33,7 @@ sub _BEGIN : Private { sub _AUTO : Private { my ( $self, $c ) = @_; - my @auto = $c->get_actions('auto', $c->namespace); + my @auto = $c->get_actions( 'auto', $c->namespace ); foreach my $auto (@auto) { $auto->execute($c); return 0 unless $c->state; @@ -42,45 +43,100 @@ sub _AUTO : Private { sub _ACTION : Private { my ( $self, $c ) = @_; - $c->action->execute($c); + if ( ref $c->action + && $c->action->can('execute') + && $c->req->action ) + { + $c->action->execute($c); + } return !@{ $c->error }; } sub _END : Private { my ( $self, $c ) = @_; - my $end = ($c->get_actions( 'end', $c->namespace))[-1]; + my $end = ( $c->get_actions( 'end', $c->namespace ) )[-1]; return 1 unless $end; $end->execute($c); return !@{ $c->error }; } +=head1 NAME + +Catalyst::Base - Catalyst Base Class + +=head1 SYNOPSIS + +See L + +=head1 DESCRIPTION + +Catalyst Base Class + +This is the base class for all Catalyst components. It also handles +dispatch of actions for controllers. + +=head1 METHODS + +=head2 $self->action_namespace($c) + +Determine the namespace for actions in this component. + +=cut + sub action_namespace { my ( $self, $c ) = @_; - return - Catalyst::Utils::class2prefix( - ref $self, $c->config->{case_sensitive} ) || ''; + return $self->config->{namespace} if exists $self->config->{namespace}; + return Catalyst::Utils::class2prefix( ref($self) || $self, + $c->config->{case_sensitive} ) + || ''; } +=head2 $self->path_prefix($c) + +alias for action_namespace + +=cut + +sub path_prefix { shift->action_namespace(@_); } + +=head2 $self->register_actions($c) + +register all actions for this component based on a given context. + +=cut + sub register_actions { my ( $self, $c ) = @_; my $class = ref $self || $self; - my $namespace = $self->action_namespace( $c ); + my $namespace = $self->action_namespace($c); my %methods; - $methods{$self->can($_)} = $_ for @{Class::Inspector->methods($class)||[]}; - foreach my $cache (@{$self->_action_cache}) { - my $code = $cache->[0]; + $methods{ $self->can($_) } = $_ + for @{ Class::Inspector->methods($class) || [] }; + + # Advanced inheritance support for plugins and the like + my @action_cache; + { + no strict 'refs'; + for my $isa ( @{"$class\::ISA"}, $class ) { + push @action_cache, @{ $isa->_action_cache } + if $isa->can('_action_cache'); + } + } + + foreach my $cache (@action_cache) { + my $code = $cache->[0]; my $method = $methods{$code}; next unless $method; - my $attrs = $self->_parse_attrs(@{$cache->[1]}); - if ($attrs->{Private} && ( keys %$attrs > 1 ) ) { + my $attrs = $self->_parse_attrs( $c, $method, @{ $cache->[1] } ); + if ( $attrs->{Private} && ( keys %$attrs > 1 ) ) { $c->log->debug( 'Bad action definition "' - . join( ' ', @{$cache->[1]} ) + . join( ' ', @{ $cache->[1] } ) . qq/" for "$class->$method"/ ) if $c->debug; next; } my $reverse = $namespace ? "$namespace/$method" : $method; - my $action = Catalyst::Action->new( + my $action = $self->_action_class->new( { name => $method, code => $code, @@ -90,48 +146,79 @@ sub register_actions { attributes => $attrs, } ); - $c->dispatcher->register($c, $action); + $c->dispatcher->register( $c, $action ); } } sub _parse_attrs { - my ( $self, @attrs ) = @_; + my ( $self, $c, $name, @attrs ) = @_; my %attributes; foreach my $attr (@attrs) { # Parse out :Foo(bar) into Foo => bar etc (and arrayify) - if ( my ( $key, $value ) = ( $attr =~ /^(.*?)(?:\(\s*(.+)\s*\))?$/ ) ) { + if ( my ( $key, $value ) = ( $attr =~ /^(.*?)(?:\(\s*(.+?)\s*\))?$/ ) ) + { if ( defined $value ) { ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ ); } + my $meth = "_parse_${key}_attr"; + if ( $self->can($meth) ) { + ( $key, $value ) = $self->$meth( $c, $name, $value ); + } push( @{ $attributes{$key} }, $value ); } } return \%attributes; } +sub _parse_Global_attr { + my ( $self, $c, $name, $value ) = @_; + return $self->_parse_Path_attr( $c, $name, "/$name" ); +} -=head1 NAME - -Catalyst::Base - Catalyst Controller Base Class +sub _parse_Absolute_attr { shift->_parse_Global_attr(@_); } -=head1 SYNOPSIS +sub _parse_Local_attr { + my ( $self, $c, $name, $value ) = @_; + return $self->_parse_Path_attr( $c, $name, $name ); +} +sub _parse_Relative_attr { shift->_parse_Local_attr(@_); } -=head1 DESCRIPTION +sub _parse_Path_attr { + my ( $self, $c, $name, $value ) = @_; + $value ||= ''; + if ( $value =~ m!^/! ) { + return ( 'Path', $value ); + } + elsif ( length $value ) { + return ( 'Path', join( '/', $self->path_prefix($c), $value ) ); + } + else { + return ( 'Path', $self->path_prefix($c) ); + } +} +sub _parse_Regex_attr { + my ( $self, $c, $name, $value ) = @_; + return ( 'Regex', $value ); +} -=head1 METHODS +sub _parse_Regexp_attr { shift->_parse_Regex_attr(@_); } -=over 4 +sub _parse_LocalRegex_attr { + my ( $self, $c, $name, $value ) = @_; + unless ( $value =~ s/^\^// ) { $value = "(?:.*?)$value"; } + return ( 'Regex', '^' . $self->path_prefix($c) . "/${value}" ); +} -=back +sub _parse_LocalRegexp_attr { shift->_parse_LocalRegex_attr(@_); } =head1 SEE ALSO -L. +L, L. =head1 AUTHOR