Merge pull request #117 from cmcaine/recurse-a-bit-less

Fix stack overflows with page(func, func)

src/routing.jl

@@ -35,14 +35,17 @@ function matchpath!(target, req)
   return true
 end
 
-route(p, app...) = branch(req -> matchpath!(p, req), app...)
+route(p::Vector, app...) = branch(req -> matchpath!(p, req), app...)
 route(p::AbstractString, app...) = route(splitpath(p), app...)
+route(app...) = route([], app...)
 route(app::Function, p) = route(p, app)
+route(app1::Function, app2::Function) = route([], app1, app2)
 
 page(p::Vector, app...) = branch(req -> length(p) == length(req[:path]) && matchpath!(p, req), app...)
 page(p::AbstractString, app...) = page(splitpath(p), app...)
 page(app...) = page([], app...)
 page(app::Function, p) = page(p, app)
+page(app1::Function, app2::Function) = page([], app1, app2)
 
 # Query routing
 

test/runtests.jl

@@ -67,3 +67,14 @@ serve(test, 8001)
 @test String(HTTP.get("http://localhost:8001/badurl";
                       status_exception=false).body) ==
              "Internal server error"
+
+# Test page and route are callable without a string argument
+# (previously the first two raised StackOverflowError)
+@test page(identity, identity) isa Function
+@test route(identity, identity) isa Function
+@test page(identity) isa Function
+@test route(identity) isa Function
+
+# Test you can pass the string last if you really want.
+@test page(identity, "") isa Function
+@test route(identity, "") isa Function