Make WrapMiddlewares public

This will help configuring sets for post routing middlewares.

Author: ant0ine

rest/handler.go

@@ -42,9 +42,9 @@ type ResourceHandler struct {
 
 	// Optional global middlewares that can be used to wrap the all REST endpoints.
 	// They are used in the defined order, the first wrapping the second, ...
+	// They are run pre REST routing, request.PathParams is not set yet.
 	// They can be used for instance to manage CORS or authentication.
 	// (see the CORS example in go-json-rest-example)
-	// They are run pre REST routing, request.PathParams is not set yet.
 	PreRoutingMiddlewares []Middleware
 
 	// Custom logger for the access log,
@@ -96,9 +96,9 @@ func (rh *ResourceHandler) SetRoutes(routes ...*Route) error {
 	return nil
 }
 
+// Instantiate all the middlewares.
 func (rh *ResourceHandler) instantiateMiddlewares() {
 
-	// instantiate all the middlewares
 	middlewares := []Middleware{
 		// log as the first, depend on timer and recorder.
 		&logMiddleware{
@@ -132,11 +132,11 @@ func (rh *ResourceHandler) instantiateMiddlewares() {
 	)
 
 	rh.handlerFunc = rh.adapter(
-		wrapMiddlewares(middlewares, rh.app()),
+		WrapMiddlewares(middlewares, rh.app()),
 	)
 }
 
-// Middleware that handles the transition between http and rest objects.
+// Handle the transition between http and rest objects.
 func (rh *ResourceHandler) adapter(handler HandlerFunc) http.HandlerFunc {
 	return func(origWriter http.ResponseWriter, origRequest *http.Request) {
 

rest/middleware.go

@@ -9,9 +9,10 @@ type Middleware interface {
 	MiddlewareFunc(handler HandlerFunc) HandlerFunc
 }
 
-// wrapMiddlewares calls the MiddlewareFunc in the reverse order and returns an HandlerFunc ready
-// to be executed.
-func wrapMiddlewares(middlewares []Middleware, handler HandlerFunc) HandlerFunc {
+// WrapMiddlewares calls the MiddlewareFunc methods in the reverse order and returns an HandlerFunc
+// ready to be executed. This can be used to wrap a set of middlewares, post routing, on a per Route
+// basis.
+func WrapMiddlewares(middlewares []Middleware, handler HandlerFunc) HandlerFunc {
 	wrapped := handler
 	for i := len(middlewares) - 1; i >= 0; i-- {
 		wrapped = middlewares[i].MiddlewareFunc(wrapped)

rest/middleware_test.go

@@ -34,7 +34,7 @@ func TestWrapMiddlewares(t *testing.T) {
 		// do nothing
 	}
 
-	handlerFunc := wrapMiddlewares([]Middleware{a, b, c}, app)
+	handlerFunc := WrapMiddlewares([]Middleware{a, b, c}, app)
 
 	// fake request
 	r := &Request{