Implement :indexes option for static

croservices · Mar 10, 2018 · 937d8f2 · 937d8f2
1 parent 49c656d
commit 937d8f2
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/lib/Cro/HTTP/Router.pm6 b/lib/Cro/HTTP/Router.pm6
@@ -939,7 +939,7 @@ module Cro::HTTP::Router {
         $resp.append-header('Cache-Control', $cache);
     }
 
-    sub static(IO() $base, *@path, :$mime-types) is export {
+    sub static(IO() $base, *@path, :$mime-types, :@indexes) is export {
         my $resp = $*CRO-ROUTER-RESPONSE //
             die X::Cro::HTTP::Router::OnlyInHandler.new(:what<route>);
         my $child = '.';
@@ -953,7 +953,19 @@ module Cro::HTTP::Router {
 
         my sub get_or_404($path) {
             if $path.e {
-                content $content-type, slurp($path, :bin);
+                if $path.d {
+                    for @indexes {
+                        my $index = $path.add($_);
+                        if $index.e {
+                            content $content-type, slurp($index, :bin);
+                            return;
+                        }
+                    }
+                    $resp.status = 404;
+                    return;
+                } else {
+                    content $content-type, slurp($path, :bin);
+                }
             } else {
                 $resp.status = 404;
             }

diff --git a/t/http-router.t b/t/http-router.t
@@ -1845,4 +1845,50 @@ throws-like { response }, X::Cro::HTTP::Router::OnlyInHandler, what => 'response
     }
 }
 
+{
+    my $app = route {
+        get -> {
+            static 't/samples/', :indexes(['index.xhtml']);
+        }
+
+        get -> 'index-plain' {
+            static 't/samples/', :indexes(['index.html', 'index.xhtml']);
+        }
+        get -> 'index-extended' {
+            static 't/samples/', :indexes(['index.xhtml', 'index.html']);
+        }
+        get -> 'no-index' {
+            static 't/samples/', :indexes([]);
+        }
+    }
+    my $source = Supplier.new;
+    my $responses = $app.transformer($source.Supply).Channel;
+    my $req = Cro::HTTP::Request.new(method => 'GET', target => '/');
+    $source.emit($req);
+    given $responses.receive -> $r {
+        is body-text($r), "<HTML>Extended</HTML>\n", 'Get value from index';
+        is $r.status, 200, 'Static sets correct status code';
+    }
+
+    $req = Cro::HTTP::Request.new(method => 'GET', target => '/index-plain');
+    $source.emit($req);
+    given $responses.receive -> $r {
+        is body-text($r), "<HTML></HTML>\n", 'static indexes order check, 1';
+        is $r.status, 200, 'Good status';
+    }
+
+    $req = Cro::HTTP::Request.new(method => 'GET', target => '/index-extended');
+    $source.emit($req);
+    given $responses.receive -> $r {
+        is body-text($r), "<HTML>Extended</HTML>\n", 'static indexes order check, 2';
+        is $r.status, 200, 'Good status';
+    }
+
+    $req = Cro::HTTP::Request.new(method => 'GET', target => '/no-index');
+    $source.emit($req);
+    given $responses.receive -> $r {
+        is $r.status, 404, 'No candidate served with empty indexes';
+    }
+}
+
 done-testing;
diff --git a/t/samples/index.xhtml b/t/samples/index.xhtml
@@ -0,0 +1 @@
+<HTML>Extended</HTML>