go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2024-11-24 08:22:21 +02:00
Code Issues Releases Activity

Fixed group middleware

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2016-02-20 08:11:02 -08:00
parent 19d51dad4c
commit b97a2c5ad6
3 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -12,3 +12,6 @@ script:
- go test -coverprofile=middleware.coverprofile ./middleware
- $HOME/gopath/bin/gover
- $HOME/gopath/bin/goveralls -coverprofile=gover.coverprofile -service=travis-ci
matrix:
allow_failures:
- go: tip

3
echo.go
View File

@ -349,9 +349,6 @@ func (e *Echo) Match(methods []string, path string, handler Handler, middleware
func (e *Echo) add(method, path string, handler Handler, middleware ...Middleware) {
name := handlerName(handler)
// middleware = append(e.middleware, middleware...)
// e.router.Add(method, path, handler, e)
e.router.Add(method, path, HandlerFunc(func(c Context) error {
for _, m := range middleware {
handler = m.Handle(handler)

60
group.go
View File

@ -12,54 +12,68 @@ func (g *Group) Use(m ...Middleware) {
g.middleware = append(g.middleware, m...)
}
func (g *Group) Connect(path string, h Handler) {
g.add(CONNECT, path, h)
func (g *Group) Connect(path string, h Handler, m ...Middleware) {
g.add(CONNECT, path, h, m...)
}
func (g *Group) Delete(path string, h Handler) {
g.add(DELETE, path, h)
func (g *Group) Delete(path string, h Handler, m ...Middleware) {
g.add(DELETE, path, h, m...)
}
func (g *Group) Get(path string, h Handler) {
g.add(GET, path, h)
func (g *Group) Get(path string, h Handler, m ...Middleware) {
g.add(GET, path, h, m...)
}
func (g *Group) Head(path string, h Handler) {
g.add(HEAD, path, h)
func (g *Group) Head(path string, h Handler, m ...Middleware) {
g.add(HEAD, path, h, m...)
}
func (g *Group) Options(path string, h Handler) {
g.add(OPTIONS, path, h)
func (g *Group) Options(path string, h Handler, m ...Middleware) {
g.add(OPTIONS, path, h, m...)
}
func (g *Group) Patch(path string, h Handler) {
g.add(PATCH, path, h)
func (g *Group) Patch(path string, h Handler, m ...Middleware) {
g.add(PATCH, path, h, m...)
}
func (g *Group) Post(path string, h Handler) {
g.add(POST, path, h)
func (g *Group) Post(path string, h Handler, m ...Middleware) {
g.add(POST, path, h, m...)
}
func (g *Group) Put(path string, h Handler) {
g.add(PUT, path, h)
func (g *Group) Put(path string, h Handler, m ...Middleware) {
g.add(PUT, path, h, m...)
}
func (g *Group) Trace(path string, h Handler) {
g.add(TRACE, path, h)
func (g *Group) Trace(path string, h Handler, m ...Middleware) {
g.add(TRACE, path, h, m...)
}
func (g *Group) Any(path string, handler Handler, middleware ...Middleware) {
for _, m := range methods {
g.add(m, path, handler, middleware...)
}
}
func (g *Group) Match(methods []string, path string, handler Handler, middleware ...Middleware) {
for _, m := range methods {
g.add(m, path, handler, middleware...)
}
}
func (g *Group) Group(prefix string, m ...Middleware) *Group {
return g.echo.Group(prefix, m...)
}
func (g *Group) add(method, path string, h Handler) {
func (g *Group) add(method, path string, handler Handler, middleware ...Middleware) {
path = g.prefix + path
name := handlerName(h)
name := handlerName(handler)
middleware = append(g.middleware, middleware...)
g.echo.router.Add(method, path, HandlerFunc(func(c Context) error {
for i := len(g.middleware) - 1; i >= 0; i-- {
h = g.middleware[i].Handle(h)
for _, m := range middleware {
handler = m.Handle(handler)
}
return h.Handle(c)
return handler.Handle(c)
}), g.echo)
r := Route{
Method: method,