X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FRegex.pm;h=4a2780117cad643f807884874381c01e855b8761;hb=2982e768f25cf78c0cab330b2d61acd850d5e760;hp=520e038987fe3c4d2bfd28afad1d11f4317ca27b;hpb=27708fc5f90d4794f082348049ac894f58224fad;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm index 520e038..4a27801 100644 --- a/lib/Catalyst/DispatchType/Regex.pm +++ b/lib/Catalyst/DispatchType/Regex.pm @@ -18,6 +18,8 @@ See L. =head2 $self->list($c) +Output a table of all regex actions, and their private equivalent. + =cut sub list { @@ -33,6 +35,9 @@ sub list { =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 sub match { @@ -43,11 +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,6 +64,11 @@ sub match { =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 { @@ -77,6 +87,9 @@ sub register { =head2 $self->register_regex($c, $re, $action) +Register an individual regex on the action. Usually called from the +register action. + =cut sub register_regex {