Initial support for :Args attribute

[catagits/Catalyst-Runtime.git] / lib / Catalyst / DispatchType / Regex.pm

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index 120ae93..49f7636 100644 (file)
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -1,26 +1,55 @@
 package Catalyst::DispatchType::Regex;
 
 use strict;
-use base qw/Catalyst::DispatchType/;
+use base qw/Catalyst::DispatchType::Path/;
+use Text::SimpleTable;
 
-sub prepare_action {
-    my ($self, $c, $path) = @_;
+=head1 NAME
 
-    if ( my $action = $self->{paths}->{$path} ) {
-        $c->req->action($path);
-        $c->req->match($path);
-        $c->action($action);
-        $c->namespace($action->prefix);
-        return 1;
+Catalyst::DispatchType::Regex - Regex DispatchType
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=head2 $self->list($c)
+
+=cut
+
+sub list {
+    my ( $self, $c ) = @_;
+    my $re = Text::SimpleTable->new( [ 36, 'Regex' ], [ 37, 'Private' ] );
+    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} } );
+}
+
+=head2 $self->match( $c, $path )
+
+=cut
+
+sub match {
+    my ( $self, $c, $path ) = @_;
 
-    foreach my $compiled (@{$self->{compiled}||[]}) {
+    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});
+            next unless $compiled->{action}->match($c);
+            $c->req->action( $compiled->{path} );
             $c->req->match($path);
-            $c->req->snippets(\@snippets);
-            $c->action($compiled->{action});
-            $c->namespace($compiled->{action}->prefix);
+            $c->req->snippets( \@snippets );
+            $c->action( $compiled->{action} );
+            $c->namespace( $compiled->{action}->namespace );
             return 1;
         }
     }
@@ -28,19 +57,55 @@ sub prepare_action {
     return 0;
 }
 
-sub register_action {
+=head2 $self->register( $c, $action )
+
+=cut
+
+sub register {
     my ( $self, $c, $action ) = @_;
     my $attrs = $action->attributes;
-    my @register = map { @{$_ || []} } @{$attrs}{'Regex', 'Regexp'};
+    my @register = map { @{ $_ || [] } } @{$attrs}{ 'Regex', 'Regexp' };
+    foreach
+      my $r ( map { @{ $_ || [] } } @{$attrs}{ 'LocalRegex', 'LocalRegexp' } )
+    {
+        unless ( $r =~ s/^\^// ) { $r = "(?:.*?)$r"; }
+        push( @register, '^' . $action->namespace . '/' . $r );
+    }
+
     foreach my $r (@register) {
-        $self->{paths}{$r} = $action;
-        push(@{$self->{compiled}},
-            {
-                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;
+}
+
+=head2 $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,
+        }
+    );
 }
 
+=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;