1 files changed, 10 insertions, 8 deletions
diff --git a/router.go b/router.go
index abfee13..2d420d0 100644
--- a/router.go
+++ b/router.go
@@ -39,18 +39,20 @@ func (r *Router) Route(pattern string, handler Handler) {
 	r.routeAdded = true
 }
 
-// Handler matches against the request path and dipatches to a route handler.
+// Handler builds a Handler which matches the request path and dispatches to a route.
 //
-// If no route matches, it returns a nil response.
+// If no route matches, the handler returns a nil response.
 // Captured path parameters will be stored in the context passed into the handler
 // and can be retrieved with RouteParams().
-func (r Router) Handler(ctx context.Context, request *Request) *Response {
-	handler, params := r.Match(request)
-	if handler == nil {
-		return nil
-	}
+func (r Router) Handler() Handler {
+	return HandlerFunc(func(ctx context.Context, request *Request) *Response {
+		handler, params := r.Match(request)
+		if handler == nil {
+			return nil
+		}
 
-	return handler.Handle(context.WithValue(ctx, routeParamsKey, params), request)
+		return handler.Handle(context.WithValue(ctx, routeParamsKey, params), request)
+	})
 }
 
 // Match returns the matched handler and captured path parameters, or (nil, nil).