From fd78380cb428f513699a35a8d021ba8352d8b22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20P=C3=A9rez?= Date: Fri, 9 May 2025 17:50:18 +0200 Subject: [PATCH] integrate context to struct and fix paths --- ron.go | 53 ++++++++++++++++----- ron_test.go | 121 ++++++++++++++++++++++++++++++++++++++++++----- template_test.go | 14 +++--- 3 files changed, 157 insertions(+), 31 deletions(-) diff --git a/ron.go b/ron.go index 37eb9c7..637f8d2 100644 --- a/ron.go +++ b/ron.go @@ -26,9 +26,10 @@ type ( } CTX struct { - W *responseWriterWrapper - R *http.Request - E *Engine + W *responseWriterWrapper + R *http.Request + E *Engine + Ctx context.Context } Config struct { @@ -57,7 +58,7 @@ const ( HeaderJSON string = "application/json" HeaderHTML_UTF8 string = "text/html; charset=utf-8" HeaderCSS_UTF8 string = "text/css; charset=utf-8" - HeaderAppJS string = "application/javascript" + HeaderAppJS_UTF8 string = "text/javascript; charset=utf-8" HeaderPlain_UTF8 string = "text/plain; charset=utf-8" ) @@ -139,17 +140,31 @@ func (e *Engine) USE(middleware Middleware) { e.middleware = append(e.middleware, middleware) } -func (e *Engine) GET(path string, handler func(*CTX, context.Context)) { +func (e *Engine) GET(path string, handler func(*CTX)) { e.mux.HandleFunc(fmt.Sprintf("GET %s", path), func(w http.ResponseWriter, r *http.Request) { rw := &responseWriterWrapper{ResponseWriter: w} - handler(&CTX{W: rw, R: r, E: e}, r.Context()) + handler(&CTX{W: rw, R: r, E: e, Ctx: r.Context()}) }) } -func (e *Engine) POST(path string, handler func(*CTX, context.Context)) { +func (e *Engine) POST(path string, handler func(*CTX)) { e.mux.HandleFunc(fmt.Sprintf("POST %s", path), func(w http.ResponseWriter, r *http.Request) { rw := &responseWriterWrapper{ResponseWriter: w} - handler(&CTX{W: rw, R: r, E: e}, r.Context()) + handler(&CTX{W: rw, R: r, E: e, Ctx: r.Context()}) + }) +} + +func (e *Engine) PUT(path string, handler func(*CTX)) { + e.mux.HandleFunc(fmt.Sprintf("PUT %s", path), func(w http.ResponseWriter, r *http.Request) { + rw := &responseWriterWrapper{ResponseWriter: w} + handler(&CTX{W: rw, R: r, E: e, Ctx: r.Context()}) + }) +} + +func (e *Engine) DELETE(path string, handler func(*CTX)) { + e.mux.HandleFunc(fmt.Sprintf("DELETE %s", path), func(w http.ResponseWriter, r *http.Request) { + rw := &responseWriterWrapper{ResponseWriter: w} + handler(&CTX{W: rw, R: r, E: e, Ctx: r.Context()}) }) } @@ -171,17 +186,31 @@ func (g *groupMux) USE(middleware Middleware) { g.middleware = append(g.middleware, middleware) } -func (g *groupMux) GET(path string, handler func(*CTX, context.Context)) { +func (g *groupMux) GET(path string, handler func(*CTX)) { g.mux.HandleFunc(fmt.Sprintf("GET %s", path), func(w http.ResponseWriter, r *http.Request) { rw := &responseWriterWrapper{ResponseWriter: w} - handler(&CTX{W: rw, R: r, E: g.engine}, r.Context()) + handler(&CTX{W: rw, R: r, E: g.engine, Ctx: r.Context()}) }) } -func (g *groupMux) POST(path string, handler func(*CTX, context.Context)) { +func (g *groupMux) POST(path string, handler func(*CTX)) { g.mux.HandleFunc(fmt.Sprintf("POST %s", path), func(w http.ResponseWriter, r *http.Request) { rw := &responseWriterWrapper{ResponseWriter: w} - handler(&CTX{W: rw, R: r, E: g.engine}, r.Context()) + handler(&CTX{W: rw, R: r, E: g.engine, Ctx: r.Context()}) + }) +} + +func (g *groupMux) PUT(path string, handler func(*CTX)) { + g.mux.HandleFunc(fmt.Sprintf("PUT %s", path), func(w http.ResponseWriter, r *http.Request) { + rw := &responseWriterWrapper{ResponseWriter: w} + handler(&CTX{W: rw, R: r, E: g.engine, Ctx: r.Context()}) + }) +} + +func (g *groupMux) DELETE(path string, handler func(*CTX)) { + g.mux.HandleFunc(fmt.Sprintf("DELETE %s", path), func(w http.ResponseWriter, r *http.Request) { + rw := &responseWriterWrapper{ResponseWriter: w} + handler(&CTX{W: rw, R: r, E: g.engine, Ctx: r.Context()}) }) } diff --git a/ron_test.go b/ron_test.go index aa6ca0d..243d737 100644 --- a/ron_test.go +++ b/ron_test.go @@ -1,7 +1,6 @@ package ron import ( - "context" "fmt" "log/slog" "net/http" @@ -83,7 +82,7 @@ func Test_applyEngineConfig(t *testing.T) { func Test_ServeHTTP(t *testing.T) { e := New() api := e.GROUP("/api") - api.GET("/index", func(c *CTX, ctx context.Context) { + api.GET("/index", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET API")) }) @@ -171,19 +170,19 @@ func Test_GET(t *testing.T) { {"resource with param", "GET", "/api/v1/resource/1", http.StatusOK, "GET Resource"}, } - e.GET("/", func(c *CTX, ctx context.Context) { + e.GET("/", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET Root")) }) - e.GET("/api", func(c *CTX, ctx context.Context) { + e.GET("/api", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET API")) }) - e.GET("/api/v1", func(c *CTX, ctx context.Context) { + e.GET("/api/v1", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET API v1")) }) - e.GET("/api/v1/resource/{id}", func(c *CTX, ctx context.Context) { + e.GET("/api/v1/resource/{id}", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET Resource")) }) @@ -207,7 +206,7 @@ func Test_GET(t *testing.T) { func Test_POST(t *testing.T) { e := New() - e.POST("/", func(c *CTX, ctx context.Context) { + e.POST("/", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("POST")) }) @@ -225,10 +224,50 @@ func Test_POST(t *testing.T) { } } +func Test_PUT(t *testing.T) { + e := New() + e.PUT("/", func(c *CTX) { + c.W.WriteHeader(http.StatusOK) + c.W.Write([]byte("PUT")) + }) + + rr := httptest.NewRecorder() + req, _ := http.NewRequest("PUT", "/", nil) + e.ServeHTTP(rr, req) + + if status := rr.Code; status != http.StatusOK { + t.Errorf("Expected status code: %d, Actual: %d", http.StatusOK, status) + } + + if rr.Body.String() != "PUT" { + t.Errorf("Expected: PUT, Actual: %s", rr.Body.String()) + } +} + +func Test_DELETE(t *testing.T) { + e := New() + e.DELETE("/", func(c *CTX) { + c.W.WriteHeader(http.StatusOK) + c.W.Write([]byte("DELETE")) + }) + + rr := httptest.NewRecorder() + req, _ := http.NewRequest("DELETE", "/", nil) + e.ServeHTTP(rr, req) + + if status := rr.Code; status != http.StatusOK { + t.Errorf("Expected status code: %d, Actual: %d", http.StatusOK, status) + } + + if rr.Body.String() != "DELETE" { + t.Errorf("Expected: DELETE, Actual: %s", rr.Body.String()) + } +} + func Test_GROUP(t *testing.T) { e := New() api := e.GROUP("/api") - api.GET("/index", func(c *CTX, ctx context.Context) { + api.GET("/index", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET API")) }) @@ -248,7 +287,7 @@ func Test_GROUP(t *testing.T) { func Test_GROUPWithMiddleware(t *testing.T) { e := New() - e.GET("/index", func(c *CTX, ctx context.Context) { + e.GET("/index", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET Root")) }) @@ -266,7 +305,7 @@ func Test_GROUPWithMiddleware(t *testing.T) { next.ServeHTTP(w, r) }) }) - api.GET("/index", func(c *CTX, ctx context.Context) { + api.GET("/index", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("GET API")) }) @@ -287,7 +326,7 @@ func Test_GROUPWithMiddleware(t *testing.T) { func Test_GROUPPOST(t *testing.T) { e := New() api := e.GROUP("/api") - api.POST("/index", func(c *CTX, ctx context.Context) { + api.POST("/index", func(c *CTX) { c.W.WriteHeader(http.StatusOK) c.W.Write([]byte("POST API")) }) @@ -305,6 +344,48 @@ func Test_GROUPPOST(t *testing.T) { } } +func Test_GROUPPUT(t *testing.T) { + e := New() + api := e.GROUP("/api") + api.PUT("/index", func(c *CTX) { + c.W.WriteHeader(http.StatusOK) + c.W.Write([]byte("PUT API")) + }) + + rr := httptest.NewRecorder() + req, _ := http.NewRequest("PUT", "/api/index", nil) + e.ServeHTTP(rr, req) + + if status := rr.Code; status != http.StatusOK { + t.Errorf("Expected status code: %d, Actual: %d", http.StatusOK, status) + } + + if rr.Body.String() != "PUT API" { + t.Errorf("Expected: PUT API, Actual: %s", rr.Body.String()) + } +} + +func Test_GROUPDELETE(t *testing.T) { + e := New() + api := e.GROUP("/api") + api.DELETE("/index", func(c *CTX) { + c.W.WriteHeader(http.StatusOK) + c.W.Write([]byte("DELETE API")) + }) + + rr := httptest.NewRecorder() + req, _ := http.NewRequest("DELETE", "/api/index", nil) + e.ServeHTTP(rr, req) + + if status := rr.Code; status != http.StatusOK { + t.Errorf("Expected status code: %d, Actual: %d", http.StatusOK, status) + } + + if rr.Body.String() != "DELETE API" { + t.Errorf("Expected: DELETE API, Actual: %s", rr.Body.String()) + } +} + func Test_Static(t *testing.T) { tests := map[string]struct { givenPath string @@ -328,7 +409,7 @@ func Test_Static(t *testing.T) { givenDirectory: "assets", expectedResponse: testhelpers.ExpectedResponse{ Code: http.StatusOK, - Header: HeaderAppJS, + Header: HeaderAppJS_UTF8, Body: "console.log('Hello, World!');", }, }, @@ -486,3 +567,19 @@ func Test_newLogger(t *testing.T) { }) } } + +func Benchmark_GET(b *testing.B) { + engine := New() + + engine.GET("/hello", func(c *CTX) { + c.W.Write([]byte("Hello")) + }) + + req := httptest.NewRequest(http.MethodGet, "/hello", nil) + w := httptest.NewRecorder() + + b.ResetTimer() + for i := 0; i < b.N; i++ { + engine.ServeHTTP(w, req) + } +} diff --git a/template_test.go b/template_test.go index 4c4961b..ff6d22e 100644 --- a/template_test.go +++ b/template_test.go @@ -98,13 +98,13 @@ func Test_findHTMLFiles(t *testing.T) { } expected := []string{ - "templates\\layout.base.gohtml", - "templates\\layout.another.gohtml", - "templates\\fragment.button.gohtml", - "templates\\component.list.gohtml", - "templates\\page.index.gohtml", - "templates\\page.tindex.gohtml", - "templates\\page.another.gohtml", + "templates/layout.base.gohtml", + "templates/layout.another.gohtml", + "templates/fragment.button.gohtml", + "templates/component.list.gohtml", + "templates/page.index.gohtml", + "templates/page.tindex.gohtml", + "templates/page.another.gohtml", } actual, err := render.findHTMLFiles() if err != nil {