X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FPath.pm;h=38719ea7beddf7e6aa57acb07d927c80d3bdf803;hb=807303a1658f895c41417beba24d24ff9b71c194;hp=bff5f212f0cc37397265da4e7394d3fd77c2894b;hpb=5299fff8fe52a4f4c10698b258984e41a2f6964f;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index bff5f21..38719ea 100644
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -6,6 +6,7 @@ extends 'Catalyst::DispatchType';
 use Text::SimpleTable;
 use Catalyst::Utils;
 use URI;
+use Encode 2.21 'decode_utf8';
 
 has _paths => (
                is => 'rw',
@@ -47,13 +48,21 @@ Debug output for Path dispatch points
 
 sub list {
     my ( $self, $c ) = @_;
-    my $column_width = Catalyst::Utils::term_width() - 35 - 9;
+    my $avail_width = Catalyst::Utils::term_width() - 9;
+    my $col1_width = ($avail_width * .50) < 35 ? 35 : int($avail_width * .50);
+    my $col2_width = $avail_width - $col1_width;
     my $paths = Text::SimpleTable->new(
-       [ 35, 'Path' ], [ $column_width, 'Private' ]
+       [ $col1_width, 'Path' ], [ $col2_width, 'Private' ]
     );
     foreach my $path ( sort keys %{ $self->_paths } ) {
-        my $display_path = $path eq '/' ? $path : "/$path";
         foreach my $action ( @{ $self->_paths->{$path} } ) {
+            my $args  = $action->number_of_args;
+            my $parts = defined($args) ? '/*' x $args : '/...';
+
+            my $display_path = "/$path/$parts";
+            $display_path =~ s{/{1,}}{/}g;
+            $display_path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; # deconvert urlencoded for pretty view 
+            $display_path = decode_utf8 $display_path;  # URI does encoding
             $paths->row( $display_path, "/$action" );
         }
     }
@@ -119,7 +128,7 @@ sub register_path {
     $path =~ s{(?<=[^/])/+\z}{};
 
     $self->_paths->{$path} = [
-        sort { $a <=> $b } ($action, @{ $self->_paths->{$path} || [] })
+        sort { $a->compare($b) } ($action, @{ $self->_paths->{$path} || [] })
     ];
 
     return 1;