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=0eb99424eed9222274f112c9504d47736aee0bb1;hp=0ddd7969234480861588cb01be1aed147529c9d0;hb=05b47f2e6357bc7f1622e6b2cf730ad5bbeb993f;hpb=141459fa3fc9852fd6f05138caddb410bbe2949c

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 0ddd796..0eb9942 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -1,9 +1,33 @@
 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.
 
-__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/);
+=cut
+
+use Moose;
+use Scalar::Util 'looks_like_number';
+with 'MooseX::Emulate::Class::Accessor::Fast';
+use namespace::clean -except => 'meta';
+
+has class => (is => 'rw');
+has namespace => (is => 'rw');
+has 'reverse' => (is => 'rw');
+has attributes => (is => 'rw');
+has name => (is => 'rw');
+has code => (is => 'rw');
 
 use overload (
 
@@ -13,76 +37,92 @@ use overload (
     # Codulate to execute to invoke the encapsulated action coderef
     '&{}' => sub { my $self = shift; sub { $self->execute(@_); }; },
 
+    # Which action takes precedence
+    'cmp' => 'compare',
+    '<=>' => 'compare',
+
     # 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 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];
+    return 1 unless defined($args) && length($args);
+    return scalar( @{ $c->req->args } ) == $args;
+}
+
+sub sort_order {
+    my $self = shift;
 
-This class represents a Catalyst Action. You can access the object for the 
-currently dispatched action via $c->action
+    my ($args) = @{ $self->attributes->{Args} || [] };
+
+    return $args if looks_like_number($args);
+
+    return ~0;
+}
+
+sub compare {
+    my ($a1, $a2) = @_;
+
+    return $a1->sort_order <=> $a2->sort_order;
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
+
+__END__
 
 =head1 METHODS
 
 =head2 attributes
 
 The sub attributes that are set for this action, like Local, Path, Private
-and so on.
+and so on. This determines how the action is dispatched to.
 
 =head2 class
 
-Returns the class name of this action
+Returns the class name where this action is defined.
 
 =head2 code
 
-Returns a code reference to this action
+Returns a code reference to this action.
 
 =head2 dispatch( $c )
 
 Dispatch this action against a context
 
-=cut
-
-sub dispatch {    # Execute ourselves against a context
-    my ( $self, $c ) = @_;
-    local $c->namespace = $self->namespace;
-    return $c->execute( $self->class, $self );
-}
-
 =head2 execute( $controller, $c, @args )
 
 Execute this action's coderef against a given controller with a given
 context and arguments
 
-=cut
-
-sub execute {
-  my $self = shift;
-  $self->{code}->(@_);
-}
-
 =head2 match( $c )
 
 Check Args attribute, and makes sure number of args matches the setting.
-
-=cut
-
-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;
-}
+Always returns true if Args is omitted.
 
 =head2 namespace
 
@@ -96,15 +136,17 @@ Returns the private path for this action.
 
 returns the sub name of this action.
 
-=head1 AUTHOR
+=head2 meta
 
-Matt S. Trout
+Provided by Moose
+
+=head1 AUTHORS
+
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;