support streaming and real recurse

plack · Feb 17, 2010 · 5363186 · 5363186
1 parent 4512980
commit 5363186
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/lib/Plack/Middleware/Recursive.pm b/lib/Plack/Middleware/Recursive.pm
@@ -10,21 +10,37 @@ open my $null_io, "<", \"";
 sub call {
     my($self, $env) = @_;
 
-    $env->{'plack.recursive.include'} = $self->recurse_callback($env);
+    $env->{'plack.recursive.include'} = $self->recurse_callback($env, 1);
 
     my $res = try {
         $self->app->($env);
     } catch {
         if (blessed $_ && $_->isa('Plack::Recursive::ForwardRequest')) {
-            return $env->{'plack.recursive.include'}->($_->path);
+            return $self->recurse_callback($env)->($_->path);
         }
     };
 
-    return $res;
+    return $res if ref $res eq 'ARRAY';
+
+    return sub {
+        my $respond = shift;
+
+        my $writer;
+        try {
+            $res->(sub { return $writer = $respond->(@_) });
+        } catch {
+            if (!$writer && blessed $_ && $_->isa('Plack::Recursive::ForwardRequest')) {
+                $res = $self->recurse_callback($env)->($_->path);
+                return ref $res eq 'CODE' ? $res->($respond) : $respond->($res);
+            } else {
+                die $_;
+            }
+        };
+    };
 }
 
 sub recurse_callback {
-    my($self, $env) = @_;
+    my($self, $env, $include) = @_;
 
     my $old_path_info = $env->{PATH_INFO};
 
@@ -40,9 +56,9 @@ sub recurse_callback {
         $env->{CONTENT_LENGTH} = 0;
         $env->{CONTENT_TYPE}   = '';
         $env->{'psgi.input'}   = $null_io;
-        $env->{'plack.recursive.old_path_info'} = $old_path_info;
+        push @{$env->{'plack.recursive.old_path_info'}}, $old_path_info;
 
-        $self->app->($env);
+        $include ? $self->app->($env) : $self->call($env);
     };
 }
 

diff --git a/t/Plack-Middleware/recursive/base.t b/t/Plack-Middleware/recursive/base.t
@@ -10,7 +10,7 @@ my $app = sub {
     my $env = shift;
 
     if ($env->{PATH_INFO} eq '/forwarded') {
-        is $env->{'plack.recursive.old_path_info'}, '/';
+        is_deeply $env->{'plack.recursive.old_path_info'}, [ '/' ];
         return [ 200, [ 'Content-Type', 'text/plain' ], [ "Hello $env->{QUERY_STRING}" ] ];
     }
 

diff --git a/t/Plack-Middleware/recursive/streaming.t b/t/Plack-Middleware/recursive/streaming.t
@@ -9,7 +9,7 @@ my $app = sub {
     my $env = shift;
 
     if ($env->{PATH_INFO} eq '/forwarded') {
-        is $env->{'plack.recursive.old_path_info'}, '/';
+        is_deeply $env->{'plack.recursive.old_path_info'}, [ '/' ];
         return sub { $_[0]->([ 200, [ 'Content-Type', 'text/plain' ], [ "Hello $env->{QUERY_STRING}" ] ]) };
     }
 

diff --git a/t/Plack-Middleware/recursive/throw.t b/t/Plack-Middleware/recursive/throw.t
@@ -8,9 +8,11 @@ use Plack::Middleware::Recursive;
 my $app = sub {
     my $env = shift;
 
-    if ($env->{PATH_INFO} eq '/forwarded') {
-        is $env->{'plack.recursive.old_path_info'}, '/';
+    if ($env->{PATH_INFO} eq '/forwarded2') {
+        is_deeply $env->{'plack.recursive.old_path_info'}, [ '/', '/forwarded' ];
         return [ 200, [ 'Content-Type', 'text/plain' ], [ "Hello $env->{QUERY_STRING}" ] ];
+    } elsif ($env->{PATH_INFO} eq '/forwarded') {
+        Plack::Recursive::ForwardRequest->throw("/forwarded2?q=bar");
     }
 
     Plack::Recursive::ForwardRequest->throw("/forwarded?q=bar");