Make Web::Dispatch return [$cv] as $cv to allow subref responses

[catagits/Web-Simple.git] / lib / Web / Dispatch.pm

diff --git a/lib/Web/Dispatch.pm b/lib/Web/Dispatch.pm
index 581cc04..d9e76ca 100644 (file)
--- a/lib/Web/Dispatch.pm
+++ b/lib/Web/Dispatch.pm
@@ -40,11 +40,16 @@ sub _dispatch {
     my @result = $self->_to_try($try, \@match)->($env, @match);
     next unless @result and defined($result[0]);
     if (ref($result[0]) eq 'ARRAY') {
+      if (@{$result[0]} == 1 and ref($result[0][0]) eq 'CODE') {
+        return $result[0][0];
+      }
       return $result[0];
-    } elsif (blessed($result[0]) && $result[0]->can('wrap')) {
-      return $result[0]->wrap(sub {
-        $self->_dispatch($_[0], @match)
-      })->($env);
+    } elsif (blessed($result[0]) && $result[0]->isa('Plack::Middleware')) {
+      die "Multiple results but first one is a middleware ($result[0])"
+        if @result > 1;
+      my $mw = $result[0];
+      $mw->app(sub { $self->_dispatch($_[0], @match) });
+      return $mw->to_app->($env);
     } elsif (blessed($result[0]) && !$result[0]->can('to_app')) {
       return $result[0];
     } else {