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=fdb237c5d7575630be5abd6571b753c5fb7e9144;hp=97b9235a4f978abacefa73fa2069725cac69acd6;hb=4d38cb074da32815d87f1fb9fe7c03b761fdf15a;hpb=91955398bb1d5dba2bca876b1e21d2ea9b93919b

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 97b9235..fdb237c 100644
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -8,6 +8,8 @@ Catalyst::Action - Catalyst Action
 
     <form action="[%c.uri_for(c.action)%]">
 
+    $c->forward( $action->private_path );
+
 =head1 DESCRIPTION
 
 This class represents a Catalyst Action. You can access the object for the
@@ -28,6 +30,13 @@ has 'reverse' => (is => 'rw');
 has attributes => (is => 'rw');
 has name => (is => 'rw');
 has code => (is => 'rw');
+has private_path => (
+  reader => 'private_path',
+  isa => 'Str',
+  lazy => 1,
+  required => 1,
+  default => sub { '/'.shift->reverse },
+);
 
 use overload (
 
@@ -37,10 +46,6 @@ 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,
 
@@ -50,8 +55,6 @@ 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 ) = @_;
     return $c->execute( $self->class, $self );
@@ -73,20 +76,16 @@ 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;
+    my ($a1_args) = @{ $a1->attributes->{Args} || [] };
+    my ($a2_args) = @{ $a2->attributes->{Args} || [] };
+
+    $_ = looks_like_number($_) ? $_ : ~0
+        for $a1_args, $a2_args;
+
+    return $a1_args <=> $a2_args;
 }
 
 __PACKAGE__->meta->make_immutable;
@@ -104,7 +103,9 @@ and so on. This determines how the action is dispatched to.
 
 =head2 class
 
-Returns the class name where this action is defined.
+Returns the name of the component where this action is defined.
+Derived by calling the L<Catalyst::Component/_component_name|_component_name>
+method on each component.
 
 =head2 code
 
@@ -124,13 +125,10 @@ context and arguments
 Check Args attribute, and makes sure number of args matches the setting.
 Always returns true if Args is omitted.
 
-=head2 sort_order
-
-Returns the value of the C<Args> attribute, or C<~0> if it has no value.
-
 =head2 compare
 
-Returns C<< $a->sort_order <=> $b->sort_order >> .
+Compares 2 actions based on the value of the C<Args> attribute, with no C<Args>
+having the highest precedence.
 
 =head2 namespace
 
@@ -140,6 +138,11 @@ Returns the private namespace this action lives in.
 
 Returns the private path for this action.
 
+=head2 private_path
+
+Returns absolute private path for this action. Unlike C<reverse>, the
+C<private_path> of an action is always suitable for passing to C<forward>.
+
 =head2 name
 
 returns the sub name of this action.