X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FRegex.pm;h=a32dfa5232a788350ccb59ec71edba0a7f217cee;hb=1b1636b58ce5f1feabd0d125c3928c57e5a5cf3c;hp=94702974a1f4fdb8072f2601a401e3a714c1056e;hpb=4ab87e274ac0a05f98c10a4cdba467ba4398b0d3;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm index 9470297..a32dfa5 100644 --- a/lib/Catalyst/DispatchType/Regex.pm +++ b/lib/Catalyst/DispatchType/Regex.pm @@ -24,7 +24,7 @@ Output a table of all regex actions, and their private equivalent. 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 $action = $regex->{action}; $re->row( $regex->{path}, "/$action" ); @@ -48,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; @@ -73,7 +73,7 @@ Returns 1 on if any regexps were registered. sub register { my ( $self, $c, $action ) = @_; - my $attrs = $action->attributes; + my $attrs = $action->attributes; my @register = @{ $attrs->{'Regex'} || [] }; foreach my $r (@register) {