Add gowww/router

Author: Arthur White

bench_test.go

@@ -174,6 +174,12 @@ func BenchmarkGorillaMux_Param(b *testing.B) {
 	r, _ := http.NewRequest("GET", "/user/gordon", nil)
 	benchRequest(b, router, r)
 }
+func BenchmarkGowwwRouter_Param(b *testing.B) {
+	router := loadGowwwRouterSingle("GET", "/user/:name", http.HandlerFunc(httpHandlerFunc))
+
+	r, _ := http.NewRequest("GET", "/user/gordon", nil)
+	benchRequest(b, router, r)
+}
 func BenchmarkHttpRouter_Param(b *testing.B) {
 	router := loadHttpRouterSingle("GET", "/user/:name", httpRouterHandle)
 
@@ -361,6 +367,12 @@ func BenchmarkGorillaMux_Param5(b *testing.B) {
 	r, _ := http.NewRequest("GET", fiveRoute, nil)
 	benchRequest(b, router, r)
 }
+func BenchmarkGowwwRouter_Param5(b *testing.B) {
+	router := loadGowwwRouterSingle("GET", fiveColon, http.HandlerFunc(httpHandlerFunc))
+
+	r, _ := http.NewRequest("GET", fiveRoute, nil)
+	benchRequest(b, router, r)
+}
 func BenchmarkHttpRouter_Param5(b *testing.B) {
 	router := loadHttpRouterSingle("GET", fiveColon, httpRouterHandle)
 
@@ -547,6 +559,12 @@ func BenchmarkGorillaMux_Param20(b *testing.B) {
 	r, _ := http.NewRequest("GET", twentyRoute, nil)
 	benchRequest(b, router, r)
 }
+func BenchmarkGowwwRouter_Param20(b *testing.B) {
+	router := loadGowwwRouterSingle("GET", twentyColon, http.HandlerFunc(httpHandlerFunc))
+
+	r, _ := http.NewRequest("GET", twentyRoute, nil)
+	benchRequest(b, router, r)
+}
 func BenchmarkHttpRouter_Param20(b *testing.B) {
 	router := loadHttpRouterSingle("GET", twentyColon, httpRouterHandle)
 
@@ -735,6 +753,12 @@ func BenchmarkHttpRouter_ParamWrite(b *testing.B) {
 	r, _ := http.NewRequest("GET", "/user/gordon", nil)
 	benchRequest(b, router, r)
 }
+func BenchmarkGowwwRouter_ParamWrite(b *testing.B) {
+	router := loadGowwwRouterSingle("GET", "/user/:name", http.HandlerFunc(gowwwRouterHandleWrite))
+
+	r, _ := http.NewRequest("GET", "/user/gordon", nil)
+	benchRequest(b, router, r)
+}
 func BenchmarkHttpTreeMux_ParamWrite(b *testing.B) {
 	router := loadHttpTreeMuxSingle("GET", "/user/:name", httpTreeMuxHandlerWrite)
 

github_test.go

@@ -287,6 +287,7 @@ var (
 	githubGoJsonRest  http.Handler
 	githubGoRestful   http.Handler
 	githubGorillaMux  http.Handler
+	githubGowwwRouter http.Handler
 	githubHttpRouter  http.Handler
 	githubHttpTreeMux http.Handler
 	githubKocha       http.Handler
@@ -347,6 +348,9 @@ func init() {
 	calcMem("GorillaMux", func() {
 		githubGorillaMux = loadGorillaMux(githubAPI)
 	})
+	calcMem("GowwwRouter", func() {
+		githubGowwwRouter = loadGowwwRouter(githubAPI)
+	})
 	calcMem("HttpRouter", func() {
 		githubHttpRouter = loadHttpRouter(githubAPI)
 	})
@@ -456,6 +460,10 @@ func BenchmarkHttpRouter_GithubStatic(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/user/repos", nil)
 	benchRequest(b, githubHttpRouter, req)
 }
+func BenchmarkGowwwRouter_GithubStatic(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/user/repos", nil)
+	benchRequest(b, githubGowwwRouter, req)
+}
 func BenchmarkHttpTreeMux_GithubStatic(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/user/repos", nil)
 	benchRequest(b, githubHttpTreeMux, req)
@@ -571,6 +579,10 @@ func BenchmarkGorillaMux_GithubParam(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
 	benchRequest(b, githubGorillaMux, req)
 }
+func BenchmarkGowwwRouter_GithubParam(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
+	benchRequest(b, githubGowwwRouter, req)
+}
 func BenchmarkHttpRouter_GithubParam(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
 	benchRequest(b, githubHttpRouter, req)
@@ -677,6 +689,9 @@ func BenchmarkGoRestful_GithubAll(b *testing.B) {
 func BenchmarkGorillaMux_GithubAll(b *testing.B) {
 	benchRoutes(b, githubGorillaMux, githubAPI)
 }
+func BenchmarkGowwwRouter_GithubAll(b *testing.B) {
+	benchRoutes(b, githubGowwwRouter, githubAPI)
+}
 func BenchmarkHttpRouter_GithubAll(b *testing.B) {
 	benchRoutes(b, githubHttpRouter, githubAPI)
 }

gplus_test.go

@@ -49,6 +49,7 @@ var (
 	gplusGoJsonRest  http.Handler
 	gplusGoRestful   http.Handler
 	gplusGorillaMux  http.Handler
+	gplusGowwwRouter http.Handler
 	gplusHttpRouter  http.Handler
 	gplusHttpTreeMux http.Handler
 	gplusKocha       http.Handler
@@ -109,6 +110,9 @@ func init() {
 	calcMem("GorillaMux", func() {
 		gplusGorillaMux = loadGorillaMux(gplusAPI)
 	})
+	calcMem("GowwwRouter", func() {
+		gplusGowwwRouter = loadGowwwRouter(gplusAPI)
+	})
 	calcMem("HttpRouter", func() {
 		gplusHttpRouter = loadHttpRouter(gplusAPI)
 	})
@@ -214,6 +218,10 @@ func BenchmarkGorillaMux_GPlusStatic(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/people", nil)
 	benchRequest(b, gplusGorillaMux, req)
 }
+func BenchmarkGowwwRouter_GPlusStatic(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/people", nil)
+	benchRequest(b, gplusGowwwRouter, req)
+}
 func BenchmarkHttpRouter_GPlusStatic(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/people", nil)
 	benchRequest(b, gplusHttpRouter, req)
@@ -333,6 +341,10 @@ func BenchmarkGorillaMux_GPlusParam(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
 	benchRequest(b, gplusGorillaMux, req)
 }
+func BenchmarkGowwwRouter_GPlusParam(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
+	benchRequest(b, gplusGowwwRouter, req)
+}
 func BenchmarkHttpRouter_GPlusParam(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
 	benchRequest(b, gplusHttpRouter, req)
@@ -452,6 +464,10 @@ func BenchmarkGorillaMux_GPlus2Params(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
 	benchRequest(b, gplusGorillaMux, req)
 }
+func BenchmarkGowwwRouter_GPlus2Params(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
+	benchRequest(b, gplusGowwwRouter, req)
+}
 func BenchmarkHttpRouter_GPlus2Params(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
 	benchRequest(b, gplusHttpRouter, req)
@@ -558,6 +574,9 @@ func BenchmarkGoRestful_GPlusAll(b *testing.B) {
 func BenchmarkGorillaMux_GPlusAll(b *testing.B) {
 	benchRoutes(b, gplusGorillaMux, gplusAPI)
 }
+func BenchmarkGowwwRouter_GPlusAll(b *testing.B) {
+	benchRoutes(b, gplusGowwwRouter, gplusAPI)
+}
 func BenchmarkHttpRouter_GPlusAll(b *testing.B) {
 	benchRoutes(b, gplusHttpRouter, gplusAPI)
 }

parse_test.go

@@ -69,6 +69,7 @@ var (
 	parseGoJsonRest  http.Handler
 	parseGoRestful   http.Handler
 	parseGorillaMux  http.Handler
+	parseGowwwRouter http.Handler
 	parseHttpRouter  http.Handler
 	parseHttpTreeMux http.Handler
 	parseKocha       http.Handler
@@ -129,6 +130,9 @@ func init() {
 	calcMem("GorillaMux", func() {
 		parseGorillaMux = loadGorillaMux(parseAPI)
 	})
+	calcMem("GowwwRouter", func() {
+		parseGowwwRouter = loadGowwwRouter(parseAPI)
+	})
 	calcMem("HttpRouter", func() {
 		parseHttpRouter = loadHttpRouter(parseAPI)
 	})
@@ -234,6 +238,10 @@ func BenchmarkGorillaMux_ParseStatic(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/1/users", nil)
 	benchRequest(b, parseGorillaMux, req)
 }
+func BenchmarkGowwwRouter_ParseStatic(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/1/users", nil)
+	benchRequest(b, parseGowwwRouter, req)
+}
 func BenchmarkHttpRouter_ParseStatic(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/1/users", nil)
 	benchRequest(b, parseHttpRouter, req)
@@ -353,6 +361,10 @@ func BenchmarkGorillaMux_ParseParam(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/1/classes/go", nil)
 	benchRequest(b, parseGorillaMux, req)
 }
+func BenchmarkGowwwRouter_ParseParam(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/1/classes/go", nil)
+	benchRequest(b, parseGowwwRouter, req)
+}
 func BenchmarkHttpRouter_ParseParam(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/1/classes/go", nil)
 	benchRequest(b, parseHttpRouter, req)
@@ -472,6 +484,10 @@ func BenchmarkGorillaMux_Parse2Params(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
 	benchRequest(b, parseGorillaMux, req)
 }
+func BenchmarkGowwwRouter_Parse2Params(b *testing.B) {
+	req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
+	benchRequest(b, parseGowwwRouter, req)
+}
 func BenchmarkHttpRouter_Parse2Params(b *testing.B) {
 	req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
 	benchRequest(b, parseHttpRouter, req)
@@ -578,6 +594,9 @@ func BenchmarkGoRestful_ParseAll(b *testing.B) {
 func BenchmarkGorillaMux_ParseAll(b *testing.B) {
 	benchRoutes(b, parseGorillaMux, parseAPI)
 }
+func BenchmarkGowwwRouter_ParseAll(b *testing.B) {
+	benchRoutes(b, parseGowwwRouter, parseAPI)
+}
 func BenchmarkHttpRouter_ParseAll(b *testing.B) {
 	benchRoutes(b, parseHttpRouter, parseAPI)
 }

routers.go

@@ -31,6 +31,7 @@ import (
 	"github.com/go-zoo/bone"
 	"github.com/gocraft/web"
 	"github.com/gorilla/mux"
+	gowwwrouter "github.com/gowww/router"
 	"github.com/julienschmidt/httprouter"
 	"github.com/labstack/echo"
 	llog "github.com/lunny/log"
@@ -99,7 +100,7 @@ func init() {
 }
 
 // Common
-func httpHandlerFunc(w http.ResponseWriter, r *http.Request) {}
+func httpHandlerFunc(_ http.ResponseWriter, _ *http.Request) {}
 
 func httpHandlerFuncTest(w http.ResponseWriter, r *http.Request) {
 	io.WriteString(w, r.RequestURI)
@@ -345,7 +346,7 @@ func echoHandlerTest(c echo.Context) error {
 
 func loadEcho(routes []route) http.Handler {
 	var h echo.HandlerFunc = echoHandler
-	if loadTestHandler { 
+	if loadTestHandler {
 		h = echoHandlerTest
 	}
 
@@ -724,6 +725,30 @@ func loadGorillaMuxSingle(method, path string, handler http.HandlerFunc) http.Ha
 	return m
 }
 
+// gowww/router
+func gowwwRouterHandleWrite(w http.ResponseWriter, r *http.Request) {
+	io.WriteString(w, gowwwrouter.Parameter(r, "name"))
+}
+
+func loadGowwwRouter(routes []route) http.Handler {
+	h := httpHandlerFunc
+	if loadTestHandler {
+		h = httpHandlerFuncTest
+	}
+
+	router := gowwwrouter.New()
+	for _, route := range routes {
+		router.Handle(route.method, route.path, http.HandlerFunc(h))
+	}
+	return router
+}
+
+func loadGowwwRouterSingle(method, path string, handler http.Handler) http.Handler {
+	router := gowwwrouter.New()
+	router.Handle(method, path, handler)
+	return router
+}
+
 // HttpRouter
 func httpRouterHandle(_ http.ResponseWriter, _ *http.Request, _ httprouter.Params) {}
 

routers_test.go

@@ -25,6 +25,7 @@ var (
 		{"GoJsonRest", loadGoJsonRest},
 		{"GoRestful", loadGoRestful},
 		{"GorillaMux", loadGorillaMux},
+		{"GowwwRouter", loadGowwwRouter},
 		{"HttpRouter", loadHttpRouter},
 		{"HttpTreeMux", loadHttpTreeMux},
 		//{"Kocha", loadKocha},

static_test.go

@@ -41,10 +41,10 @@ var staticRoutes = []route{
 	{"GET", "/share.png"},
 	{"GET", "/sieve.gif"},
 	{"GET", "/tos.html"},
-	{"GET", "/articles/"},
+	{"GET", "/articles"},
 	{"GET", "/articles/go_command.html"},
 	{"GET", "/articles/index.html"},
-	{"GET", "/articles/wiki/"},
+	{"GET", "/articles/wiki"},
 	{"GET", "/articles/wiki/edit.html"},
 	{"GET", "/articles/wiki/final-noclosure.go"},
 	{"GET", "/articles/wiki/final-noerror.go"},
@@ -66,7 +66,7 @@ var staticRoutes = []route{
 	{"GET", "/articles/wiki/test_Test.txt.good"},
 	{"GET", "/articles/wiki/test_view.good"},
 	{"GET", "/articles/wiki/view.html"},
-	{"GET", "/codewalk/"},
+	{"GET", "/codewalk"},
 	{"GET", "/codewalk/codewalk.css"},
 	{"GET", "/codewalk/codewalk.js"},
 	{"GET", "/codewalk/codewalk.xml"},
@@ -78,10 +78,10 @@ var staticRoutes = []route{
 	{"GET", "/codewalk/run"},
 	{"GET", "/codewalk/sharemem.xml"},
 	{"GET", "/codewalk/urlpoll.go"},
-	{"GET", "/devel/"},
+	{"GET", "/devel"},
 	{"GET", "/devel/release.html"},
 	{"GET", "/devel/weekly.html"},
-	{"GET", "/gopher/"},
+	{"GET", "/gopher"},
 	{"GET", "/gopher/appenginegopher.jpg"},
 	{"GET", "/gopher/appenginegophercolor.jpg"},
 	{"GET", "/gopher/appenginelogo.gif"},
@@ -101,14 +101,14 @@ var staticRoutes = []route{
 	{"GET", "/gopher/ref.png"},
 	{"GET", "/gopher/run.png"},
 	{"GET", "/gopher/talks.png"},
-	{"GET", "/gopher/pencil/"},
+	{"GET", "/gopher/pencil"},
 	{"GET", "/gopher/pencil/gopherhat.jpg"},
 	{"GET", "/gopher/pencil/gopherhelmet.jpg"},
 	{"GET", "/gopher/pencil/gophermega.jpg"},
 	{"GET", "/gopher/pencil/gopherrunning.jpg"},
 	{"GET", "/gopher/pencil/gopherswim.jpg"},
 	{"GET", "/gopher/pencil/gopherswrench.jpg"},
-	{"GET", "/play/"},
+	{"GET", "/play"},
 	{"GET", "/play/fib.go"},
 	{"GET", "/play/hello.go"},
 	{"GET", "/play/life.go"},
@@ -117,7 +117,7 @@ var staticRoutes = []route{
 	{"GET", "/play/sieve.go"},
 	{"GET", "/play/solitaire.go"},
 	{"GET", "/play/tree.go"},
-	{"GET", "/progs/"},
+	{"GET", "/progs"},
 	{"GET", "/progs/cgo1.go"},
 	{"GET", "/progs/cgo2.go"},
 	{"GET", "/progs/cgo3.go"},
@@ -185,6 +185,7 @@ var (
 	staticGoJsonRest  http.Handler
 	staticGoRestful   http.Handler
 	staticGorillaMux  http.Handler
+	staticGowwwRouter http.Handler
 	staticHttpRouter  http.Handler
 	staticHttpTreeMux http.Handler
 	staticKocha       http.Handler
@@ -253,6 +254,9 @@ func init() {
 	calcMem("GorillaMux", func() {
 		staticGorillaMux = loadGorillaMux(staticRoutes)
 	})
+	calcMem("GowwwRouter", func() {
+		staticGowwwRouter = loadGowwwRouter(staticRoutes)
+	})
 	calcMem("HttpRouter", func() {
 		staticHttpRouter = loadHttpRouter(staticRoutes)
 	})
@@ -349,6 +353,9 @@ func BenchmarkGoRestful_StaticAll(b *testing.B) {
 func BenchmarkGorillaMux_StaticAll(b *testing.B) {
 	benchRoutes(b, staticGorillaMux, staticRoutes)
 }
+func BenchmarkGowwwRouter_StaticAll(b *testing.B) {
+	benchRoutes(b, staticGowwwRouter, staticRoutes)
+}
 func BenchmarkHttpRouter_StaticAll(b *testing.B) {
 	benchRoutes(b, staticHttpRouter, staticRoutes)
 }