- Added LocalRegex, tweaked Regex debug output

diff --git a/lib/Catalyst/DispatchType/LocalRegex.pm b/lib/Catalyst/DispatchType/LocalRegex.pm
new file mode 100644 (file)
index 0000000..3483371
--- /dev/null
+++ b/lib/Catalyst/DispatchType/LocalRegex.pm
@@ -0,0 +1,109 @@
+package Catalyst::DispatchType::Regex;
+
+use strict;
+use base qw/Catalyst::DispatchType::Path/;
+use Text::SimpleTable;
+
+=head1 NAME
+
+Catalyst::DispatchType::Regex - Regex DispatchType
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=over 4
+
+=item $self->list($c)
+
+=cut
+
+sub list {
+    my ( $self, $c ) = @_;
+    my $re = Text::SimpleTable->new( [ 36, 'Regex' ], [ 37, 'Private' ] );
+    for my $regex ( @{ $self->{compiled} } ) {
+        my $compiled = $regex->{re};
+        my $action   = $regex->{action};
+        $re->row( $compiled, "/$action" );
+    }
+    $c->log->debug( "Loaded Regex actions:\n" . $re->draw )
+      if ( @{ $self->{compiled} } );
+}
+
+=item $self->match( $c, $path )
+
+=cut
+
+sub match {
+    my ( $self, $c, $path ) = @_;
+
+    return if $self->SUPER::match( $c, $path );
+
+    # Check path against plain text first
+
+    foreach my $compiled ( @{ $self->{compiled} || [] } ) {
+        if ( my @snippets = ( $path =~ $compiled->{re} ) ) {
+            $c->req->action( $compiled->{path} );
+            $c->req->match($path);
+            $c->req->snippets( \@snippets );
+            $c->action( $compiled->{action} );
+            $c->namespace( $compiled->{action}->namespace );
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+=item $self->register( $c, $action )
+
+=cut
+
+sub register {
+    my ( $self, $c, $action ) = @_;
+    my $attrs = $action->attributes;
+    my @register = map { @{ $_ || [] } } @{$attrs}{ 'Regex', 'Regexp' };
+    foreach my $r (@register) {
+        unless ( $r =~ /^\^/ ) {    # Relative regex
+            $r = '^' . $action->namespace . '/' . $r;
+        }
+        $self->register_path($c, $r, $action);
+        $self->register_regex($c, $r, $action);
+    }
+}
+
+=item $self->register_regex($c, $re, $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,
+        }
+    );
+}
+
+=back
+
+=head1 AUTHOR
+
+Matt S Trout
+Sebastian Riedel, C<sri@cpan.org>
+
+=head1 COPYRIGHT
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
+
+1;

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index 411cd4c..def40e8 100644 (file)
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -26,9 +26,8 @@ sub list {
     my ( $self, $c ) = @_;
     my $re = Text::SimpleTable->new( [ 36, 'Regex' ], [ 37, 'Private' ] );
     for my $regex ( @{ $self->{compiled} } ) {
-        my $compiled = $regex->{re};
         my $action   = $regex->{action};
-        $re->row( $compiled, "/$action" );
+        $re->row( $regex->{path}, "/$action" );
     }
     $c->log->debug( "Loaded Regex actions:\n" . $re->draw )
       if ( @{ $self->{compiled} } );