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=b1f105b3787ac249bdcd52611c9e2bdd7cfe2432;hp=abe23e9cc03bfbf8ca7dd8166044f9ad6acdbfcf;hb=b5ecfcf07b8ffe7e9984f0279c8781ce51c6ac6a;hpb=ac73326467a355b37917b030d8413c4838468aee

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index abe23e9..b1f105b 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,109 +1,167 @@
 package Catalyst::Base;
 
 use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-use NEXT;
-
-__PACKAGE__->mk_classdata($_) for qw/_cache _config/;
-__PACKAGE__->_cache( [] );
+use base qw/Catalyst::Component Catalyst::AttrContainer Class::Accessor::Fast/;
 
-sub MODIFY_CODE_ATTRIBUTES {
-    my ( $class, $code, @attrs ) = @_;
-    push @{ $class->_cache }, [ $code, [@attrs] ];
-    return ();
-}
+use Catalyst::Exception;
+use Catalyst::Utils;
+use Class::Inspector;
+use NEXT;
 
-=head1 NAME
+__PACKAGE__->mk_classdata($_) for qw/_dispatch_steps _action_class/;
 
-Catalyst::Base - Catalyst Universal Base Class
+__PACKAGE__->_dispatch_steps( [qw/_BEGIN _AUTO _ACTION/] );
+__PACKAGE__->_action_class('Catalyst::Action');
 
-=head1 SYNOPSIS
+sub _DISPATCH : Private {
+    my ( $self, $c ) = @_;
 
-    # lib/MyApp/Model/Something.pm
-    package MyApp::Model::Something;
+    foreach my $disp ( @{ $self->_dispatch_steps } ) {
+        last unless $c->forward($disp);
+    }
 
-    use base 'Catalyst::Base';
+    $c->forward('_END');
+}
 
-    __PACKAGE__->config( foo => 'bar' );
+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 test {
-        my $self = shift;
-        return $self->{foo};
+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 forward_to_me {
-        my ( $self, $c ) = @_;
-        $c->response->output( $self->{foo} );
+sub _ACTION : Private {
+    my ( $self, $c ) = @_;
+    if (   ref $c->action
+        && $c->action->isa('Catalyst::Action')
+        && $c->req->action )
+    {
+        $c->action->execute($c);
     }
-    
-    1;
+    return !@{ $c->error };
+}
 
-    # 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 );
+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 };
+}
 
-    # Or just methods
-    print $c->comp('MyApp::Model::Something')->test;
+=head1 NAME
 
-    print $c->comp('MyApp::Model::Something')->{foo};
+Catalyst::Base - Catalyst Base Class
 
-=head1 DESCRIPTION
+=head1 SYNOPSIS
 
-This is the universal base class for Catalyst components
-(Model/View/Controller).
+See L<Catalyst>
 
-It provides you with a generic new() for instantiation through Catalyst's
-component loader with config() support and a process() method placeholder.
+=head1 DESCRIPTION
 
-=head1 METHODS
+Catalyst Base Class
 
-=over 4
+=head1 METHODS
 
-=item new($c)
+=head2 $self->action_namespace($c)
 
 =cut
 
-sub new {
+sub action_namespace {
     my ( $self, $c ) = @_;
-    return $self->NEXT::new( $self->config );
+    return Catalyst::Utils::class2prefix( ref $self,
+        $c->config->{case_sensitive} )
+      || '';
 }
 
-# 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, ...)
+=head2 $self->register_actions($c)
 
 =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;
+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');
         }
     }
-    return $self->_config;
+
+    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 = $self->_action_class->new(
+            {
+                name       => $method,
+                code       => $code,
+                reverse    => $reverse,
+                namespace  => $namespace,
+                class      => $class,
+                attributes => $attrs,
+            }
+        );
+        $c->dispatcher->register( $c, $action );
+    }
 }
 
-=item $c->process()
+sub _parse_attrs {
+    my ( $self, @attrs ) = @_;
+    my %attributes;
+    foreach my $attr (@attrs) {
 
-=cut
+        # Parse out :Foo(bar) into Foo => bar etc (and arrayify)
 
-sub process { 1 }
+        if ( my ( $key, $value ) = ( $attr =~ /^(.*?)(?:\(\s*(.+?)\s*\))?$/ ) )
+        {
+
+            if ( defined $value ) {
+                ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
+            }
+            push( @{ $attributes{$key} }, $value );
+        }
+    }
+    return \%attributes;
+}
 
 =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