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=e2bf41ac9d6819dd44443925f7645aba2b5a94fc;hb=d0cacee71a316290bc01f0e12681c16bdc1e84e2;hpb=1143712c6bec3492444f03a91fde0ce081d9540a

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index e2bf41a..1dca5c9 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,170 +1,41 @@
 package Catalyst::Base;
+use Moose;
+BEGIN { extends 'Catalyst::Controller' }
 
-use strict;
-use base qw/Catalyst::AttrContainer Class::Accessor::Fast/;
-
-use Catalyst::Exception;
-use NEXT;
-
-__PACKAGE__->mk_classdata($_) for qw/_config _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_action('begin', $c->namespace, 1) }[-1];
-    return 1 unless $begin;
-    $begin->[0]->execute($c);
-    return !@{$c->error};
-}
-
-sub _AUTO :Private {
-    my ( $self, $c ) = @_;
-    my @auto = @{ $c->get_action('auto', $c->namespace, 1) };
-    foreach my $auto (@auto) {
-        $auto->[0]->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_action('end', $c->namespace, 1) }[-1];
-    return 1 unless $end;
-    $end->[0]->execute($c);
-    return !@{$c->error};
-}
-
-=head1 NAME
-
-Catalyst::Base - Catalyst Universal Base Class
-
-=head1 SYNOPSIS
-
-    # lib/MyApp/Model/Something.pm
-    package MyApp::Model::Something;
-
-    use base 'Catalyst::Base';
-
-    __PACKAGE__->config( foo => 'bar' );
+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 test {
-        my $self = shift;
-        return $self->{foo};
-    }
+no Moose;
 
-    sub forward_to_me {
-        my ( $self, $c ) = @_;
-        $c->response->output( $self->{foo} );
-    }
-    
-    1;
+1;
 
-    # Methods can be a request step
-    $c->forward(qw/MyApp::Model::Something forward_to_me/);
+__END__
 
-    # Or just methods
-    print $c->comp('MyApp::Model::Something')->test;
+=head1 NAME
 
-    print $c->comp('MyApp::Model::Something')->{foo};
+Catalyst::Base - Deprecated base class
 
 =head1 DESCRIPTION
 
-This is the universal base class for Catalyst components
-(Model/View/Controller).
-
-It provides you with a generic new() for instantiation through Catalyst's
-component loader with config() support and a process() method placeholder.
-
-=head1 METHODS
-
-=over 4
-
-=item new($c)
-
-=cut
-
-sub new {
-    my ( $self, $c ) = @_;
- 
-    # Temporary fix, some components does not pass context to constructor
-    my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
+This used to be the base class for Catalyst Controllers. It
+remains here for compatibility reasons, but its use is highly deprecated.
 
-    return $self->NEXT::new( { %{ $self->config }, %{ $arguments } } );
-}
-
-# remember to leave blank lines between the consecutive =item's
-# otherwise the pod tools don't recognize the subsequent =items
-
-=item $c->config
-
-=item $c->config($hashref)
-
-=item $c->config($key, $value, ...)
-
-=cut
-
-sub config {
-    my $self = shift;
-    $self->_config( {} ) unless $self->_config;
-    if (@_) {
-        my $config = @_ > 1 ? {@_} : $_[0];
-        while ( my ( $key, $val ) = each %$config ) {
-            $self->_config->{$key} = $val;
-        }
-    }
-    return $self->_config;
-}
-
-=item $c->process()
-
-=cut
-
-sub process {
-
-    Catalyst::Exception->throw( 
-        message => ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process"
-    );
-}
-
-=item FETCH_CODE_ATTRIBUTES
-
-=item MODIFY_CODE_ATTRIBUTES
-
-=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;