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=f21e34d01830083aeffbb05a4f7dd8c638adacbb;hp=b42653075f0dd4e50e059375a43d36b18568cd29;hb=77f23d2a797fdde1e4e8e21c6bdff58639144383;hpb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876 diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm index b426530..f21e34d 100644 --- a/lib/Catalyst/Action.pm +++ b/lib/Catalyst/Action.pm @@ -17,10 +17,10 @@ L 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 { @@ -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