X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FPath.pm;h=56c1083632ffabc24e98b38088157f6aa62a3583;hp=93d300a8e139d6ba94b9772e98544326ff2483ca;hb=536bee890cf24e0e4bcda7562e7b70cc03ca0620;hpb=2f3812528068bc1d9f7840067f0c03d36cd47e6d

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 93d300a..56c1083 100644
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -4,7 +4,9 @@ use Moose;
 extends 'Catalyst::DispatchType';
 
 use Text::SimpleTable;
+use Catalyst::Utils;
 use URI;
+use Scalar::Util ();
 
 has _paths => (
                is => 'rw',
@@ -21,10 +23,21 @@ Catalyst::DispatchType::Path - Path DispatchType
 
 =head1 SYNOPSIS
 
-See L<Catalyst>.
+See L<Catalyst::DispatchType>.
 
 =head1 DESCRIPTION
 
+Dispatch type managing full path matching behaviour.  For more information on
+dispatch types, see:
+
+=over 4
+
+=item * L<Catalyst::Manual::Intro> for how they affect application authors
+
+=item * L<Catalyst::DispatchType> for implementation information.
+
+=back
+
 =head1 METHODS
 
 =head2 $self->list($c)
@@ -35,7 +48,10 @@ Debug output for Path dispatch points
 
 sub list {
     my ( $self, $c ) = @_;
-    my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] );
+    my $column_width = Catalyst::Utils::term_width() - 35 - 9;
+    my $paths = Text::SimpleTable->new( 
+       [ 35, 'Path' ], [ $column_width, 'Private' ]
+    );
     foreach my $path ( sort keys %{ $self->_paths } ) {
         my $display_path = $path eq '/' ? $path : "/$path";
         foreach my $action ( @{ $self->_paths->{$path} } ) {
@@ -46,6 +62,16 @@ sub list {
       if ( keys %{ $self->_paths } );
 }
 
+sub _action_args_sort_order {
+    my ( $self, $action ) = @_;
+
+    my ($args) = @{ $action->attributes->{Args} || [] };
+
+    return $args if Scalar::Util::looks_like_number($args);
+
+    return ~0;
+}
+
 =head2 $self->match( $c, $path )
 
 For each action registered to this exact path, offers the action a chance to
@@ -59,7 +85,12 @@ sub match {
 
     $path = '/' if !defined $path || !length $path;
 
-    foreach my $action ( @{ $self->_paths->{$path} || [] } ) {
+    # sort from least args to most
+    my @actions = sort { $self->_action_args_sort_order($a) <=>
+                         $self->_action_args_sort_order($b) }
+            @{ $self->_paths->{$path} || [] };
+
+    foreach my $action ( @actions ) {
         next unless $action->match($c);
         $c->req->action($path);
         $c->req->match($path);
@@ -134,7 +165,7 @@ 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