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=0e132f518194f571333b35aa23cd09a2ad30d9ac;hp=f80c00bd84138c2792c53c47049ff0210c318dce;hb=f8ad6ea56eeb4d3a3d5d77cf502651712dfb5e62;hpb=6b23994966a2a66b90986a51e7e1d71f62d90f44

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index f80c00b..0e132f5 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -3,7 +3,7 @@ package Catalyst::Action;
 use strict;
 use base qw/Class::Accessor::Fast/;
 
-__PACKAGE__->mk_accessors(qw/code namespace reverse prefix attributes name/);
+__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/);
 
 use overload (
 
@@ -13,6 +13,9 @@ use overload (
     # Codulate to encapsulated action coderef
     '&{}' => sub { shift->{code} },
 
+    # Make general $stuff still work
+    fallback => 1,
+
 );
 
 =head1 NAME
@@ -25,39 +28,59 @@ 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
 
-=item attributes
+Returns the class name of this action
 
-=item code
+=head2 code
 
-=item execute
+Returns a code reference to this action
+
+=head2 execute( $c )
+
+Execute this action against a context
 
 =cut
 
 sub execute {    # 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
-
-=item reverse
+=head2 match( $c )
 
-=item name
-
-=item new
+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};
+    return scalar(@{$c->req->args}) == $self->attributes->{Args}[0];
 }
 
-=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