X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=c092d500bd1635508f4cfbd9aa3969a4ecf6f993;hb=4400b5efc1c3db0fe5657ab73f1628e1d7f1b02a;hp=52949217fed473e64cce72fd64b4434892d33ae6;hpb=b333ca6bc3db5fed3310074236b8ff2b1ad2a81b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 5294921..c092d50 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -21,7 +21,7 @@ __PACKAGE__->mk_classdata($_) for qw/actions components tree/;
 __PACKAGE__->mk_accessors(qw/request response state/);
 
 __PACKAGE__->actions(
-    { plain => {}, private => {}, regex => {}, compiled => {}, reverse => {} }
+    { plain => {}, private => {}, regex => {}, compiled => [], reverse => {} }
 );
 __PACKAGE__->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
 
@@ -48,32 +48,6 @@ See L<Catalyst>.
 
 =over 4
 
-=item $c->action( $name => $coderef, ... )
-
-Add one or more actions.
-
-    $c->action( '!foo' => sub { $_[1]->res->output('Foo!') } );
-
-It also automatically calls setup() if needed.
-
-See L<Catalyst::Manual::Intro> for more informations about actions.
-
-=cut
-
-sub action {
-    my $self = shift;
-    $self->setup unless $self->components;
-    $self->actions( {} ) unless $self->actions;
-    my $action;
-    $_[1] ? ( $action = {@_} ) : ( $action = shift );
-    if ( ref $action eq 'HASH' ) {
-        while ( my ( $name, $code ) = each %$action ) {
-            $self->set_action( $name, $code, caller(0) );
-        }
-    }
-    return 1;
-}
-
 =item $c->benchmark($coderef)
 
 Takes a coderef with arguments and returns elapsed time as float.
