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=1dca5c91c7721684476005104b475c6869a18dfe;hp=067183859140918d8f0eb57f2b4d2f7477cb59aa;hb=d0cacee71a316290bc01f0e12681c16bdc1e84e2;hpb=d030cb977237ba7fa728eb00ab9c679388af3281 diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm index 0671838..1dca5c9 100644 --- a/lib/Catalyst/Base.pm +++ b/lib/Catalyst/Base.pm @@ -1,271 +1,41 @@ package Catalyst::Base; +use Moose; +BEGIN { extends 'Catalyst::Controller' } -use strict; -use base qw/Catalyst::Component Catalyst::AttrContainer Class::Accessor::Fast/; - -use Catalyst::Exception; -use Catalyst::Utils; -use Class::Inspector; -use NEXT; - -__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 ) = @_; - - foreach my $disp ( @{ $self->_dispatch_steps } ) { - last unless $c->forward($disp); - } - - $c->forward('_END'); -} - -sub _BEGIN : Private { - my ( $self, $c ) = @_; - my $begin = ( $c->get_actions( 'begin', $c->namespace ) )[-1]; - return 1 unless $begin; - $begin->dispatch( $c ); - return !@{ $c->error }; -} +after 'BUILD' => sub { + my $self = shift; + warn(ref($self) . " is using the deprecated Catalyst::Base, update your application as this will be removed in the next major release"); +}; -sub _AUTO : Private { - my ( $self, $c ) = @_; - my @auto = $c->get_actions( 'auto', $c->namespace ); - foreach my $auto (@auto) { - $auto->dispatch( $c ); - return 0 unless $c->state; - } - return 1; -} +no Moose; -sub _ACTION : Private { - my ( $self, $c ) = @_; - if ( ref $c->action - && $c->action->can('execute') - && $c->req->action ) - { - $c->action->dispatch( $c ); - } - return !@{ $c->error }; -} +1; -sub _END : Private { - my ( $self, $c ) = @_; - my $end = ( $c->get_actions( 'end', $c->namespace ) )[-1]; - return 1 unless $end; - $end->dispatch( $c ); - return !@{ $c->error }; -} +__END__ =head1 NAME -Catalyst::Base - Catalyst Base Class - -=head1 SYNOPSIS - -See L +Catalyst::Base - Deprecated base class =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 $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 %methods; - $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'); - } - } +This used to be the base class for Catalyst Controllers. It +remains here for compatibility reasons, but its use is highly deprecated. - foreach my $cache (@action_cache) { - my $code = $cache->[0]; - my $method = $methods{$code}; - next unless $method; - my $attrs = $self->_parse_attrs( $c, $method, @{ $cache->[1] } ); - if ( $attrs->{Private} && ( keys %$attrs > 1 ) ) { - $c->log->debug( 'Bad action definition "' - . join( ' ', @{ $cache->[1] } ) - . qq/" for "$class->$method"/ ) - if $c->debug; - next; - } - my $reverse = $namespace ? "$namespace/$method" : $method; - my $action = $self->create_action( - name => $method, - code => $code, - reverse => $reverse, - namespace => $namespace, - class => $class, - attributes => $attrs, - ); - - $c->dispatcher->register( $c, $action ); - } -} - -sub create_action { - my $self = shift; - my %args = @_; - - my $class = (exists $args{attributes}{ActionClass} - ? $args{attributes}{ActionClass}[0] - : $self->_action_class); - - unless ( Class::Inspector->loaded($class) ) { - require Class::Inspector->filename($class); - } - - return $class->new( \%args ); -} - -sub _parse_attrs { - my ( $self, $c, $name, @attrs ) = @_; - - my %raw_attributes; - - foreach my $attr (@attrs) { - - # Parse out :Foo(bar) into Foo => bar etc (and arrayify) - - if ( my ( $key, $value ) = ( $attr =~ /^(.*?)(?:\(\s*(.+?)\s*\))?$/ ) ) - { - - if ( defined $value ) { - ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ ); - } - push( @{ $raw_attributes{$key} }, $value ); - } - } - - my %final_attributes; - - foreach my $key (keys %raw_attributes) { - - foreach my $value (@{$raw_attributes{$key}}) { - - my $meth = "_parse_${key}_attr"; - if ( $self->can($meth) ) { - ( $key, $value ) = $self->$meth( $c, $name, $value ); - } - push( @{ $final_attributes{$key} }, $value ); - } - } - - return \%final_attributes; -} - -sub _parse_Global_attr { - my ( $self, $c, $name, $value ) = @_; - return $self->_parse_Path_attr( $c, $name, "/$name" ); -} - -sub _parse_Absolute_attr { shift->_parse_Global_attr(@_); } - -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(@_); } - -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 ); -} - -sub _parse_Regexp_attr { shift->_parse_Regex_attr(@_); } - -sub _parse_LocalRegex_attr { - my ( $self, $c, $name, $value ) = @_; - unless ( $value =~ s/^\^// ) { $value = "(?:.*?)$value"; } - return ( 'Regex', '^' . $self->path_prefix($c) . "/${value}" ); -} - -sub _parse_LocalRegexp_attr { shift->_parse_LocalRegex_attr(@_); } - -sub _parse_ActionClass_attr { - my ( $self, $c, $name, $value ) = @_; - unless ( $value =~ s/^\+// ) { - $value = join('::', $self->_action_class, $value ); - } - return ( 'ActionClass', $value ); -} +If your application produces a warning, then please update your application to +inherit from L instead. =head1 SEE ALSO L, L. -=head1 AUTHOR +=head1 AUTHORS -Sebastian Riedel, C -Marcus Ramberg, C -Matt S Trout, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT -This program is free software, you can redistribute it and/or modify it under +This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut - -1;