X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction.pm;h=6c9e9a1e386e92c68a5dd8753ea8f3ba0203da0c;hb=e16a6c4e6c4d49e73b5286b3186616af14f3f554;hp=ca695c4d6bad48521be87e41d885acc44c4805b5;hpb=4ab87e274ac0a05f98c10a4cdba467ba4398b0d3;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index ca695c4..6c9e9a1 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -3,6 +3,24 @@ package Catalyst::Action;
 use strict;
 use base qw/Class::Accessor::Fast/;
 
+
+=head1 NAME
+
+Catalyst::Action - Catalyst Action
+
+=head1 SYNOPSIS
+
+    <form action="[%c.uri_for(c.action.reverse)%]">
+
+=head1 DESCRIPTION
+
+This class represents a Catalyst Action. You can access the object for the 
+currently dispatched action via $c->action. See the L<Catalyst::Dispatcher>
+for more information on how actions are dispatched. Actions are defined in
+L<Catalyst::Controller> subclasses.
+
+=cut
+
 __PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/);
 
 use overload (
@@ -10,65 +28,64 @@ use overload (
     # Stringify to reverse for debug output etc.
     q{""} => sub { shift->{reverse} },
 
-    # Codulate to encapsulated action coderef
-    '&{}' => sub { shift->{code} },
+    # Codulate to execute to invoke the encapsulated action coderef
+    '&{}' => sub { my $self = shift; sub { $self->execute(@_); }; },
 
     # Make general $stuff still work
     fallback => 1,
 
 );
 
-=head1 NAME
-
-Catalyst::Action - Catalyst Action
+sub dispatch {    # Execute ourselves against a context
+    my ( $self, $c ) = @_;
+    return $c->execute( $self->class, $self );
+}
 
-=head1 SYNOPSIS
+sub execute {
+  my $self = shift;
+  $self->{code}->(@_);
+}
 
-See L<Catalyst>.
+sub match {
+    my ( $self, $c ) = @_;
+    return 1 unless exists $self->attributes->{Args};
+    my $args = $self->attributes->{Args}[0];
+    return 1 unless defined($args) && length($args);
+    return scalar( @{ $c->req->args } ) == $args;
+}
 
-=head1 DESCRIPTION
+1;
 
-This class represents a Catalyst Action. You can access the object for the 
-currently dispatched action via $c->action
+__END__
 
 =head1 METHODS
 
 =head2 attributes
 
 The sub attributes that are set for this action, like Local, Path, Private
-and so on.
+and so on. This determines how the action is dispatched to.
 
 =head2 class
 
-Returns the class name of this action
+Returns the class name where this action is defined.
 
 =head2 code
 
-Returns a code reference to this action
+Returns a code reference to this action.
 
-=head2 execute <c>
+=head2 dispatch( $c )
 
-Execute this action against a context
+Dispatch this action against a context
 
-=cut
+=head2 execute( $controller, $c, @args )
 
-sub execute {    # Execute ourselves against a context
-    my ( $self, $c ) = @_;
-    local $c->namespace = $self->namespace;
-    return $c->execute( $self->class, $self );
-}
-
-=head2 match <context>
+Execute this action's coderef against a given controller with a given
+context and arguments
 
-Check Args setting, and makes sure number of args matches the setting.
+=head2 match( $c )
 
-=cut
-
-sub match {
-    my ( $self, $c ) = @_;
-    return 1 unless exists $self->attributes->{Args};
-    return scalar(@{$c->req->args}) == $self->attributes->{Args}[0];
-}
+Check Args attribute, and makes sure number of args matches the setting.
+Always returns true if Args is omitted.
 
 =head2 namespace
 
@@ -82,9 +99,9 @@ Returns the private path for this action.
 
 returns the sub name of this action.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Matt S. Trout
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
@@ -92,5 +109,3 @@ This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;