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 ) = @_;
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 };
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;
sub _ACTION : Private {
my ( $self, $c ) = @_;
- $c->action->execute($c);
+ if ( ref $c->action
+ && $c->action->isa('Catalyst::Action')
+ && $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<Catalyst>
+
+=head1 DESCRIPTION
+
+Catalyst Base Class
+
+=head1 METHODS
+
+=head2 $self->action_namespace($c)
+
+=cut
+
sub action_namespace {
my ( $self, $c ) = @_;
- return
- Catalyst::Utils::class2prefix(
- ref $self, $c->config->{case_sensitive} ) || '';
+ return Catalyst::Utils::class2prefix( ref $self,
+ $c->config->{case_sensitive} )
+ || '';
}
+=head2 $self->register_actions($c)
+
+=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( @{ $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,
attributes => $attrs,
}
);
- $c->dispatcher->register($c, $action);
+ $c->dispatcher->register( $c, $action );
}
}
# 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/ );
return \%attributes;
}
-
-=head1 NAME
-
-Catalyst::Base - Catalyst Controller Base Class
-
-=head1 SYNOPSIS
-
-
-=head1 DESCRIPTION
-
-
-=head1 METHODS
-
-=over 4
-
-=back
-
=head1 SEE ALSO
-L<Catalyst>.
+L<Catalyst>, L<Catalyst::Controller>.
=head1 AUTHOR