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=6a97984b6d42e3fe90e49fd9af8195436af4a467;hb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876;hpb=57e4592849c4ec6ba7a0dea780ce8b2aa2de5606

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index 6a97984..1819eb8 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,148 +1,27 @@
 package Catalyst::Base;
 
-use strict;
-use base qw/Catalyst::Component Catalyst::AttrContainer Class::Accessor::Fast/;
+use MRO::Compat;
+use mro 'c3';
+use Moose;
+BEGIN{ extends qw/Catalyst::Controller/ };
+no Moose;
 
-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) || [] };
-
-    # Advanced inheritance support for plugins and the like
-    my @action_cache;
-    {
-        no strict 'refs';
-        for my $isa ( @{"$class\::ISA"}, $class ) {
-            push @action_cache, @{ $isa->_action_cache }
-              if $isa->can('_action_cache');
-        }
-    }
-
-    foreach my $cache (@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*\))?$/ ) ) {
+1;
 
-            if ( defined $value ) {
-                ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
-            }
-            push( @{ $attributes{$key} }, $value );
-        }
-    }
-    return \%attributes;
-}
+__END__
 
 =head1 NAME
 
-Catalyst::Base - Catalyst Controller Base Class
-
-=head1 SYNOPSIS
-
+Catalyst::Base - Deprecated base class
 
 =head1 DESCRIPTION
 
-
-=head1 METHODS
-
-=over 4
-
-=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
 
@@ -156,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;