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=4d8d28abd5cd606ad3b8ccfac056322279c02e18;hp=3fbc04c8c8bddf417e7f4ac664e2703bc32bf31c;hb=2f3812528068bc1d9f7840067f0c03d36cd47e6d;hpb=b2b90ec28d4f51ef6e86e5acc2abb1dc92446147 diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm index 3fbc04c..4d8d28a 100644 --- a/lib/Catalyst/DispatchType/Regex.pm +++ b/lib/Catalyst/DispatchType/Regex.pm @@ -1,10 +1,20 @@ package Catalyst::DispatchType::Regex; -use strict; -use base qw/Catalyst::DispatchType::Path/; +use Moose; +extends 'Catalyst::DispatchType::Path'; + use Text::SimpleTable; use Text::Balanced (); +has _compiled => ( + is => 'rw', + isa => 'ArrayRef', + required => 1, + default => sub{ [] }, + ); + +no Moose; + =head1 NAME Catalyst::DispatchType::Regex - Regex DispatchType @@ -26,12 +36,12 @@ Output a table of all regex actions, and their private equivalent. sub list { my ( $self, $c ) = @_; my $re = Text::SimpleTable->new( [ 35, 'Regex' ], [ 36, 'Private' ] ); - for my $regex ( @{ $self->{compiled} } ) { + for my $regex ( @{ $self->_compiled } ) { my $action = $regex->{action}; $re->row( $regex->{path}, "/$action" ); } - $c->log->debug( "Loaded Regex actions:\n" . $re->draw ) - if ( @{ $self->{compiled} } ); + $c->log->debug( "Loaded Regex actions:\n" . $re->draw . "\n" ) + if ( @{ $self->_compiled } ); } =head2 $self->match( $c, $path ) @@ -50,7 +60,7 @@ sub match { # Check path against plain text first - foreach my $compiled ( @{ $self->{compiled} || [] } ) { + foreach my $compiled ( @{ $self->_compiled } ) { if ( my @captures = ( $path =~ $compiled->{re} ) ) { next unless $compiled->{action}->match($c); $c->req->action( $compiled->{path} ); @@ -90,7 +100,7 @@ sub register { =head2 $self->register_regex($c, $re, $action) -Register an individual regex on the action. Usually called from the +Register an individual regex on the action. Usually called from the register method. =cut @@ -98,7 +108,7 @@ register method. sub register_regex { my ( $self, $c, $re, $action ) = @_; push( - @{ $self->{compiled} }, # and compiled regex for us + @{ $self->_compiled }, # and compiled regex for us { re => qr#$re#, action => $action, @@ -139,10 +149,9 @@ sub uri_for_action { return undef; } -=head1 AUTHOR +=head1 AUTHORS -Matt S Trout -Sebastian Riedel, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT @@ -151,4 +160,6 @@ the same terms as Perl itself. =cut +__PACKAGE__->meta->make_immutable; + 1;