X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=561fe9752a3539a5a8f645b7426649eaaebc6d1e;hb=6d316c39ef09b94d094a157c501df80e3199ceae;hp=1fe7d947e2f52ed4c75419c5c7986ca69ce1e10d;hpb=2a5635138b6600a5fb2bf1b7d040d32582eddd24;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm index 1fe7d94..561fe97 100644 --- a/lib/Catalyst/Base.pm +++ b/lib/Catalyst/Base.pm @@ -85,6 +85,11 @@ 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 @@ -138,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 @@ -162,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 ) ) { @@ -186,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 = @_; @@ -235,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) ) {