X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=cf410836f5982fb8f9d0faf95b2d3907894b549f;hb=8c80e4f8ed93daf2d635c0480bdc97adf24e49c1;hp=6bda121cc85a68260f1867cbaf775435d5788418;hpb=ba599d1c7a0c3219cd3825264c44d22362ed179a;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index 6bda121..cf41083 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,167 +1,26 @@
 package Catalyst::Base;
 
-use strict;
-use base qw/Catalyst::AttrContainer Class::Accessor::Fast/;
+use Class::C3;
+use Moose;
+BEGIN{ extends qw/Catalyst::Controller/ };
+no Moose;
 
-use Catalyst::Exception;
-use NEXT;
-
-__PACKAGE__->mk_classdata($_) for qw/_config/;
-
-sub _DISPATCH :Private {
-    my ( $self, $c ) = @_;
-    my @containers = $c->dispatcher->get_containers( $c->namespace );
-    my %actions;
-    foreach my $name (qw/begin auto end/) {
-
-        # Go down the container list representing each part of the
-        # current namespace inheritance tree, grabbing the actions hash
-        # of the ActionContainer object and looking for actions of the
-        # appropriate name registered to the namespace
-
-        $actions{$name} = [
-            map    { $_->{$name} }
-              grep { exists $_->{$name} }
-              map  { $_->actions } @containers
-        ];
-    }
-
-    # Errors break the normal flow and the end action is instantly run
-    my $error = 0;
-
-    # Execute last begin
-    $c->state(1);
-    if ( my $begin = @{ $actions{begin} }[-1] ) {
-        $begin->execute($c);
-        $error++ if scalar @{ $c->error };
-    }
-
-    # Execute the auto chain
-    my $autorun = 0;
-    for my $auto ( @{ $actions{auto} } ) {
-        last if $error;
-        $autorun++;
-        $auto->execute($c);
-        $error++ if scalar @{ $c->error };
-        last unless $c->state;
-    }
-
-    # Execute the action or last default
-    my $mkay = $autorun ? $c->state ? 1 : 0 : 1;
-    if ($mkay) {
-        unless ($error) {
-            $c->action->execute($c);
-            $error++ if scalar @{ $c->error };
-        }
-    }
+1;
 
-    # Execute last end
-    if ( my $end = @{ $actions{end} }[-1] ) {
-        $end->execute($c);
-    }
-}
+__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 {
-
-    Catalyst::Exception->throw( 
-        message => ( 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
 
@@ -175,5 +34,3 @@ This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;