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=f667feae78ff1036921744167e9424af625888ce;hb=d0cacee71a316290bc01f0e12681c16bdc1e84e2;hpb=158c88c0db581dcee202cd854c77186590c2992c

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index f667fea..1dca5c9 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,149 +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/;
-
-__PACKAGE__->_dispatch_steps( [qw/_BEGIN _AUTO _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->execute($c);
-    return !@{ $c->error };
-}
-
-sub _AUTO : Private {
-    my ( $self, $c ) = @_;
-    my @auto = $c->get_actions('auto', $c->namespace);
-    foreach my $auto (@auto) {
-        $auto->execute($c);
-        return 0 unless $c->state;
-    }
-    return 1;
-}
-
-sub _ACTION : Private {
-    my ( $self, $c ) = @_;
-    $c->action->execute($c);
-    return !@{ $c->error };
-}
-
-sub _END : Private {
-    my ( $self, $c ) = @_;
-    my $end = ($c->get_actions( 'end', $c->namespace))[-1];
-    return 1 unless $end;
-    $end->execute($c);
-    return !@{ $c->error };
-}
-
-sub action_namespace {
-    my ( $self, $c ) = @_;
-    return
-        Catalyst::Utils::class2prefix(
-            ref $self, $c->config->{case_sensitive} ) || '';
-}
-
-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)||[]};
-    foreach my $cache (@{$self->_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 ) ) {
-            $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 = Catalyst::Action->new(
-            {
-                name       => $method,
-                code       => $code,
-                reverse    => $reverse,
-                namespace  => $namespace,
-                class      => $class,
-                attributes => $attrs,
-            }
-        );
-        $c->dispatcher->register($c, $action);
-    }
-}
-
-sub _parse_attrs {
-    my ( $self, @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 ( defined $value ) {
-                ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
-            }
-            push( @{ $attributes{$key} }, $value );
-        }
-    }
-    return \%attributes;
-}
+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");
+};
 
+no Moose;
 
-=head1 NAME
+1;
 
-Catalyst::Base - Catalyst Controller Base Class
+__END__
 
-=head1 SYNOPSIS
+=head1 NAME
 
+Catalyst::Base - Deprecated base class
 
 =head1 DESCRIPTION
 
+This used to be the base class for Catalyst Controllers. It
+remains here for compatibility reasons, but its use is highly deprecated.
 
-=head1 METHODS
-
-=over 4
-
-=back
+If your application produces a warning, then please update your application to
+inherit from L<Catalyst::Controller> instead.
 
 =head1 SEE ALSO
 
-L<Catalyst>.
+L<Catalyst>, L<Catalyst::Controller>.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Sebastian Riedel, C<sri@cpan.org>
-Marcus Ramberg, C<mramberg@cpan.org>
-Matt S Trout, C<mst@shadowcatsystems.co.uk>
+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;