Captures required, Args not

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

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index c4a6dc7..65f3120 100644 (file)
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -60,6 +60,14 @@ sub _END : Private {
     return !@{ $c->error };
 }
 
+sub new {
+  my $self = shift;
+  my $app = $_[0];
+  my $new = $self->NEXT::new(@_);
+  $new->{application} = $app;
+  return $new;
+}
+
 =head1 NAME
 
 Catalyst::Base - Catalyst Base Class
@@ -77,15 +85,34 @@ dispatch of actions for controllers.
 
 =head1 METHODS
 
+=head2 $self->action_for('name')
+
+Returns the Catalyst::Action object (if any) for a given method name in
+this component.
+
+=cut
+
+sub action_for {
+    my ( $self, $name ) = @_;
+    my $app = ($self->isa('Catalyst') ? $self : $self->{application});
+    return $app->dispatcher->get_action($name, $self->action_namespace);
+}
+
 =head2 $self->action_namespace($c)
 
-Determine the namespace for actions in this component.
+Returns the private namespace for actions in this component. Defaults to a value
+from the controller name (for e.g. MyApp::Controller::Foo::Bar becomes
+"foo/bar") or can be overriden from the "namespace" config key.
 
 =cut
 
 sub action_namespace {
     my ( $self, $c ) = @_;
-    return $self->config->{namespace} if exists $self->config->{namespace};
+    unless ( $c ) {
+        $c = ($self->isa('Catalyst') ? $self : $self->{application});
+    }
+    my $hash = (ref $self ? $self : $self->config); # hate app-is-class
+    return $hash->{namespace} if exists $hash->{namespace};
     return Catalyst::Utils::class2prefix( ref($self) || $self,
         $c->config->{case_sensitive} )
       || '';
@@ -93,11 +120,21 @@ sub action_namespace {
 
 =head2 $self->path_prefix($c)
 
-alias for action_namespace
+Returns the default path prefix for :Local, :LocalRegex and relative :Path
+actions in this component. Defaults to the action_namespace or can be
+overriden from the "path" config key.
 
 =cut
 
-sub path_prefix { shift->action_namespace(@_); }
+sub path_prefix {
+    my ( $self, $c ) = @_;
+    unless ( $c ) {
+        $c = ($self->isa('Catalyst') ? $self : $self->{application});
+    }
+    my $hash = (ref $self ? $self : $self->config); # hate app-is-class
+    return $hash->{path} if exists $hash->{path};
+    return shift->action_namespace(@_);
+}
 
 =head2 $self->register_actions($c)
 
@@ -125,7 +162,7 @@ sub register_actions {
 
     foreach my $cache (@action_cache) {
         my $code   = $cache->[0];
-        my $method = $methods{$code};
+        my $method = delete $methods{$code}; # avoid dupe registers
         next unless $method;
         my $attrs = $self->_parse_attrs( $c, $method, @{ $cache->[1] } );
         if ( $attrs->{Private} && ( keys %$attrs > 1 ) ) {
@@ -166,7 +203,9 @@ sub create_action {
 
 sub _parse_attrs {
     my ( $self, $c, $name, @attrs ) = @_;
-    my %attributes;
+
+    my %raw_attributes;
+
     foreach my $attr (@attrs) {
 
         # Parse out :Foo(bar) into Foo => bar etc (and arrayify)
@@ -177,14 +216,36 @@ sub _parse_attrs {
             if ( defined $value ) {
                 ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
             }
+            push( @{ $raw_attributes{$key} }, $value );
+        }
+    }
+
+    my $hash = (ref $self ? $self : $self->config); # hate app-is-class
+
+    if (exists $hash->{actions} || exists $hash->{action}) {
+      my $a = $hash->{actions} || $hash->{action};
+      %raw_attributes = ((exists $a->{'*'} ? %{$a->{'*'}} : ()),
+                         %raw_attributes,
+                         (exists $a->{$name} ? %{$a->{$name}} : ()));
+    }
+
+    my %final_attributes;
+
+    foreach my $key (keys %raw_attributes) {
+
+        my $raw = $raw_attributes{$key};
+
+        foreach my $value (ref($raw) ? @$raw : $raw) {
+
             my $meth = "_parse_${key}_attr";
             if ( $self->can($meth) ) {
                 ( $key, $value ) = $self->$meth( $c, $name, $value );
             }
-            push( @{ $attributes{$key} }, $value );
+            push( @{ $final_attributes{$key} }, $value );
         }
     }
-    return \%attributes;
+
+    return \%final_attributes;
 }
 
 sub _parse_Global_attr {