X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FAction.pm;h=0ddd7969234480861588cb01be1aed147529c9d0;hp=807a6db373ec9d5945d4ddf3bc29bbf69a5ebf3e;hb=141459fa3fc9852fd6f05138caddb410bbe2949c;hpb=b96f127f47d826a5bb8ebebc80f1b46ab3497e39

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 807a6db..0ddd796 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -3,15 +3,18 @@ package Catalyst::Action;
 use strict;
 use base qw/Class::Accessor::Fast/;
 
-__PACKAGE__->mk_accessors(qw/code namespace reverse prefix attributes/);
+__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/);
 
 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,
 
 );
 
@@ -25,37 +28,73 @@ See L<Catalyst>.
 
 =head1 DESCRIPTION
 
+This class represents a Catalyst Action. You can access the object for the 
+currently dispatched action via $c->action
+
 =head1 METHODS
 
-=over 4
+=head2 attributes
+
+The sub attributes that are set for this action, like Local, Path, Private
+and so on.
+
+=head2 class
+
+Returns the class name of this action
 
-=item attributes
+=head2 code
 
-=item code
+Returns a code reference to this action
 
-=item execute
+=head2 dispatch( $c )
+
+Dispatch this action against a context
 
 =cut
 
-sub execute {    # Execute ourselves against a context
+sub dispatch {    # Execute ourselves against a context
     my ( $self, $c ) = @_;
-    return $c->execute( $self->namespace, $self );
+    local $c->namespace = $self->namespace;
+    return $c->execute( $self->class, $self );
 }
 
-=item namespace
+=head2 execute( $controller, $c, @args )
+
+Execute this action's coderef against a given controller with a given
+context and arguments
 
-=item reverse
+=cut
 
-=item new
+sub execute {
+  my $self = shift;
+  $self->{code}->(@_);
+}
+
+=head2 match( $c )
+
+Check Args attribute, and makes sure number of args matches the setting.
 
 =cut
 
-sub new {        # Dumbass constructor
-    my ( $class, $attrs ) = @_;
-    return bless { %{ $attrs || {} } }, $class;
+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;
 }
 
-=back
+=head2 namespace
+
+Returns the private namespace this action lives in.
+
+=head2 reverse
+
+Returns the private path for this action.
+
+=head2 name
+
+returns the sub name of this action.
 
 =head1 AUTHOR