Merge pull request revel#886 from revel/bug/reverse-route-wildcard

brendensoares · brendensoares · commit d5f968d2e195 · 2015-03-01T22:57:37.000-08:00
Fixes wildcard reverse routing logic and adds test
diff --git a/router.go b/router.go
@@ -375,7 +375,7 @@ func (router *Router) Reverse(action string, argValues map[string]string) *Actio
 			pathElements = strings.Split(route.Path, "/")
 		)
 		for i, el := range pathElements {
-			if el == "" || el[0] != ':' {
+			if el == "" || (el[0] != ':' && el[0] != '*') {
 				continue
 			}
 
diff --git a/router_test.go b/router_test.go
@@ -32,13 +32,20 @@ var routeTestCases = map[string]*Route{
 		FixedParams: []string{},
 	},
 
-	`get /apps/:appId/ Application.Show`: &Route{
+	`get /app/:appId/ Application.Show`: &Route{
 		Method:      "GET",
-		Path:        `/apps/:appId/`,
+		Path:        `/app/:appId/`,
 		Action:      "Application.Show",
 		FixedParams: []string{},
 	},
 
+	`get /app-wild/*appId/ Application.WildShow`: &Route{
+		Method:      "GET",
+		Path:        `/app-wild/*appId/`,
+		Action:      "Application.WildShow",
+		FixedParams: []string{},
+	},
+
 	`GET /public/:filepath   Static.Serve("public")`: &Route{
 		Method: "GET",
 		Path:   "/public/:filepath",
@@ -107,6 +114,7 @@ const TEST_ROUTES = `
 GET   /                          Application.Index
 GET   /test/                     Application.Index("Test", "Test2")
 GET   /app/:id/                  Application.Show
+GET   /app-wild/*id/             Application.WildShow
 POST  /app/:id                   Application.Save
 PATCH /app/:id/                  Application.Update
 GET   /javascript/:filepath      Static.Serve("public/js")
@@ -316,6 +324,16 @@ var reverseRoutingTestCases = map[*ReverseRouteArgs]*ActionDefinition{
 		Star:   false,
 		Action: "Application.Save",
 	},
+
+	&ReverseRouteArgs{
+		action: "Application.WildShow",
+		args:   map[string]string{"id": "123"},
+	}: &ActionDefinition{
+		Url:    "/app-wild/123/",
+		Method: "GET",
+		Star:   false,
+		Action: "Application.WildShow",
+	},
 }
 
 func TestReverseRouting(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ func (router Router) Reverse(action string, argValues map[string]string) Actio`
`375`	`375`	`pathElements = strings.Split(route.Path, "/")`
`376`	`376`	`)`
`377`	`377`	`for i, el := range pathElements {`
`378`		`- if el == "" \|\| el[0] != ':' {`
	`378`	`+ if el == "" \|\| (el[0] != ':' && el[0] != '*') {`
`379`	`379`	`continue`
`380`	`380`	`}`
`381`	`381`