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=f77c08c7fc39cf89883a2f067685c7c3a427caf7;hp=b42653075f0dd4e50e059375a43d36b18568cd29;hb=43c581537432e9e6dd82d10375e1aac4cbcff5fb;hpb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index b426530..f77c08c 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -6,21 +6,21 @@ Catalyst::Action - Catalyst Action
 
 =head1 SYNOPSIS
 
-    <form action="[%c.uri_for(c.action.reverse)%]">
+    <form action="[%c.uri_for(c.action)%]">
 
 =head1 DESCRIPTION
 
-This class represents a Catalyst Action. You can access the object for the 
+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 MRO::Compat;
-use mro 'c3';
 use Moose;
 
+with 'MooseX::Emulate::Class::Accessor::Fast';
+
 has class => (is => 'rw');
 has namespace => (is => 'rw');
 has 'reverse' => (is => 'rw');
@@ -30,23 +30,28 @@ has code => (is => 'rw');
 
 no Moose;
 
+use overload (
+
+    # Stringify to reverse for debug output etc.
+    q{""} => sub { shift->{reverse} },
+
+    # Codulate to execute to invoke the encapsulated action coderef
+    '&{}' => sub { my $self = shift; sub { $self->execute(@_); }; },
+
+    # Make general $stuff still work
+    fallback => 1,
+
+);
+
+
+
 no warnings 'recursion';
 
 #__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/);
 
 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;
+    return $c->execute( $self->class, $self );
 }
 
 sub execute {
@@ -57,7 +62,7 @@ sub execute {
 sub match {
     my ( $self, $c ) = @_;
     #would it be unreasonable to store the number of arguments
-    #the action has as it's own attribute?
+    #the action has as its 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];
@@ -116,9 +121,9 @@ returns the sub name of this action.
 
 Provided by Moose
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Matt S. Trout
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT