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=1819eb87f7992d3c04264945741825f8303d29ea;hp=dd38bea61195066d04cdc42ddc58df76b047fb7e;hb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876;hpb=a268a0112398ac10d8fabd86ed28a183cbe4398e

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index dd38bea..1819eb8 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,126 +1,33 @@
 package Catalyst::Base;
 
-use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-use NEXT;
+use MRO::Compat;
+use mro 'c3';
+use Moose;
+BEGIN{ extends qw/Catalyst::Controller/ };
+no Moose;
 
-__PACKAGE__->mk_classdata($_) for qw/_attr_cache _action_cache _config/;
-__PACKAGE__->_attr_cache( {} );
-__PACKAGE__->_action_cache( [] );
-
-# note - see attributes(3pm)
-sub MODIFY_CODE_ATTRIBUTES {
-    my ( $class, $code, @attrs ) = @_;
-    $class->_attr_cache->{$code} = [@attrs];
-    push @{ $class->_action_cache }, [ $code, [@attrs] ];
-    return ();
-}
+1;
 
-sub FETCH_CODE_ATTRIBUTES { $_[0]->_attr_cache->{ $_[1] } || () }
+__END__
 
 =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' );
-
-    sub test {
-        my $self = shift;
-        return $self->{foo};
-    }
-
-    sub forward_to_me {
-        my ( $self, $c ) = @_;
-        $c->response->output( $self->{foo} );
-    }
-    
-    1;
-
-    # Methods can be a request step
-    $c->forward(qw/MyApp::Model::Something forward_to_me/);
-
-    # Or just methods
-    print $c->comp('MyApp::Model::Something')->test;
-
-    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] : {};
-
-    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 {
-    die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" );
-}
-
-=item FETCH_CODE_ATTRIBUTES
-
-=item MODIFY_CODE_ATTRIBUTES
-
-=back
+This used to be the base class for Catalyst Controllers. It
+remains here for compability reasons.
 
 =head1 SEE ALSO
 
-L<Catalyst>.
+L<Catalyst>, L<Catalyst::Controller>.
 
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
 Marcus Ramberg, C<mramberg@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
 
 =head1 COPYRIGHT
 
@@ -128,5 +35,3 @@ This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;