X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FWeb%2FDispatch.pm;h=9ed3912b74b0b19f7f2168712b0cc87a30a69a28;hb=481da1e202d4de54f3bf692e11ba912833ccc276;hp=4c922d665b3947cb18b8bdbb4e48e3fd45596887;hpb=75ad66d6b498a62a8ced06c4b4c404aa9533cf91;p=catagits%2FWeb-Simple.git

diff --git a/lib/Web/Dispatch.pm b/lib/Web/Dispatch.pm
index 4c922d6..9ed3912 100644
--- a/lib/Web/Dispatch.pm
+++ b/lib/Web/Dispatch.pm
@@ -28,16 +28,18 @@ sub _build__parser {
 
 sub call {
   my ($self, $env) = @_;
-  $self->_dispatch($env, $self->app);
+  my $res = $self->_dispatch($env, $self->app);
+  return $res->[0] if ref($res) eq 'ARRAY' and @{$res} == 1 and ref($res->[0]) eq 'CODE';
+  return $res;
 }
 
 sub _dispatch {
   my ($self, $env, @match) = @_;
-  while (my $try = shift @match) {
+  while (defined(my $try = shift @match)) {
 
     return $try if ref($try) eq 'ARRAY';
     if (ref($try) eq 'HASH') {
-      $env = { %$env, %$try };
+      $env = { 'Web::Dispatch.original_env' => $env, %$env, %$try };
       next;
     }
 
@@ -46,17 +48,10 @@ sub _dispatch {
 
     my $first = $result[0];
 
-    return $self->_unpack_array_match( $first )
-      if ref($first) eq 'ARRAY';
+    if (my $res = $self->_have_result($first, \@result, \@match, $env)) {
 
-    return $self->_prepare_middleware( $first, \@result )
-      if blessed($first) && $first->isa('Plack::Middleware');
-
-    return $self->_unwrap_middleware( $first, \@match, $env )
-      if ref($first) eq 'HASH' and $first->{+MAGIC_MIDDLEWARE_KEY};
-
-    return $first
-      if blessed($first) && !$first->can('to_app');
+      return $res;
+    }
 
     # make a copy so we don't screw with it assigning further up
     my $env = $env;
@@ -66,14 +61,30 @@ sub _dispatch {
   return;
 }
 
-sub _unpack_array_match {
-  my ( $self, $match ) = @_;
-  return $match->[0] if @{$match} == 1 and ref($match->[0]) eq 'CODE';
-  return $match;
+sub _have_result {
+  my ($self, $first, $result, $match, $env) = @_;
+
+  if (ref($first) eq 'ARRAY') {
+    return $first;
+  }
+  elsif (blessed($first) && $first->isa('Plack::Middleware')) {
+    return $self->_uplevel_middleware($first, $result);
+  }
+  elsif (ref($first) eq 'HASH' and $first->{+MAGIC_MIDDLEWARE_KEY}) {
+    return $self->_redispatch_with_middleware($first, $match, $env);
+  }
+  elsif (
+    blessed($first) &&
+    not($first->can('to_app')) &&
+    not($first->isa('Web::Dispatch::Matcher'))
+  ) {
+    return $first;
+  }
+  return;
 }
 
-sub _prepare_middleware {
-  my ( $self, $match, $results ) = @_;
+sub _uplevel_middleware {
+  my ($self, $match, $results) = @_;
   die "Multiple results but first one is a middleware ($match)"
     if @{$results} > 1;
   # middleware needs to uplevel exactly once to wrap the rest of the
@@ -81,8 +92,8 @@ sub _prepare_middleware {
   return { MAGIC_MIDDLEWARE_KEY, $match };
 }
 
-sub _unwrap_middleware {
-  my ( $self, $first, $match, $env ) = @_;
+sub _redispatch_with_middleware {
+  my ($self, $first, $match, $env) = @_;
 
   my $mw = $first->{+MAGIC_MIDDLEWARE_KEY};
 
@@ -93,18 +104,31 @@ sub _unwrap_middleware {
 
 sub _to_try {
   my ($self, $try, $more) = @_;
+
+  # sub (<spec>) {}      becomes a dispatcher
+  # sub {}               is a PSGI app and can be returned as is
+  # '<spec>' => sub {}   becomes a dispatcher
+  # $obj isa WD:Predicates::Proxy => sub { ... } -  become a dispatcher
+  # $obj w/to_app method is a Plack::App-like thing - call it to get a PSGI app
+  #
+
   if (ref($try) eq 'CODE') {
     if (defined(my $proto = prototype($try))) {
-      $self->_construct_node(
-        match => $self->_parser->parse($proto), run => $try
-      )->to_app;
+      $self->_construct_node(match => $proto, run => $try)->to_app;
     } else {
       $try
     }
   } elsif (!ref($try) and ref($more->[0]) eq 'CODE') {
-    $self->_construct_node(
-      match => $self->_parser->parse($try), run => shift(@$more)
-    )->to_app;
+    $self->_construct_node(match => $try, run => shift(@$more))->to_app;
+  } elsif (
+    (blessed($try) && $try->isa('Web::Dispatch::Matcher'))
+    and (ref($more->[0]) eq 'CODE')
+  ) {
+    $self->node_class->new({
+      %{$self->node_args},
+      match => $try,
+      run => shift(@$more)
+    })->to_app;
   } elsif (blessed($try) && $try->can('to_app')) {
     $try->to_app;
   } else {
@@ -114,6 +138,7 @@ sub _to_try {
 
 sub _construct_node {
   my ($self, %args) = @_;
+  $args{match} = $self->_parser->parse($args{match});
   $self->node_class->new({ %{$self->node_args}, %args });
 }