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=a32dfa5232a788350ccb59ec71edba0a7f217cee;hp=313a5c3d2f06cc1ba300ea4e89c04a48d085c543;hb=34d28dfd33574ce30aca69fb8700b61111d97b92;hpb=8c11318848e17f92027484614d393b6ebd365f7d

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index 313a5c3..a32dfa5 100644
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -16,25 +16,27 @@ 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
 
 sub list {
     my ( $self, $c ) = @_;
-    my $re = Text::SimpleTable->new( [ 36, 'Regex' ], [ 37, 'Private' ] );
+    my $re = Text::SimpleTable->new( [ 35, 'Regex' ], [ 36, 'Private' ] );
     for my $regex ( @{ $self->{compiled} } ) {
-        my $compiled = $regex->{re};
-        my $action   = $regex->{action};
-        $re->row( $compiled, "/$action" );
+        my $action = $regex->{action};
+        $re->row( $regex->{path}, "/$action" );
     }
     $c->log->debug( "Loaded Regex actions:\n" . $re->draw )
       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,10 +48,11 @@ sub match {
     # Check path against plain text first
 
     foreach my $compiled ( @{ $self->{compiled} || [] } ) {
-        if ( my @snippets = ( $path =~ $compiled->{re} ) ) {
+        if ( my @captures = ( $path =~ $compiled->{re} ) ) {
+            next unless $compiled->{action}->match($c);
             $c->req->action( $compiled->{path} );
             $c->req->match($path);
-            $c->req->snippets( \@snippets );
+            $c->req->captures( \@captures );
             $c->action( $compiled->{action} );
             $c->namespace( $compiled->{action}->namespace );
             return 1;
@@ -59,31 +62,47 @@ 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' };
+    my $attrs    = $action->attributes;
+    my @register = @{ $attrs->{'Regex'} || [] };
+
     foreach my $r (@register) {
-        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#,
-                action => $action,
-                path   => $r,
-            }
-        );
+        $self->register_path( $c, $r, $action );
+        $self->register_regex( $c, $r, $action );
     }
+
+    return 1 if @register;
+    return 0;
 }
 
-=back
+=head2 $self->register_regex($c, $re, $action)
+
+Register an individual regex on the action. Usually called from the 
+register action.
+
+=cut
+
+sub register_regex {
+    my ( $self, $c, $re, $action ) = @_;
+    push(
+        @{ $self->{compiled} },    # and compiled regex for us
+        {
+            re     => qr#$re#,
+            action => $action,
+            path   => $re,
+        }
+    );
+}
 
 =head1 AUTHOR