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=b96bfbc3246496e1c9a1f375221d4e6d43fdeea1;hp=581d03cf5c3f192405e1f242503ddb9709407c97;hb=df3956bf69b7112ca1064d187b6313182a6b8902;hpb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 581d03c..b96bfbc 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -1,63 +1,129 @@
 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)%]">
+
+=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
+
+use Moose;
 
-__PACKAGE__->mk_accessors(qw/code namespace reverse/);
+with 'MooseX::Emulate::Class::Accessor::Fast';
+
+has class => (is => 'rw');
+has namespace => (is => 'rw');
+has 'reverse' => (is => 'rw');
+has attributes => (is => 'rw');
+has name => (is => 'rw');
+has code => (is => 'rw');
+
+no Moose;
 
 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
 
-=head1 SYNOPSIS
+no warnings 'recursion';
 
-See L<Catalyst>.
+#__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/);
 
-=head1 DESCRIPTION
+sub dispatch {    # Execute ourselves against a context
+    my ( $self, $c ) = @_;
+    return $c->execute( $self->class, $self );
+}
+
+sub execute {
+  my $self = shift;
+  $self->code->(@_);
+}
+
+sub match {
+    my ( $self, $c ) = @_;
+    #would it be unreasonable to store the number of arguments
+    #the action has as it's own attribute?
+    #it would basically eliminate the code below.  ehhh. small fish
+    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;
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
+
+__END__
 
 =head1 METHODS
 
-=over 4
+=head2 attributes
 
-=item code
+The sub attributes that are set for this action, like Local, Path, Private
+and so on. This determines how the action is dispatched to.
 
-=item execute
+=head2 class
 
-=cut
+Returns the class name where this action is defined.
 
-sub execute {    # Execute ourselves against a context
-    my ( $self, $c ) = @_;
-    return $c->execute( $self->namespace, $self );
-}
+=head2 code
 
-=item namespace
+Returns a code reference to this action.
 
-=item reverse
+=head2 dispatch( $c )
 
-=item new
+Dispatch this action against a context
 
-=cut
+=head2 execute( $controller, $c, @args )
 
-sub new {        # Dumbass constructor
-    my ( $class, $attrs ) = @_;
-    return bless { %{ $attrs || {} } }, $class;
-}
+Execute this action's coderef against a given controller with a given
+context and arguments
 
-=back
+=head2 match( $c )
 
-=head1 AUTHOR
+Check Args attribute, and makes sure number of args matches the setting.
+Always returns true if Args is omitted.
 
-Matt S. Trout
+=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.
+
+=head2 meta
+
+Provided by Moose
+
+=head1 AUTHORS
+
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
@@ -65,5 +131,3 @@ This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;