blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-15 04:57:07 +08:00
Code Issues Projects Releases Wiki Activity

Return HandlerChain from Routes()

Browse Source
This commit is contained in:
superatrain 2020-10-02 11:24:59 -04:00
parent 540b1eff70
commit 76811fa6f3
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gin.go
View File

@ -42,10 +42,11 @@ func (c HandlersChain) Last() HandlerFunc {
// RouteInfo represents a request route's specification which contains method and path and its handler. // RouteInfo represents a request route's specification which contains method and path and its handler.
type RouteInfo struct { type RouteInfo struct {
Method string Method string
Path string Path string
Handler string Handler string
HandlerFunc HandlerFunc HandlerFunc HandlerFunc
HandlersChain []HandlerFunc
} }
// RoutesInfo defines a RouteInfo array. // RoutesInfo defines a RouteInfo array.
@ -287,10 +288,11 @@ func iterate(path, method string, routes RoutesInfo, root *node) RoutesInfo {
if len(root.handlers) > 0 { if len(root.handlers) > 0 {
handlerFunc := root.handlers.Last() handlerFunc := root.handlers.Last()
routes = append(routes, RouteInfo{ routes = append(routes, RouteInfo{
Method: method, Method: method,
Path: path, Path: path,
Handler: nameOfFunction(handlerFunc), Handler: nameOfFunction(handlerFunc),
HandlerFunc: handlerFunc, HandlerFunc: handlerFunc,
HandlersChain: root.handlers,
}) })
} }
for _, child := range root.children { for _, child := range root.children {

42
gin_test.go
View File

@ -444,7 +444,11 @@ func TestListOfRoutes(t *testing.T) {
{ {
group.GET("/", handlerTest2) group.GET("/", handlerTest2)
group.GET("/:id", handlerTest1) group.GET("/:id", handlerTest1)
group.POST("/:id", handlerTest2) }
postGroup := group.Group("")
postGroup.Use(handlerTest1)
{
postGroup.POST("/:id", handlerTest2)
} }
router.Static("/static", ".") router.Static("/static", ".")
@ -452,29 +456,34 @@ func TestListOfRoutes(t *testing.T) {
assert.Len(t, list, 7) assert.Len(t, list, 7)
assertRoutePresent(t, list, RouteInfo{ assertRoutePresent(t, list, RouteInfo{
Method: "GET", Method: "GET",
Path: "/favicon.ico", Path: "/favicon.ico",
Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$", Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$",
HandlersChain: []HandlerFunc{handlerTest1},
}) })
assertRoutePresent(t, list, RouteInfo{ assertRoutePresent(t, list, RouteInfo{
Method: "GET", Method: "GET",
Path: "/", Path: "/",
Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$", Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$",
HandlersChain: []HandlerFunc{handlerTest1},
}) })
assertRoutePresent(t, list, RouteInfo{ assertRoutePresent(t, list, RouteInfo{
Method: "GET", Method: "GET",
Path: "/users/", Path: "/users/",
Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest2$", Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest2$",
HandlersChain: []HandlerFunc{handlerTest2},
}) })
assertRoutePresent(t, list, RouteInfo{ assertRoutePresent(t, list, RouteInfo{
Method: "GET", Method: "GET",
Path: "/users/:id", Path: "/users/:id",
Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$", Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$",
HandlersChain: []HandlerFunc{handlerTest1},
}) })
assertRoutePresent(t, list, RouteInfo{ assertRoutePresent(t, list, RouteInfo{
Method: "POST", Method: "POST",
Path: "/users/:id", Path: "/users/:id",
Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest2$", Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest2$",
HandlersChain: []HandlerFunc{handlerTest1, handlerTest2},
}) })
} }
@ -535,6 +544,7 @@ func TestEngineHandleContextManyReEntries(t *testing.T) {
func assertRoutePresent(t *testing.T, gotRoutes RoutesInfo, wantRoute RouteInfo) { func assertRoutePresent(t *testing.T, gotRoutes RoutesInfo, wantRoute RouteInfo) {
for _, gotRoute := range gotRoutes { for _, gotRoute := range gotRoutes {
if gotRoute.Path == wantRoute.Path && gotRoute.Method == wantRoute.Method { if gotRoute.Path == wantRoute.Path && gotRoute.Method == wantRoute.Method {
assert.ObjectsAreEqualValues(gotRoute.HandlersChain, wantRoute.HandlersChain)
assert.Regexp(t, wantRoute.Handler, gotRoute.Handler) assert.Regexp(t, wantRoute.Handler, gotRoute.Handler)
return return
} }