X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=3b4b758906ca6b3ae90d8f6f55b467f3c944c238;hb=c679d24243fa5c592d42afa6c6628c1182944bac;hp=f0701564f2ba53557e01c28a28fb56f672df9664;hpb=b768faa35b3efe1bcc0ac3dfd2ec7085565d3d03;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index f070156..3b4b758 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -68,96 +68,12 @@ sub action {
     $_[1] ? ( $action = {@_} ) : ( $action = shift );
     if ( ref $action eq 'HASH' ) {
         while ( my ( $name, $code ) = each %$action ) {
-            my $prefix = '';
-            my $class  = caller(0);
-            if ( $name =~ /^\?(.*)$/ ) {
-                my $prefix = $1 || '';
-                $name = $2;
-                $name = $prefix . _prefix( $class, $name );
-                $self->actions->{plain}->{$name} = [ $class, $code ];
-            }
-            if ( $name =~ /^\/(.*)\/$/ ) {
-                my $regex = $1;
-                $self->actions->{compiled}->{qr#$regex#} = $name;
-                $self->actions->{regex}->{$name} = [ $class, $code ];
-            }
-            elsif ( $name =~ /^\!(.*)$/ ) {
-                $name = $1;
-                my $parent  = $self->tree;
-                my $visitor = Tree::Simple::Visitor::FindByPath->new;
-                $prefix = _class2prefix($class);
-                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);
-                        $child = $visitor->getResult;
-                    }
-                    $parent = $child;
-                }
-                my $uid = $parent->getUID;
-                $self->actions->{private}->{$uid}->{$name} = [ $class, $code ];
-                $name = "!$name";
-            }
-            else { $self->actions->{plain}->{$name} = [ $class, $code ] }
-            my $reverse = $prefix ? "$name ($prefix)" : $name;
-            $self->actions->{reverse}->{"$code"} = $reverse;
-            $self->log->debug(qq/"$class" defined "$name" as "$code"/)
-              if $self->debug;
+            $self->set_action( $name, $code, caller(0) );
         }
     }
     return 1;
 }
 
-=item $c->find_action( $name, $namespace )
-
-Find an action in a given namespace.
-
-=cut
-
-sub find_action {
-    my ( $c, $action, $namespace ) = @_;
-    $namespace ||= '';
-    if ( $action =~ /^\!(.*)/ ) {
-        $action = $1;
-        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;
-        for my $part ( split '/', $namespace ) {
-            $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;
-            push @results, [$match] if $match;
-            $parent = $child if $child;
-        }
-        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};
-            if ( $action =~ $regex ) {
-                my @snippets;
-                for my $i ( 1 .. 9 ) {
-                    no strict 'refs';
-                    last unless ${$i};
-                    push @snippets, ${$i};
-                }
-                return [ [ $c->actions->{regex}->{$name}, $name, \@snippets ] ];
-            }
-        }
-    }
-    return [];
-}
-
 =item $c->benchmark($coderef)
 
 Takes a coderef with arguments and returns elapsed time as float.
