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=9815391eb627fca36c04d8f08251d089dc0d4b8c;hp=f80c00bd84138c2792c53c47049ff0210c318dce;hb=7fa2c9c1b85c98786655ad5169708d8dc84e8353;hpb=6b23994966a2a66b90986a51e7e1d71f62d90f44

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index f80c00b..9815391 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -1,63 +1,126 @@
 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
+
+use Moose;
+
+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;
+
+no warnings 'recursion';
 
-__PACKAGE__->mk_accessors(qw/code namespace reverse prefix attributes name/);
+#__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/);
 
 use overload (
 
     # Stringify to reverse for debug output etc.
-    q{""} => sub { shift->{reverse} },
+    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
+sub dispatch {    # Execute ourselves against a context
+    my ( $self, $c ) = @_;
+    #Moose todo: grrrrrr. this is no good. i don't know enough about it to
+    # debug it though. why can't we just call the accessor?
+    local $c->{namespace} = $self->namespace;
+    return $c->execute( $self->class, $self );
+
+    #believed to be equivalent:
+    #my $orig = $c->namespace;
+    #$c->namespace($self->namespace);
+    #my $ret = $c->execute( $self->class, $self );
+    #$c->namespace($orig);
+    #return $ret;
+}
 
-Catalyst::Action - Catalyst Action
+sub execute {
+  my $self = shift;
+  $self->code->(@_);
+}
 
-=head1 SYNOPSIS
+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;
+}
 
-See L<Catalyst>.
+1;
 
-=head1 DESCRIPTION
+__END__
 
 =head1 METHODS
 
-=over 4
+=head2 attributes
 
-=item attributes
+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 code
+=head2 class
 
-=item execute
+Returns the class name where this action is defined.
 
-=cut
+=head2 code
 
-sub execute {    # Execute ourselves against a context
-    my ( $self, $c ) = @_;
-    return $c->execute( $self->namespace, $self );
-}
+Returns a code reference to this action.
 
-=item namespace
+=head2 dispatch( $c )
 
-=item reverse
+Dispatch this action against a context
 
-=item name
+=head2 execute( $controller, $c, @args )
 
-=item new
+Execute this action's coderef against a given controller with a given
+context and arguments
 
-=cut
+=head2 match( $c )
 
-sub new {        # Dumbass constructor
-    my ( $class, $attrs ) = @_;
-    return bless { %{ $attrs || {} } }, $class;
-}
+Check Args attribute, and makes sure number of args matches the setting.
+Always returns true if Args is omitted.
+
+=head2 namespace
+
+Returns the private namespace this action lives in.
+
+=head2 reverse
+
+Returns the private path for this action.
 
-=back
+=head2 name
+
+returns the sub name of this action.
+
+=head2 meta
+
+Provided by Moose
 
 =head1 AUTHOR
 
@@ -69,5 +132,3 @@ This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;