X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FRegex.pm;h=94702974a1f4fdb8072f2601a401e3a714c1056e;hb=c7a54b4e7f6f28245075dd165fdbf7269ffa9d59;hp=38b2513de47de66926e07b5002742a8da85a132d;hpb=694d15f1f6031de10d1ecb047b9e66dd0982e3a3;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index 38b2513..9470297 100644
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -16,9 +16,9 @@ See L<Catalyst>.
 
 =head1 METHODS
 
-=over 4
+=head2 $self->list($c)
 
-=item $self->list($c)
+Output a table of all regex actions, and their private equivalent.
 
 =cut
 
@@ -33,7 +33,10 @@ sub list {
       if ( @{ $self->{compiled} } );
 }
 
-=item $self->match( $c, $path )
+=head2 $self->match( $c, $path )
+
+Check path against compiled regexes, and set action to any matching
+action. Returns 1 on success and 0 on failure.
 
 =cut
 
@@ -46,6 +49,7 @@ sub match {
 
     foreach my $compiled ( @{ $self->{compiled} || [] } ) {
         if ( my @snippets = ( $path =~ $compiled->{re} ) ) {
+            next unless $compiled->{action}->match($c);
             $c->req->action( $compiled->{path} );
             $c->req->match($path);
             $c->req->snippets( \@snippets );
@@ -58,30 +62,33 @@ sub match {
     return 0;
 }
 
-=item $self->register( $c, $action )
+=head2 $self->register( $c, $action )
+
+Registers one or more regex actions for an action object.\
+Also registers them as literal paths.
+
+Returns 1 on if any regexps were registered.
 
 =cut
 
 sub register {
     my ( $self, $c, $action ) = @_;
     my $attrs = $action->attributes;
-    my @register = map { @{ $_ || [] } } @{$attrs}{ 'Regex', 'Regexp' };
-    foreach
-      my $r ( map { @{ $_ || [] } } @{$attrs}{ 'LocalRegex', 'LocalRegexp' } )
-    {
-        unless ( $r =~ s/^\^// ) { $r = "(?:.*?)$r"; }
-        push( @register, '^' . $action->namespace . '/' . $r );
-    }
+    my @register = @{ $attrs->{'Regex'} || [] };
 
     foreach my $r (@register) {
         $self->register_path( $c, $r, $action );
         $self->register_regex( $c, $r, $action );
     }
+
     return 1 if @register;
     return 0;
 }
 
-=item $self->register_regex($c, $re, $action)
+=head2 $self->register_regex($c, $re, $action)
+
+Register an individual regex on the action. Usually called from the 
+register action.
 
 =cut
 
@@ -97,8 +104,6 @@ sub register_regex {
     );
 }
 
-=back
-
 =head1 AUTHOR
 
 Matt S Trout