X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=561fe9752a3539a5a8f645b7426649eaaebc6d1e;hb=6d316c39ef09b94d094a157c501df80e3199ceae;hp=cd14a4cffe1454c13fbf639fdbc4f6e5b492ebb4;hpb=1b1636b58ce5f1feabd0d125c3928c57e5a5cf3c;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index cd14a4c..561fe97 100644
--- 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,6 +85,24 @@ dispatch of actions for controllers.
 
 =head1 METHODS
 
+=head2 $class->new($app, @args)
+
+Proxies through to NEXT::new and stashes the application instance as
+$self->{application}.
+
+=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)
 
 Returns the private namespace for actions in this component. Defaults to a value
@@ -87,6 +113,9 @@ from the controller name (for e.g. MyApp::Controller::Foo::Bar becomes
 
 sub action_namespace {
     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->{namespace} if exists $hash->{namespace};
     return Catalyst::Utils::class2prefix( ref($self) || $self,
@@ -104,6 +133,9 @@ overriden from the "path" config key.
 
 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(@_);
@@ -111,7 +143,9 @@ sub path_prefix {
 
 =head2 $self->register_actions($c)
 
-register all actions for this component based on a given context.
+Finds all applicable actions for this component, creates Catalyst::Action
+objects (using $self->create_action) for them and registers them with
+$c->dispatcher.
 
 =cut
 
@@ -135,7 +169,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 ) ) {
@@ -159,6 +193,15 @@ sub register_actions {
     }
 }
 
+=head2 $self->create_action(%args)
+
+Called with a hash of data to be use for construction of a new Catalyst::Action
+(or appropriate sub/alternative class) object.
+
+Primarily designed for the use of register_actions.
+
+=cut
+
 sub create_action {
     my $self = shift;
     my %args = @_;
@@ -208,7 +251,7 @@ sub _parse_attrs {
 
         my $raw = $raw_attributes{$key};
 
-        foreach my $value (ref($raw) ? @$raw : $raw) {
+        foreach my $value (ref($raw) eq 'ARRAY' ? @$raw : $raw) {
 
             my $meth = "_parse_${key}_attr";
             if ( $self->can($meth) ) {