X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction.pm;h=83b4da3937bd7b700372d5d3c849bca2fb2eaccd;hb=88eee38e25dd1a991008fb5f61b848fcecb97ad0;hp=174fb4b95e8d22ce520431ca2c2e220ec51c059f;hpb=059c085bfcead450e70ace9ef193aa99ac2ab37d;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm index 174fb4b..83b4da3 100644 --- a/lib/Catalyst/Action.pm +++ b/lib/Catalyst/Action.pm @@ -19,23 +19,19 @@ L subclasses. 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'); +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/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 execute to invoke the encapsulated action coderef '&{}' => sub { my $self = shift; sub { $self->execute(@_); }; }, @@ -45,9 +41,14 @@ use overload ( ); + + +no warnings 'recursion'; + +#__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/); + sub dispatch { # Execute ourselves against a context my ( $self, $c ) = @_; - local $c->{namespace} = $self->namespace; return $c->execute( $self->class, $self ); } @@ -58,12 +59,17 @@ 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? + #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__ @@ -113,9 +119,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