X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FRegex.pm;h=313a5c3d2f06cc1ba300ea4e89c04a48d085c543;hb=97d6d2bd519e8905980c19b641737e93d6e006f2;hp=8f99f75ef44609209c604dd47f694f0e30f804ae;hpb=6b23994966a2a66b90986a51e7e1d71f62d90f44;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index 8f99f75..313a5c3 100644
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -2,19 +2,56 @@ package Catalyst::DispatchType::Regex;
 
 use strict;
 use base qw/Catalyst::DispatchType::Path/;
+use Text::SimpleTable;
 
-sub prepare_action {
-    my ($self, $c, $path) = @_;
+=head1 NAME
 
-    return if $self->SUPER::prepare_action($c, $path);
+Catalyst::DispatchType::Regex - Regex DispatchType
 
-    foreach my $compiled (@{$self->{compiled}||[]}) {
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=over 4
+
+=item $self->list($c)
+
+=cut
+
+sub list {
+    my ( $self, $c ) = @_;
+    my $re = Text::SimpleTable->new( [ 36, 'Regex' ], [ 37, 'Private' ] );
+    for my $regex ( @{ $self->{compiled} } ) {
+        my $compiled = $regex->{re};
+        my $action   = $regex->{action};
+        $re->row( $compiled, "/$action" );
+    }
+    $c->log->debug( "Loaded Regex actions:\n" . $re->draw )
+      if ( @{ $self->{compiled} } );
+}
+
+=item $self->match( $c, $path )
+
+=cut
+
+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;
         }
     }
@@ -22,19 +59,42 @@ 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}},
+        unless ( $r =~ /^\^/ ) {    # Relative regex
+            $r = '^' . $action->namespace . '/' . $r;
+        }
+        $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;