@@ -153,7 +127,9 @@ sub finalize {
     if ( my $location = $c->res->redirect ) {
         $c->log->debug(qq/Redirecting to "$location"/) if $c->debug;
         $c->res->headers->header( Location => $location );
+        $c->res->headers->remove_content_headers;
         $c->res->status(302);
+        return $c->finalize_headers;
     }
 
     if ( !$c->res->output || $#{ $c->error } >= 0 ) {
@@ -273,11 +249,11 @@ sub finalize_output { }
 
 =item $c->forward($command)
 
-Forward processing to a private/public action or a method from a class.
+Forward processing to a private action or a method from a class.
 If you define a class without method it will default to process().
 
-    $c->forward('!foo');
-    $c->forward('index.html');
+    $c->forward('/foo');
+    $c->forward('index');
     $c->forward(qw/MyApp::Model::CDBI::Foo do_stuff/);
     $c->forward('MyApp::View::TT');
 
@@ -290,27 +266,16 @@ sub forward {
         $c->log->debug('Nothing to forward to') if $c->debug;
         return 0;
     }
-    my $caller = caller(0);
-    if ( $command =~ /^\?(.*)$/ ) {
-        $command = $1;
-        $command = _prefix( $caller, $command );
-    }
-    my $namespace = '';
-    if ( $command =~ /^\!/ ) {
-        $namespace = _class2prefix($caller);
+    my $caller    = caller(0);
+    my $namespace = '/';
+    if ( $command =~ /^\// ) {
+        $command =~ /^(.*)\/(\w+)$/;
+        $namespace = $1 || '/';
+        $command = $2;
     }
+    else { $namespace = _class2prefix($caller) || '/' }
     my $results = $c->get_action( $command, $namespace );
-    if ( @{$results} ) {
-        unless ( $command =~ /^\!/ ) {
-            $results = [ pop @{$results} ];
-            if ( $results->[0]->[2] ) {
-                $c->log->debug(qq/Couldn't forward "$command" to regex action/)
-                  if $c->debug;
-                return 0;
-            }
-        }
-    }
-    else {
+    unless ( @{$results} ) {
         my $class = $command;
         if ( $class =~ /[^\w\:]/ ) {
             $c->log->debug(qq/Couldn't forward to "$class"/) if $c->debug;
@@ -328,7 +293,7 @@ sub forward {
         }
     }
     for my $result ( @{$results} ) {
-        $c->state( $c->process( @{ $result->[0] } ) );
+        $c->state( $c->execute( @{ $result->[0] } ) );
     }
     return $c->state;
 }
@@ -342,34 +307,30 @@ Get an action in a given namespace.
 sub get_action {
     my ( $c, $action, $namespace ) = @_;
     $namespace ||= '';
-    if ( $action =~ /^\!(.*)/ ) {
-        $action = $1;
+    if ($namespace) {
+        $namespace = '' if $namespace eq '/';
         my $parent = $c->tree;
         my @results;
         my $result = $c->actions->{private}->{ $parent->getUID }->{$action};
         push @results, [$result] if $result;
         my $visitor = Tree::Simple::Visitor::FindByPath->new;
-        my $local;
         for my $part ( split '/', $namespace ) {
-            $local = undef;
             $visitor->setSearchPath($part);
             $parent->accept($visitor);
             my $child = $visitor->getResult;
             my $uid   = $child->getUID if $child;
             my $match = $c->actions->{private}->{$uid}->{$action} if $uid;
-            return [ [$match] ] if ( $match && $match =~ /^?.*/ );
-            $local = $c->actions->{private}->{$uid}->{"?$action"} if $uid;
             push @results, [$match] if $match;
             $parent = $child if $child;
         }
-        return [ [$local] ] if $local;
         return \@results;
     }
     elsif ( my $p = $c->actions->{plain}->{$action} ) { return [ [$p] ] }
     elsif ( my $r = $c->actions->{regex}->{$action} ) { return [ [$r] ] }
     else {
-        for my $regex ( keys %{ $c->actions->{compiled} } ) {
-            my $name = $c->actions->{compiled}->{$regex};
+        for my $i ( 0 .. $#{ $c->actions->{compiled} } ) {
+            my $name  = $c->actions->{compiled}->[$i]->[0];
+            my $regex = $c->actions->{compiled}->[$i]->[1];
             if ( $action =~ $regex ) {
                 my @snippets;
                 for my $i ( 1 .. 9 ) {
@@ -400,23 +361,28 @@ sub handler ($$) {
             my $c         = $class->prepare($r);
             my $action    = $c->req->action;
             my $namespace = '';
-            $namespace = join '/', @{ $c->req->args } if $action eq '!default';
+            $namespace = ( join( '/', @{ $c->req->args } ) || '/' )
+              if $action eq 'default';
             unless ($namespace) {
                 if ( my $result = $c->get_action($action) ) {
                     $namespace = _class2prefix( $result->[0]->[0]->[0] );
                 }
             }
-            my $results = $c->get_action( $action, $namespace );
+            my $default = $action eq 'default' ? $namespace : undef;
+            my $results = $c->get_action( $action, $default );
+            $namespace ||= '/';
             if ( @{$results} ) {
-                for my $begin ( @{ $c->get_action( '!begin', $namespace ) } ) {
-                    $c->state( $c->process( @{ $begin->[0] } ) );
+                for my $begin ( @{ $c->get_action( 'begin', $namespace ) } ) {
+                    $c->state( $c->execute( @{ $begin->[0] } ) );
                 }
-                for my $result ( @{ $c->get_action( $action, $namespace ) } ) {
-                    $c->state( $c->process( @{ $result->[0] } ) );
-                    last unless $action =~ /^\!.*/;
+                for my $result ( @{ $c->get_action( $action, $default ) }[-1] )
+                {
+                    $c->state( $c->execute( @{ $result->[0] } ) );
+                    last unless $default;
                 }
-                for my $end ( @{ $c->get_action( '!end', $namespace ) } ) {
-                    $c->state( $c->process( @{ $end->[0] } ) );
+                for my $end ( reverse @{ $c->get_action( 'end', $namespace ) } )
+                {
+                    $c->state( $c->execute( @{ $end->[0] } ) );
                 }
             }
             else {
@@ -543,7 +509,7 @@ sub prepare_action {
         unshift @args, pop @path;
     }
     unless ( $c->req->action ) {
-        $c->req->action('!default');
+        $c->req->action('default');
         $c->req->match('');
     }
     $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
@@ -606,14 +572,14 @@ Prepare uploads.
 
 sub prepare_uploads { }
 
-=item $c->process($class, $coderef)
+=item $c->execute($class, $coderef)
 
-Process a coderef in given class and catch exceptions.
+Execute a coderef in given class and catch exceptions.
 Errors are available via $c->error.
 
 =cut
 
-sub process {
+sub execute {
     my ( $c, $class, $code ) = @_;
     $class = $c->comp($class) || $class;
     $c->state(0);
@@ -663,52 +629,82 @@ Returns a C<Catalyst::Response> object.
 
     my $res = $c->res;
 
-=item $c->set_action( $action, $code, $namespace )
+=item $c->set_action( $action, $code, $namespace, $attrs )
 
 Set an action in a given namespace.
 
 =cut
 
 sub set_action {
-    my ( $c, $action, $code, $namespace ) = @_;
-    my $prefix = '';
-    if ( $action =~ /^\?(.*)$/ ) {
-        my $prefix = $1 || '';
-        $action = $2;
-        $action = $prefix . _prefix( $namespace, $action );
-        $c->actions->{plain}->{$action} = [ $namespace, $code ];
-    }
-    elsif ( $action =~ /^\/(.*)\/$/ ) {
-        my $regex = $1;
-        $c->actions->{compiled}->{qr#$regex#} = $action;
-        $c->actions->{regex}->{$action} = [ $namespace, $code ];
+    my ( $c, $method, $code, $namespace, $attrs ) = @_;
+
+    my $prefix = _class2prefix($namespace) || '';
+    my %flags;
+
+    for my $attr ( @{$attrs} ) {
+        if    ( $attr =~ /^(Local|Relative)$/ )        { $flags{local}++ }
+        elsif ( $attr =~ /^(Global|Absolute)$/ )       { $flags{global}++ }
+        elsif ( $attr =~ /^Path\((.+)\)$/i )           { $flags{path} = $1 }
+        elsif ( $attr =~ /^Private$/i )                { $flags{private}++ }
+        elsif ( $attr =~ /^(Regex|Regexp)\((.+)\)$/i ) { $flags{regex} = $2 }
     }
-    elsif ( $action =~ /^\!(.*)$/ ) {
-        $action = $1;
-        my $parent  = $c->tree;
-        my $visitor = Tree::Simple::Visitor::FindByPath->new;
-        $prefix = _class2prefix($namespace);
-        for my $part ( split '/', $prefix ) {
+
+    return unless keys %flags;
+
+    my $parent  = $c->tree;
+    my $visitor = Tree::Simple::Visitor::FindByPath->new;
+    for my $part ( split '/', $prefix ) {
+        $visitor->setSearchPath($part);
+        $parent->accept($visitor);
+        my $child = $visitor->getResult;
+        unless ($child) {
+            $child = $parent->addChild( Tree::Simple->new($part) );
             $visitor->setSearchPath($part);
             $parent->accept($visitor);
-            my $child = $visitor->getResult;
-            unless ($child) {
-                $child = $parent->addChild( Tree::Simple->new($part) );
-                $visitor->setSearchPath($part);
-                $parent->accept($visitor);
-                $child = $visitor->getResult;
-            }
-            $parent = $child;
+            $child = $visitor->getResult;
         }
-        my $uid = $parent->getUID;
-        $c->actions->{private}->{$uid}->{$action} = [ $namespace, $code ];
-        $action = "!$action";
+        $parent = $child;
     }
-    else { $c->actions->{plain}->{$action} = [ $namespace, $code ] }
-    my $reverse = $prefix ? "$action ($prefix)" : $action;
-    $c->actions->{reverse}->{"$code"} = $reverse;
-    $c->log->debug(qq/"$namespace" defined "$action" as "$code"/)
+    my $uid = $parent->getUID;
+    $c->actions->{private}->{$uid}->{$method} = [ $namespace, $code ];
+    my $forward = $prefix ? "$prefix/$method" : $method;
+    $c->log->debug(qq|Private "/$forward" is "$namespace->$method"|)
       if $c->debug;
+
+    if ( $flags{path} ) {
+        $flags{path} =~ s/^\w+//;
+        $flags{path} =~ s/\w+$//;
+        if ( $flags{path} =~ /^'(.*)'$/ ) { $flags{path} = $1 }
+        if ( $flags{path} =~ /^"(.*)"$/ ) { $flags{path} = $1 }
+    }
+    if ( $flags{regex} ) {
+        $flags{regex} =~ s/^\w+//;
+        $flags{regex} =~ s/\w+$//;
+        if ( $flags{regex} =~ /^'(.*)'$/ ) { $flags{regex} = $1 }
+        if ( $flags{regex} =~ /^"(.*)"$/ ) { $flags{regex} = $1 }
+    }
+
+    my $reverse = $prefix ? "$method ($prefix)" : $method;
+
+    if ( $flags{local} || $flags{global} || $flags{path} ) {
+        my $path = $flags{path} || $method;
+        my $absolute = 0;
+        if ( $path =~ /^\/(.+)/ ) {
+            $path     = $1;
+            $absolute = 1;
+        }
+        $absolute = 1 if $flags{global};
+        my $name = $absolute ? $path : "$prefix/$path";
+        $c->actions->{plain}->{$name} = [ $namespace, $code ];
+        $c->log->debug(qq|Public "/$name" is "/$forward"|) if $c->debug;
+    }
+    if ( my $regex = $flags{regex} ) {
+        push @{ $c->actions->{compiled} }, [ $regex, qr#$regex# ];
+        $c->actions->{regex}->{$regex} = [ $namespace, $code ];
+        $c->log->debug(qq|Public "$regex" is "/$forward"|) if $c->debug;
+    }
+
+    $c->actions->{reverse}->{"$code"} = $reverse;
 }
 
 =item $class->setup
@@ -728,6 +724,41 @@ sub setup {
     }
 }
 
+=item $class->setup_actions($component)
+
+Setup actions for a component.
+
+=cut
+
+sub setup_actions {
+    my ( $self, $comp ) = @_;
+    $comp = ref $comp || $comp;
+    for my $action ( @{ $comp->_cache } ) {
+        my ( $code, $attrs ) = @{$action};
+        my $name = '';
+        no strict 'refs';
+        my @cache = ( $comp, @{"$comp\::ISA"} );
+        my %namespaces;
+        while ( my $namespace = shift @cache ) {
+            $namespaces{$namespace}++;
+            for my $isa ( @{"$comp\::ISA"} ) {
+                next if $namespaces{$isa};
+                push @cache, $isa;
+                $namespaces{$isa}++;
+            }
+        }
+        for my $namespace ( keys %namespaces ) {
+            for my $sym ( values %{ $namespace . '::' } ) {
+                if ( *{$sym}{CODE} && *{$sym}{CODE} == $code ) {
+                    $name = *{$sym}{NAME};
+                    $self->set_action( $name, $code, $comp, $attrs );
+                    last;
+                }
+            }
+        }
+    }
+}
+
 =item $class->setup_components
 
 Setup components.
@@ -754,9 +785,11 @@ sub setup_components {
         $self->log->error(
             qq/Couldn't initialize "Module::Pluggable::Fast", "$error"/);
     }
+    $self->setup_actions($self);
     $self->components( {} );
-    for my $component ( $self->_components($self) ) {
-        $self->components->{ ref $component } = $component;
+    for my $comp ( $self->_components($self) ) {
+        $self->components->{ ref $comp } = $comp;
+        $self->setup_actions($comp);
     }
     $self->log->debug( 'Initialized components "'
           . join( ' ', keys %{ $self->components } )
@@ -787,16 +820,17 @@ sub stash {
 sub _prefix {
     my ( $class, $name ) = @_;
     my $prefix = _class2prefix($class);
-    warn "$class - $name - $prefix";
     $name = "$prefix/$name" if $prefix;
     return $name;
 }
 
 sub _class2prefix {
     my $class = shift || '';
-    $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/;
-    my $prefix = lc $2 || '';
-    $prefix =~ s/\:\:/\//g;
+    my $prefix;
+    if ( $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/ ) {
+        $prefix = lc $2;
+        $prefix =~ s/\:\:/\//g;
+    }
     return $prefix;
 }