X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=dd930382aff298fb52e94f0b2c4be9f6d4c8dd83;hb=361d12347d56a10aeb237240f15336b0d835a5b3;hp=04a2153803469fa98d4754df785401f057767195;hpb=84cf74e721d712e23a1cbae062a582defb3439ea;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index 04a2153..dd93038 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,113 +1,145 @@
 package Catalyst::Base;
 
 use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use base qw/Catalyst::Component Catalyst::AttrContainer Class::Accessor::Fast/;
+
+use Catalyst::Exception;
 use Catalyst::Utils;
+use Class::Inspector;
 use NEXT;
 
-__PACKAGE__->mk_classdata($_) for qw/_attrcache _cache _config/;
-__PACKAGE__->_cache( [] );
-__PACKAGE__->_attrcache( {} );
-
-# note - see attributes(3pm)
-sub MODIFY_CODE_ATTRIBUTES {
-    my ( $class, $code, @attrs ) = @_;
-    $class->_attrcache->{$code} = [@attrs];
-    push @{ $class->_cache }, [ $code, [@attrs] ];
-    return ();
-}
-
-sub FETCH_CODE_ATTRIBUTES { $_[0]->_attrcache->{ $_[1] } || () }
-
-=head1 NAME
-
-Catalyst::Base - Catalyst Universal Base Class
-
-=head1 SYNOPSIS
+__PACKAGE__->mk_classdata($_) for qw/_dispatch_steps/;
 
-    # lib/MyApp/Model/Something.pm
-    package MyApp::Model::Something;
+__PACKAGE__->_dispatch_steps( [qw/_BEGIN _AUTO _ACTION/] );
 
-    use base 'Catalyst::Base';
+# Fix for stupid components
+*new = \&Catalyst::Component::new;
 
-    __PACKAGE__->config( foo => 'bar' );
+sub _DISPATCH : Private {
+    my ( $self, $c ) = @_;
 
-    sub test {
-        my $self = shift;
-        return $self->{foo};
+    foreach my $disp ( @{ $self->_dispatch_steps } ) {
+        last unless $c->forward($disp);
     }
 
-    sub forward_to_me {
-        my ( $self, $c ) = @_;
-        $c->response->output( $self->{foo} );
-    }
-    
-    1;
+    $c->forward('_END');
+}
 
-    # Methods can be a request step
-    $c->forward(qw/MyApp::Model::Something forward_to_me/);
+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 };
+}
 
-    # Or just methods
-    print $c->comp('MyApp::Model::Something')->test;
+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;
+}
 
-    print $c->comp('MyApp::Model::Something')->{foo};
+sub _ACTION : Private {
+    my ( $self, $c ) = @_;
+    $c->action->execute($c);
+    return !@{ $c->error };
+}
 
-=head1 DESCRIPTION
+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 };
+}
 
-This is the universal base class for Catalyst components
-(Model/View/Controller).
+sub action_namespace {
+    my ( $self, $c ) = @_;
+    return Catalyst::Utils::class2prefix( ref $self,
+        $c->config->{case_sensitive} )
+      || '';
+}
 
-It provides you with a generic new() for instantiation through Catalyst's
-component loader with config() support and a process() method placeholder.
+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');
+        }
+    }
 
-=head1 METHODS
+    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 );
+    }
+}
 
-=over 4
+sub _parse_attrs {
+    my ( $self, @attrs ) = @_;
+    my %attributes;
+    foreach my $attr (@attrs) {
 
-=item new($c)
+        # Parse out :Foo(bar) into Foo => bar etc (and arrayify)
 
-=cut
+        if ( my ( $key, $value ) = ( $attr =~ /^(.*?)(?:\(\s*(.+)\s*\))?$/ ) ) {
 
-sub new {
-    my ( $self, $c ) = @_;
-    my $class     = ref $self || $self;
-    my $appname   = Catalyst::Utils::class2appclass($class);
-    my $suffix    = Catalyst::Utils::class2classsuffix($class);
-    my $appconfig = $appname->config->{$suffix} || {};
-    my $config    = { %{ $self->config }, %{$appconfig} };
-    return $self->NEXT::new($config);
+            if ( defined $value ) {
+                ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
+            }
+            push( @{ $attributes{$key} }, $value );
+        }
+    }
+    return \%attributes;
 }
 
-# remember to leave blank lines between the consecutive =item's
-# otherwise the pod tools don't recognize the subsequent =items
-
-=item $c->config
+=head1 NAME
 
-=item $c->config($hashref)
+Catalyst::Base - Catalyst Controller Base Class
 
-=item $c->config($key, $value, ...)
+=head1 SYNOPSIS
 
-=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;
-}
+=head1 DESCRIPTION
 
-=item $c->process()
 
-=cut
+=head1 METHODS
 
-sub process {
-    die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" );
-}
+=over 4
 
 =back
 
@@ -119,6 +151,7 @@ L<Catalyst>.
 
 Sebastian Riedel, C<sri@cpan.org>
 Marcus Ramberg, C<mramberg@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
 
 =head1 COPYRIGHT