diff --git a/.gitignore b/.gitignore index c71279c..56312f2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ !*.md !*.mod !*.sum -!*.txt \ No newline at end of file +!*.txt diff --git a/Context.go b/Context.go index 5131fa5..7afb303 100644 --- a/Context.go +++ b/Context.go @@ -81,4 +81,4 @@ func (ctx *context) Status(status int) Context { func (ctx *context) String(body string) error { ctx.response.body = append(ctx.response.body, body...) return nil -} \ No newline at end of file +} diff --git a/Context_test.go b/Context_test.go index ebfd8b2..b3a6005 100644 --- a/Context_test.go +++ b/Context_test.go @@ -66,4 +66,4 @@ func TestRedirect(t *testing.T) { response := s.Request("GET", "/", nil, nil) assert.Equal(t, response.Status(), 301) assert.Equal(t, response.Header("Location"), "/target") -} \ No newline at end of file +} diff --git a/Handler.go b/Handler.go index fc27b7a..96b6cb6 100644 --- a/Handler.go +++ b/Handler.go @@ -1,4 +1,4 @@ package web // Handler is a function that deals with the given request/response context. -type Handler func(Context) error \ No newline at end of file +type Handler func(Context) error diff --git a/Header.go b/Header.go index ec9325e..b6699fe 100644 --- a/Header.go +++ b/Header.go @@ -4,4 +4,4 @@ package web type Header struct { Key string Value string -} \ No newline at end of file +} diff --git a/readme.md b/README.md similarity index 98% rename from readme.md rename to README.md index b9bd107..149eb93 100644 --- a/readme.md +++ b/README.md @@ -87,4 +87,4 @@ Please see the [license documentation](https://urbach.dev/license). ## Copyright -© 2024 Eduard Urbach \ No newline at end of file +© 2024 Eduard Urbach diff --git a/Request.go b/Request.go index 5ffa025..6c7ef3c 100644 --- a/Request.go +++ b/Request.go @@ -79,4 +79,4 @@ func (req *request) addParameter(key string, value string) { Key: key, Value: value, }) -} \ No newline at end of file +} diff --git a/Request_test.go b/Request_test.go index 1d705d6..1e079a8 100644 --- a/Request_test.go +++ b/Request_test.go @@ -51,4 +51,4 @@ func TestRequestParam(t *testing.T) { response := s.Request("GET", "/blog/my-article", nil, nil) assert.Equal(t, response.Status(), 200) assert.Equal(t, string(response.Body()), "my-article") -} \ No newline at end of file +} diff --git a/Response.go b/Response.go index e612b73..f361eb9 100644 --- a/Response.go +++ b/Response.go @@ -76,4 +76,4 @@ func (res *response) Write(body []byte) (int, error) { func (res *response) WriteString(body string) (int, error) { res.body = append(res.body, body...) return len(body), nil -} \ No newline at end of file +} diff --git a/Response_test.go b/Response_test.go index 37a1142..9028acf 100644 --- a/Response_test.go +++ b/Response_test.go @@ -97,4 +97,4 @@ func TestResponseHeaderOverwrite(t *testing.T) { assert.Equal(t, response.Status(), 200) assert.Equal(t, response.Header("Content-Type"), "text/html") assert.Equal(t, string(response.Body()), "") -} \ No newline at end of file +} diff --git a/Server.go b/Server.go index bf2bd98..ba163a0 100644 --- a/Server.go +++ b/Server.go @@ -19,7 +19,6 @@ import ( // Server is the interface for an HTTP server. type Server interface { Get(path string, handler Handler) - Ready() chan struct{} Request(method string, path string, headers []Header, body io.Reader) Response Router() *router.Router[Handler] Run(address string) error @@ -32,7 +31,6 @@ type server struct { contextPool sync.Pool router *router.Router[Handler] errorHandler func(Context, error) - ready chan struct{} } // NewServer creates a new HTTP server. @@ -56,7 +54,6 @@ func NewServer() Server { errorHandler: func(ctx Context, err error) { log.Println(ctx.Request().Path(), err) }, - ready: make(chan struct{}), } s.contextPool.New = func() any { return s.newContext() } @@ -68,11 +65,6 @@ func (s *server) Get(path string, handler Handler) { s.Router().Add("GET", path, handler) } -// Ready returns a channel that will be closed once the listener is ready for connection handling. -func (s *server) Ready() chan struct{} { - return s.ready -} - // Request performs a synthetic request and returns the response. // This function keeps the response in memory so it's slightly slower than a real request. // However it is very useful inside tests where you don't want to spin up a real web server. @@ -107,7 +99,6 @@ func (s *server) Run(address string) error { stop := make(chan os.Signal, 1) signal.Notify(stop, os.Interrupt, syscall.SIGTERM) - close(s.ready) <-stop return nil } @@ -270,4 +261,4 @@ func (s *server) newContext() *context { status: 200, }, } -} \ No newline at end of file +} diff --git a/Server_test.go b/Server_test.go index 768204f..f2c142b 100644 --- a/Server_test.go +++ b/Server_test.go @@ -35,7 +35,6 @@ func TestRun(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() _, err := http.Get("http://127.0.0.1:8080/") assert.Nil(t, err) }() @@ -49,7 +48,6 @@ func TestBadRequest(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() conn, err := net.Dial("tcp", ":8080") assert.Nil(t, err) defer conn.Close() @@ -75,7 +73,6 @@ func TestBadRequestHeader(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() conn, err := net.Dial("tcp", ":8080") assert.Nil(t, err) defer conn.Close() @@ -98,7 +95,6 @@ func TestBadRequestMethod(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() conn, err := net.Dial("tcp", ":8080") assert.Nil(t, err) defer conn.Close() @@ -120,7 +116,6 @@ func TestBadRequestPath(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() conn, err := net.Dial("tcp", ":8080") assert.Nil(t, err) defer conn.Close() @@ -146,7 +141,6 @@ func TestBadRequestProtocol(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() conn, err := net.Dial("tcp", ":8080") assert.Nil(t, err) defer conn.Close() @@ -169,7 +163,6 @@ func TestConnectionClose(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() conn, err := net.Dial("tcp", ":8080") assert.Nil(t, err) defer conn.Close() @@ -190,7 +183,6 @@ func TestEarlyClose(t *testing.T) { go func() { defer syscall.Kill(syscall.Getpid(), syscall.SIGTERM) - <-s.Ready() conn, err := net.Dial("tcp", ":8080") assert.Nil(t, err) @@ -211,4 +203,4 @@ func TestUnavailablePort(t *testing.T) { s := web.NewServer() s.Run(":8080") -} \ No newline at end of file +} diff --git a/examples/hello/main.go b/examples/hello/main.go index 6015f13..b42db84 100644 --- a/examples/hello/main.go +++ b/examples/hello/main.go @@ -12,4 +12,4 @@ func main() { }) s.Run(":8080") -} \ No newline at end of file +} diff --git a/go.mod b/go.mod index 1035725..f2bf46e 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module git.urbach.dev/go/web go 1.24 require ( - git.urbach.dev/go/assert v0.0.0-20250606150337-559d3d3afcda - git.urbach.dev/go/router v0.0.0-20250606151301-c10e38fec918 -) \ No newline at end of file + git.urbach.dev/go/assert v0.0.0-20250225153414-fc1f84f19edf + git.urbach.dev/go/router v0.0.0-20250601162231-e35d5715d1a5 +) diff --git a/go.sum b/go.sum index 11cef6e..4c3db0c 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -git.urbach.dev/go/assert v0.0.0-20250606150337-559d3d3afcda h1:VN6ZQwtwLOm2xTms+v8IIeeNjvs55qyEBNArv3dPq9g= -git.urbach.dev/go/assert v0.0.0-20250606150337-559d3d3afcda/go.mod h1:PNI/NSBOqvoeU58/7eBsIR09Yoq2S/qtSRiTrctkiq0= -git.urbach.dev/go/router v0.0.0-20250606151301-c10e38fec918 h1:fdeFr4gwou9KxvQqhcrPbLSYM9xzvaF1pwp53DzU3co= -git.urbach.dev/go/router v0.0.0-20250606151301-c10e38fec918/go.mod h1:seUQ5raGaj6fDeZP6d7JdgnWQys8oTrtFdvBhAp1IZA= \ No newline at end of file +git.urbach.dev/go/assert v0.0.0-20250225153414-fc1f84f19edf h1:BQWa5GKNUsA5CSUa/+UlFWYCEVe3IDDKRbVqBLK0mAE= +git.urbach.dev/go/assert v0.0.0-20250225153414-fc1f84f19edf/go.mod h1:y9jGII9JFiF1HNIju0u87OyPCt82xKCtqnAFyEreCDo= +git.urbach.dev/go/router v0.0.0-20250601162231-e35d5715d1a5 h1:3qlZjgWbrHw4LWM4uBzOTldbpqCLJdeSgvcYK6f3xpc= +git.urbach.dev/go/router v0.0.0-20250601162231-e35d5715d1a5/go.mod h1:O+doTe0DZdT2XMsTY5pe6qUMqEEIAbwtX6Xp6EqHw34= diff --git a/http.go b/http.go index 65de163..b7ec1cc 100644 --- a/http.go +++ b/http.go @@ -38,4 +38,4 @@ func parseURL(url string) (scheme string, host string, path string, query string path = url return -} \ No newline at end of file +} diff --git a/send/send.go b/send/send.go index db9a1e3..9c4c2ca 100644 --- a/send/send.go +++ b/send/send.go @@ -46,4 +46,4 @@ func Text(ctx web.Context, body string) error { func XML(ctx web.Context, body string) error { ctx.Response().SetHeader("Content-Type", "text/xml") return ctx.String(body) -} \ No newline at end of file +} diff --git a/send/send_test.go b/send/send_test.go index b4b3de1..fec22c3 100644 --- a/send/send_test.go +++ b/send/send_test.go @@ -64,4 +64,4 @@ func TestContentTypes(t *testing.T) { assert.Equal(t, string(response.Body()), test.Response) }) } -} \ No newline at end of file +}