@@ -383,7 +299,8 @@ sub forward {
     if ( $command =~ /^\!/ ) {
         $namespace = _class2prefix($caller);
     }
-    if ( my $results = $c->find_action( $command, $namespace ) ) {
+    my $results = $c->get_action( $command, $namespace );
+    if ( @{$results} ) {
         if ( $command =~ /^\!/ ) {
             for my $result ( @{$results} ) {
                 my ( $class, $code ) = @{ $result->[0] };
@@ -411,6 +328,7 @@ sub forward {
         my $method = shift || 'process';
         if ( my $code = $class->can($method) ) {
             $c->actions->{reverse}->{"$code"} = "$class->$method";
+            $class = $c->comp($class) || $class;
             $c->state( $c->process( $class, $code ) );
         }
         else {
@@ -422,38 +340,84 @@ sub forward {
     return $c->state;
 }
 
-=item $c->handler($r)
+=item $c->get_action( $action, $namespace )
+
+Get an action in a given namespace.
+
+=cut
+
+sub get_action {
+    my ( $c, $action, $namespace ) = @_;
+    $namespace ||= '';
+    if ( $action =~ /^\!(.*)/ ) {
+        $action = $1;
+        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;
+        for my $part ( split '/', $namespace ) {
+            $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;
+            push @results, [$match] if $match;
+            $parent = $child if $child;
+        }
+        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};
+            if ( $action =~ $regex ) {
+                my @snippets;
+                for my $i ( 1 .. 9 ) {
+                    no strict 'refs';
+                    last unless ${$i};
+                    push @snippets, ${$i};
+                }
+                return [ [ $c->actions->{regex}->{$name}, $name, \@snippets ] ];
+            }
+        }
+    }
+    return [];
+}
+
+=item $c->handler( $class, $r )
 
 Handles the request.
 
 =cut
 
-sub handler {
+sub handler ($$) {
     my ( $class, $r ) = @_;
 
     # Always expect worst case!
     my $status = -1;
     eval {
         my $handler = sub {
-            my $c      = $class->prepare($r);
-            my $action = $c->req->action;
-            my $name   = '';
-            $name = join '/', @{ $c->req->args } if $action eq '!default';
-            unless ($name) {
-                if ( my $result = $c->find_action($action) ) {
-                    $name = _class2prefix( $result->[0]->[0]->[0] );
+            my $c         = $class->prepare($r);
+            my $action    = $c->req->action;
+            my $namespace = '';
+            $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->find_action( $action, $name );
+            my $results = $c->get_action( $action, $namespace );
             if ( @{$results} ) {
-                for my $begin ( @{ $c->find_action( '!begin', $name ) } ) {
-                    $c->process( @{ $begin->[0] } );
+                for my $begin ( @{ $c->get_action( '!begin', $namespace ) } ) {
+                    $c->state( $c->process( @{ $begin->[0] } ) );
                 }
-                for my $result ( @{ $c->find_action( $action, $name ) } ) {
-                    $c->process( @{ $result->[0] } );
+                for my $result ( @{ $c->get_action( $action, $namespace ) } ) {
+                    $c->state( $c->process( @{ $result->[0] } ) );
                 }
-                for my $end ( @{ $c->find_action( '!end', $name ) } ) {
-                    $c->process( @{ $end->[0] } );
+                for my $end ( @{ $c->get_action( '!end', $namespace ) } ) {
+                    $c->state( $c->process( @{ $end->[0] } ) );
                 }
             }
             else {
@@ -518,8 +482,8 @@ sub prepare {
     }
     $c->prepare_request($r);
     $c->prepare_path;
-    $c->prepare_cookies;
     $c->prepare_headers;
+    $c->prepare_cookies;
     $c->prepare_connection;
     my $method   = $c->req->method   || '';
     my $path     = $c->req->path     || '';
@@ -555,7 +519,7 @@ sub prepare_action {
     $c->req->args( \my @args );
     while (@path) {
         $path = join '/', @path;
-        if ( my $result = ${ $c->find_action($path) }[0] ) {
+        if ( my $result = ${ $c->get_action($path) }[0] ) {
 
             # It's a regex
             if ($#$result) {
@@ -586,7 +550,7 @@ sub prepare_action {
       if ( $c->debug && @args );
 }
 
-=item $c->prepare_connection;
+=item $c->prepare_connection
 
 Prepare connection.
 
@@ -594,7 +558,7 @@ Prepare connection.
 
 sub prepare_connection { }
 
-=item $c->prepare_cookies;
+=item $c->prepare_cookies
 
 Prepare cookies.
 
@@ -674,6 +638,14 @@ sub process {
     return $status;
 }
 
+=item $c->run
+
+Starts the engine.
+
+=cut
+
+sub run { }
+
 =item $c->request
 
 =item $c->req
@@ -690,6 +662,59 @@ Returns a C<Catalyst::Response> object.
 
     my $res = $c->res;
 
+=item $c->set_action( $action, $code, $namespace )
+
+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 ];
+    }
+    if ( $action =~ /^\/(.*)\/$/ ) {
+        my $regex = $1;
+        $c->actions->{compiled}->{qr#$regex#} = $action;
+        $c->actions->{regex}->{$action} = [ $namespace, $code ];
+    }
+    elsif ( $action =~ /^\!(.*)$/ ) {
+        $action = $1;
+        my $parent  = $c->tree;
+        my $visitor = Tree::Simple::Visitor::FindByPath->new;
+        $prefix = _class2prefix($namespace);
+        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);
+                $child = $visitor->getResult;
+            }
+            $parent = $child;
+        }
+        my $uid = $parent->getUID;
+        $c->actions->{private}->{$uid}->{$action} = [ $namespace, $code ];
+        $action = "!$action";
+    }
+    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"/)
+      if $c->debug;
+}
+
 =item $class->setup
 
 Setup.