Add dump_these method to Catalyst, which returns the structures dumped on error

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Base.pm

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index e2bf41a..c7d21f6 100644 (file)
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -4,54 +4,115 @@ use strict;
 use base qw/Catalyst::AttrContainer Class::Accessor::Fast/;
 
 use Catalyst::Exception;
+use Catalyst::Utils;
+use Class::Inspector;
 use NEXT;
 
 __PACKAGE__->mk_classdata($_) for qw/_config _dispatch_steps/;
 
-__PACKAGE__->_dispatch_steps([ qw/_BEGIN _AUTO _ACTION/ ]);
+__PACKAGE__->_dispatch_steps( [qw/_BEGIN _AUTO _ACTION/] );
 
-sub _DISPATCH :Private {
+sub _DISPATCH : Private {
     my ( $self, $c ) = @_;
 
-    foreach my $disp (@{$self->_dispatch_steps}) {
+    foreach my $disp ( @{ $self->_dispatch_steps } ) {
         last unless $c->forward($disp);
     }
 
     $c->forward('_END');
 }
 
-sub _BEGIN :Private {
+sub _BEGIN : Private {
     my ( $self, $c ) = @_;
-    my $begin = @{ $c->get_action('begin', $c->namespace, 1) }[-1];
+    my $begin = ($c->get_actions( 'begin', $c->namespace))[-1];
     return 1 unless $begin;
-    $begin->[0]->execute($c);
-    return !@{$c->error};
+    $begin->execute($c);
+    return !@{ $c->error };
 }
 
-sub _AUTO :Private {
+sub _AUTO : Private {
     my ( $self, $c ) = @_;
-    my @auto = @{ $c->get_action('auto', $c->namespace, 1) };
+    my @auto = $c->get_actions('auto', $c->namespace);
     foreach my $auto (@auto) {
-        $auto->[0]->execute($c);
+        $auto->execute($c);
         return 0 unless $c->state;
     }
     return 1;
 }
 
-sub _ACTION :Private {
+sub _ACTION : Private {
     my ( $self, $c ) = @_;
     $c->action->execute($c);
-    return !@{$c->error};
+    return !@{ $c->error };
 }
 
-sub _END :Private {
+sub _END : Private {
     my ( $self, $c ) = @_;
-    my $end = @{ $c->get_action('end', $c->namespace, 1) }[-1];
+    my $end = ($c->get_actions( 'end', $c->namespace))[-1];
     return 1 unless $end;
-    $end->[0]->execute($c);
-    return !@{$c->error};
+    $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)||[]};
+    foreach my $cache (@{$self->_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*\))?$/ ) ) {
+
+            if ( defined $value ) {
+                ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
+            }
+            push( @{ $attributes{$key} }, $value );
+        }
+    }
+    return \%attributes;
+}
+
+
 =head1 NAME
 
 Catalyst::Base - Catalyst Universal Base Class
@@ -103,11 +164,11 @@ component loader with config() support and a process() method placeholder.
 
 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 } } );
+    return $self->NEXT::new( { %{ $self->config }, %{$arguments} } );
 }
 
 # remember to leave blank lines between the consecutive =item's
@@ -139,15 +200,10 @@ sub config {
 
 sub process {
 
-    Catalyst::Exception->throw( 
-        message => ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process"
-    );
+    Catalyst::Exception->throw( message => ( ref $_[0] || $_[0] )
+          . " did not override Catalyst::Base::process" );
 }
 
-=item FETCH_CODE_ATTRIBUTES
-
-=item MODIFY_CODE_ATTRIBUTES
-
 =back
 
 =head1 SEE ALSO