X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FRegex.pm;h=0d6da04b2f05bef060b5c84ae47a0b4cd19618cd;hp=0b2264d0954bd55d3945227ddeb09184e0c5530c;hb=48d435ba6a0925260fd58c8c18ff425e99708eae;hpb=615bfadf17b568b98fe61ac76a19767c90f9f58a

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index 0b2264d..0d6da04 100644
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -2,10 +2,19 @@ package Catalyst::DispatchType::Regex;
 
 use Moose;
 extends 'Catalyst::DispatchType::Path';
+
 use Text::SimpleTable;
+use Catalyst::Utils;
 use Text::Balanced ();
 
-has _compiled => (is => 'rw', isa => 'ArrayRef', required => 1, default => sub{[]});
+has _compiled => (
+                  is => 'rw',
+                  isa => 'ArrayRef',
+                  required => 1,
+                  default => sub{ [] },
+                 );
+
+no Moose;
 
 =head1 NAME
 
@@ -13,10 +22,21 @@ Catalyst::DispatchType::Regex - Regex DispatchType
 
 =head1 SYNOPSIS
 
-See L<Catalyst>.
+See L<Catalyst::DispatchType>.
 
 =head1 DESCRIPTION
 
+Dispatch type managing path-matching behaviour using regexes.  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)
@@ -27,14 +47,18 @@ Output a table of all regex actions, and their private equivalent.
 
 sub list {
     my ( $self, $c ) = @_;
-    my @regexes = @{ $self->_compiled };
-    return unless @regexes;
-    my $re = Text::SimpleTable->new( [ 35, 'Regex' ], [ 36, 'Private' ] );
-    for my $regex ( @regexes ) {
+    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 $re = Text::SimpleTable->new(
+        [ $col1_width, 'Regex' ], [ $col2_width, 'Private' ]
+    );
+    for my $regex ( @{ $self->_compiled } ) {
         my $action = $regex->{action};
         $re->row( $regex->{path}, "/$action" );
     }
-    $c->log->debug( "Loaded Regex actions:\n" . $re->draw . "\n" );
+    $c->log->debug( "Loaded Regex actions:\n" . $re->draw . "\n" )
+      if ( @{ $self->_compiled } );
 }
 
 =head2 $self->match( $c, $path )
@@ -46,10 +70,10 @@ altering $c.
 
 =cut
 
-override match => sub {
+sub match {
     my ( $self, $c, $path ) = @_;
 
-    return if super();
+    return if $self->SUPER::match( $c, $path );
 
     # Check path against plain text first
 
@@ -66,7 +90,7 @@ override match => sub {
     }
 
     return 0;
-};
+}
 
 =head2 $self->register( $c, $action )
 
@@ -130,11 +154,13 @@ sub uri_for_action {
             my $final = '/';
             my @captures = @$captures;
             while (my ($front, $rest) = split(/\(/, $re, 2)) {
+                last unless defined $rest;
                 ($rest, $re) =
                     Text::Balanced::extract_bracketed("(${rest}", '(');
                 next REGEX unless @captures;
                 $final .= $front.shift(@captures);
             }
+            $final .= $re;
             next REGEX if @captures;
             return $final;
          }
@@ -142,16 +168,17 @@ sub uri_for_action {
     return undef;
 }
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Matt S Trout
-Sebastian Riedel, C<sri@cpan.org>
+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
 
+__PACKAGE__->meta->make_immutable;
+
 1;