make default generated routes function private and standardize tests

crhntr · Aug 20, 2024 · 885c93c · 885c93c
1 parent cae1039
commit 885c93c
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 51 deletions.
diff --git a/cmd/muxt/testdata/generate/argument_context.txtar b/cmd/muxt/testdata/generate/argument_context.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -40,7 +40,7 @@ func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
 	var service T
-	TemplateRoutes(mux, service)
+	routes(mux, service)
 
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/argument_path_param.txtar b/cmd/muxt/testdata/generate/argument_path_param.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -40,7 +40,7 @@ func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
 	var service T
-	TemplateRoutes(mux, service)
+	routes(mux, service)
 
 	req := httptest.NewRequest(http.MethodGet, "/user/crhntr", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/argument_request.txtar b/cmd/muxt/testdata/generate/argument_request.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -40,7 +40,7 @@ func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
 	var service T
-	TemplateRoutes(mux, service)
+	routes(mux, service)
 
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/argument_response.txtar b/cmd/muxt/testdata/generate/argument_response.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -40,7 +40,7 @@ func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
 	var service T
-	TemplateRoutes(mux, service)
+	routes(mux, service)
 
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/error_duplicate_pattern.txtar b/cmd/muxt/testdata/generate/error_duplicate_pattern.txtar
@@ -1,4 +1,4 @@
-! muxt generate --routes-func=TemplateRoutes
+! muxt generate
 stderr 'duplicate route pattern: GET /'
 
 -- template.gohtml --

diff --git a/cmd/muxt/testdata/generate/error_unknown_flag.txtar b/cmd/muxt/testdata/generate/error_unknown_flag.txtar
@@ -1,4 +1,4 @@
-! muxt generate --routes-func=TemplateRoutes --unknown
+! muxt generate --unknown
 stderr 'flag'
 
 -- template.gohtml --

diff --git a/cmd/muxt/testdata/generate/override_execute.txtar b/cmd/muxt/testdata/generate/override_execute.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 ! stdout execute
 
 exec go test -v -cover
@@ -47,7 +47,7 @@ import (
 func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
-	TemplateRoutes(mux, nil)
+	routes(mux, nil)
 
 	req := httptest.NewRequest(http.MethodPatch, "/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/path_end.txtar b/cmd/muxt/testdata/generate/path_end.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -37,7 +37,7 @@ import (
 func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
-	TemplateRoutes(mux, nil)
+	routes(mux, nil)
 
 	req := httptest.NewRequest(http.MethodGet, "/end/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/path_param.txtar b/cmd/muxt/testdata/generate/path_param.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -45,7 +45,7 @@ func (T) ToUpper(in string) any { return Data{Name: strings.ToUpper(in)} }
 func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
-	TemplateRoutes(mux, T{})
+	routes(mux, T{})
 
 	req := httptest.NewRequest(http.MethodGet, "/fruits/peach/tree", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/simple_get.txtar b/cmd/muxt/testdata/generate/simple_get.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -37,7 +37,7 @@ import (
 func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
-	TemplateRoutes(mux, nil)
+	routes(mux, nil)
 
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/simple_handler.txtar b/cmd/muxt/testdata/generate/simple_handler.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -40,7 +40,7 @@ func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
 	var service T
-	TemplateRoutes(mux, service)
+	routes(mux, service)
 
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/simple_patch.txtar b/cmd/muxt/testdata/generate/simple_patch.txtar
@@ -1,4 +1,4 @@
-muxt generate --routes-func=TemplateRoutes
+muxt generate
 
 exec go test -cover
 
@@ -37,7 +37,7 @@ import (
 func Test(t *testing.T) {
 	mux := http.NewServeMux()
 
-	TemplateRoutes(mux, nil)
+	routes(mux, nil)
 
 	req := httptest.NewRequest(http.MethodPatch, "/", nil)
 	rec := httptest.NewRecorder()

diff --git a/cmd/muxt/testdata/generate/templates_and_embed_in_gen_decl.txtar b/cmd/muxt/testdata/generate/templates_and_embed_in_gen_decl.txtar
@@ -1,5 +1,5 @@
-muxt generate --routes-func=TemplateRoutes
-stdout 'Routes has route for GET /'
+muxt generate
+stdout 'routes has route for GET /'
 
 -- index.gohtml --
 {{define "GET /" }}

diff --git a/cmd/muxt/testdata/generate/templates_glob_filter.txtar b/cmd/muxt/testdata/generate/templates_glob_filter.txtar
@@ -1,5 +1,5 @@
-muxt generate --routes-func=TemplateRoutes
-! stdout 'Routes has route for GET /example'
+muxt generate
+! stdout 'routes has route for GET /example'
 
 exec go test
 

diff --git a/cmd/muxt/testdata/generate/templates_multiple_embed_lines.txtar b/cmd/muxt/testdata/generate/templates_multiple_embed_lines.txtar
@@ -1,7 +1,7 @@
-muxt generate --routes-func=TemplateRoutes
-stdout 'Routes has route for GET /'
-stdout 'Routes has route for GET /form'
-stdout 'Routes has route for POST /form'
+muxt generate
+stdout 'routes has route for GET /'
+stdout 'routes has route for GET /form'
+stdout 'routes has route for POST /form'
 
 -- index.gohtml --
 {{define "GET /" }}

diff --git a/cmd/muxt/testdata/generate/templates_multiple_globs.txtar b/cmd/muxt/testdata/generate/templates_multiple_globs.txtar
@@ -1,7 +1,7 @@
-muxt generate --routes-func=TemplateRoutes
-stdout 'Routes has route for GET /'
-stdout 'Routes has route for GET /form'
-stdout 'Routes has route for POST /form'
+muxt generate
+stdout 'routes has route for GET /'
+stdout 'routes has route for GET /form'
+stdout 'routes has route for POST /form'
 
 -- index.gohtml --
 {{define "GET /" }}

diff --git a/cmd/muxt/testdata/generate/templates_multiple_parsefs.txtar b/cmd/muxt/testdata/generate/templates_multiple_parsefs.txtar
@@ -1,7 +1,7 @@
-muxt generate --routes-func=TemplateRoutes
-stdout 'Routes has route for GET /'
-stdout 'Routes has route for GET /form'
-stdout 'Routes has route for POST /form'
+muxt generate
+stdout 'routes has route for GET /'
+stdout 'routes has route for GET /form'
+stdout 'routes has route for POST /form'
 
 -- index.gohtml --
 {{define "GET /" }}

diff --git a/example/main.go b/example/main.go
@@ -65,6 +65,6 @@ func main() {
 		},
 	}
 	mux := http.NewServeMux()
-	Routes(mux, backend)
+	routes(mux, backend)
 	log.Fatal(http.ListenAndServe(":8080", mux))
 }
diff --git a/example/template_routes.go b/example/template_routes.go
diff --git a/generate.go b/generate.go
@@ -17,8 +17,6 @@ const (
 	executeIdentName = "execute"
 	receiverIdent    = "receiver"
 
-	receiverInterfaceIdent = "RoutesReceiver"
-
 	dataVarIdent = "data"
 	muxVarIdent  = "mux"
 
@@ -40,8 +38,9 @@ const (
 
 	defaultPackageName           = "main"
 	DefaultTemplatesVariableName = "templates"
-	DefaultRoutesFunctionName    = "Routes"
+	DefaultRoutesFunctionName    = "routes"
 	DefaultOutputFileName        = "template_routes.go"
+	receiverInterfaceIdent       = "RoutesReceiver"
 )
 
 func Generate(templateNames []TemplateName, packageName, templatesVariableName, routesFunctionName, receiverTypeIdent string, _ *token.FileSet, receiverPackage, templatesPackage []*ast.File, log *log.Logger) (string, error) {

diff --git a/generate_test.go b/generate_test.go
@@ -45,7 +45,7 @@ import (
 type RoutesReceiver interface {
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /", func(response http.ResponseWriter, request *http.Request) {
 		execute(response, request, templates.Lookup("GET /"), http.StatusOK, request)
 	})
@@ -76,7 +76,7 @@ type RoutesReceiver interface {
 	F() any
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /", func(response http.ResponseWriter, request *http.Request) {
 		data := receiver.F()
 		execute(response, request, templates.Lookup("GET / F()"), http.StatusOK, data)
@@ -109,7 +109,7 @@ type RoutesReceiver interface {
 	F(ctx context.Context, response http.ResponseWriter, request *http.Request, projectID string, taskID string) any
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /project/{projectID}/task/{taskID}", func(response http.ResponseWriter, request *http.Request) {
 		ctx := request.Context()
 		projectID := request.PathValue("projectID")
@@ -153,7 +153,7 @@ type RoutesReceiver interface {
 	F(username string) int
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /age/{username}", func(response http.ResponseWriter, request *http.Request) {
 		username := request.PathValue("username")
 		data := receiver.F(username)
@@ -195,7 +195,7 @@ type RoutesReceiver interface {
 	F(username string) int
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /age/{username}", func(response http.ResponseWriter, request *http.Request) {
 		username := request.PathValue("username")
 		data := receiver.F(username)
@@ -238,7 +238,7 @@ type RoutesReceiver interface {
 	F(username string) int
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /age/{username}", func(response http.ResponseWriter, request *http.Request) {
 		username := request.PathValue("username")
 		data := receiver.F(username)
@@ -271,7 +271,7 @@ type RoutesReceiver interface {
 	F(username string) (int, error)
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /age/{username}", func(response http.ResponseWriter, request *http.Request) {
 		username := request.PathValue("username")
 		data, err := receiver.F(username)
@@ -347,7 +347,7 @@ type RoutesReceiver interface {
 	F(ctx context.Context, username string) int
 }
 
-func Routes(mux *http.ServeMux, receiver RoutesReceiver) {
+func routes(mux *http.ServeMux, receiver RoutesReceiver) {
 	mux.HandleFunc("GET /age/{username}", func(response http.ResponseWriter, request *http.Request) {
 		ctx := request.Context()
 		username := request.PathValue("username")