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=a1224c594212cc4f65701bcf84de698af6c15381;hp=120ae93fd0811a9baa313d9bc80f4e2d88735f59;hb=11bd4e3eaa29685c44318041381621e79c4a5f44;hpb=b96f127f47d826a5bb8ebebc80f1b46ab3497e39

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index 120ae93..a1224c5 100644
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -1,26 +1,60 @@
 package Catalyst::DispatchType::Regex;
 
 use strict;
-use base qw/Catalyst::DispatchType/;
+use base qw/Catalyst::DispatchType::Path/;
+use Text::ASCIITable;
 
-sub prepare_action {
-    my ($self, $c, $path) = @_;
+=head1 NAME
 
-    if ( my $action = $self->{paths}->{$path} ) {
-        $c->req->action($path);
-        $c->req->match($path);
-        $c->action($action);
-        $c->namespace($action->prefix);
-        return 1;
+Catalyst::DispatchType::Regex - Regex DispatchType
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=over 4
+
+=item $self->list($c)
+
+=cut
+
+sub list {
+    my ( $self, $c ) = @_;
+    my $re = Text::ASCIITable->new;
+    $re->setCols( 'Regex', 'Private' );
+    $re->setColWidth( 'Regex',   36, 1 );
+    $re->setColWidth( 'Private', 37, 1 );
+    for my $regex ( @{ $self->{compiled} } ) {
+        my $compiled = $regex->{re};
+        my $action   = $regex->{action};
+        $re->addRow( $compiled, "/$action" );
     }
+    $c->log->debug( "Loaded Regex actions:\n" . $re->draw )
+      if ( @{ $re->{tbl_rows} } );
+}
+
+=item $self->match( $c, $path )
+
+=cut
 
-    foreach my $compiled (@{$self->{compiled}||[]}) {
+sub match {
+    my ( $self, $c, $path ) = @_;
+
+    return if $self->SUPER::match( $c, $path );
+
+    # Check path against plain text first
+
+    foreach my $compiled ( @{ $self->{compiled} || [] } ) {
         if ( my @snippets = ( $path =~ $compiled->{re} ) ) {
-            $c->req->action($compiled->{path});
+            $c->req->action( $compiled->{path} );
             $c->req->match($path);
-            $c->req->snippets(\@snippets);
-            $c->action($compiled->{action});
-            $c->namespace($compiled->{action}->prefix);
+            $c->req->snippets( \@snippets );
+            $c->action( $compiled->{action} );
+            $c->namespace( $compiled->{action}->namespace );
             return 1;
         }
     }
@@ -28,19 +62,39 @@ sub prepare_action {
     return 0;
 }
 
-sub register_action {
+=item $self->register( $c, $action )
+
+=cut
+
+sub register {
     my ( $self, $c, $action ) = @_;
     my $attrs = $action->attributes;
-    my @register = map { @{$_ || []} } @{$attrs}{'Regex', 'Regexp'};
+    my @register = map { @{ $_ || [] } } @{$attrs}{ 'Regex', 'Regexp' };
     foreach my $r (@register) {
-        $self->{paths}{$r} = $action;
-        push(@{$self->{compiled}},
+        $self->{paths}{$r} = $action;    # Register path for superclass
+        push(
+            @{ $self->{compiled} },      # and compiled regex for us
             {
-                re => qr#$r#,
+                re     => qr#$r#,
                 action => $action,
-                path => $r,
-            } );
+                path   => $r,
+            }
+        );
     }
 }
 
+=back
+
+=head1 AUTHOR
+
+Matt S Trout
+Sebastian Riedel, C<sri@cpan.org>
+
+=head1 COPYRIGHT
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
+
 1;