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=401f335f04c0ee73f99b3041684fcff0ba74e661;hp=abe23e9cc03bfbf8ca7dd8166044f9ad6acdbfcf;hb=199731fb710c6a165793f055f85de60539039dfe;hpb=ac73326467a355b37917b030d8413c4838468aee

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index abe23e9..401f335 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,115 +1,43 @@
 package Catalyst::Base;
+use Moose;
+BEGIN { extends 'Catalyst::Controller' }
 
-use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-use NEXT;
-
-__PACKAGE__->mk_classdata($_) for qw/_cache _config/;
-__PACKAGE__->_cache( [] );
-
-sub MODIFY_CODE_ATTRIBUTES {
-    my ( $class, $code, @attrs ) = @_;
-    push @{ $class->_cache }, [ $code, [@attrs] ];
-    return ();
-}
-
-=head1 NAME
-
-Catalyst::Base - Catalyst Universal Base Class
-
-=head1 SYNOPSIS
-
-    # lib/MyApp/Model/Something.pm
-    package MyApp::Model::Something;
-
-    use base 'Catalyst::Base';
+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");
+};
 
-    __PACKAGE__->config( foo => 'bar' );
+no Moose;
 
-    sub test {
-        my $self = shift;
-        return $self->{foo};
-    }
+__PACKAGE__->meta->make_immutable;
 
-    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/);
-    MyApp->action( 'index.html' => \&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)
+This used to be the base class for Catalyst Controllers. It
+remains here for compatibility reasons, but its use is highly deprecated.
 
-=cut
-
-sub new {
-    my ( $self, $c ) = @_;
-    return $self->NEXT::new( $self->config );
-}
-
-# 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 ( $_[0] ) {
-        my $config = $_[1] ? {@_} : $_[0];
-        while ( my ( $key, $val ) = each %$config ) {
-            $self->_config->{$key} = $val;
-        }
-    }
-    return $self->_config;
-}
-
-=item $c->process()
-
-=cut
-
-sub process { 1 }
+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>
+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;