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=4469a1d6474932bd06c9d8753f7a3c930332af85;hb=05b47f2e6357bc7f1622e6b2cf730ad5bbeb993f;hpb=6680c772eaa987eafdb32e9437fd2d649dc914d9

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 4469a1d..0eb9942 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -6,11 +6,11 @@ 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.
@@ -18,6 +18,9 @@ L<Catalyst::Controller> subclasses.
 =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');
@@ -26,38 +29,32 @@ 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(@_); }; },
 
+    # Which action takes precedence
+    'cmp' => 'compare',
+    '<=>' => 'compare',
+
     # 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 {
@@ -68,7 +65,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];
@@ -76,6 +73,22 @@ sub match {
     return scalar( @{ $c->req->args } ) == $args;
 }
 
+sub sort_order {
+    my $self = shift;
+
+    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;
@@ -127,13 +140,13 @@ returns the sub name of this action.
 
 Provided by Moose
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Matt S. Trout
+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