refactor: Add httpok to the project

Remove testrunner and basic middleware structure being provided
by httpok.

Fixes: #16

Author: piraz

go.mod

@@ -3,14 +3,12 @@ module github.com/candango/gopeasant
 go 1.20
 
 require (
-	github.com/go-kit/kit v0.13.0
+	github.com/candango/httpok v0.0.1
 	github.com/stretchr/testify v1.9.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-kit/log v0.2.0 // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,11 +1,9 @@
+github.com/candango/httpok v0.0.1 h1:DFlwo6zPA/5Xv86frxbb9KfaN0Ikwbd9tvBMfFyuGqk=
+github.com/candango/httpok v0.0.1/go.mod h1:nf0tAd+GqSP2ICKs97PLdmjaLQjm14o67Gy7EKf4OfA=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU=
-github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg=
 github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

middleware.go

@@ -18,23 +18,6 @@ import (
 	"net/http"
 )
 
-// Middleware represents a function that can wrap a http.Handler with
-// additional functionality. It takes a http.Handler and returns a new
-// http.Handler that includes the middleware's behavior.
-type Middleware func(http.Handler) http.Handler
-
-// Chain creates a chain of HTTP middleware functions to wrap around a
-// http.Handler.
-// It applies each middleware in the order they are provided, allowing for
-// layered processing of HTTP requests and responses.
-func Chain(next http.Handler, ms ...Middleware) http.Handler {
-	for i := len(ms) - 1; i >= 0; i-- {
-		m := ms[i]
-		next = m(next)
-	}
-	return next
-}
-
 // Nonced is a middleware that verifies the presence of a valid nonce in a
 // request.
 // If the nonce is not provided or is invalid, it prevents the request from

middleware_test.go

@@ -20,90 +20,10 @@ import (
 	"time"
 
 	"github.com/candango/gopeasant/dummy"
-	"github.com/candango/gopeasant/testrunner"
+	"github.com/candango/httpok/testrunner"
 	"github.com/stretchr/testify/assert"
 )
 
-type PlainHandler struct {
-	http.Handler
-}
-
-func (h *PlainHandler) GetSomething(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte("Something"))
-}
-
-func (h *PlainHandler) GetSomethingElse(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte("Something else"))
-}
-
-func NewPlainServeMux() http.Handler {
-	plain := &PlainHandler{}
-	h := http.NewServeMux()
-	h.HandleFunc("/something", plain.GetSomething)
-	h.HandleFunc("/something_else", plain.GetSomethingElse)
-	return h
-}
-
-func TestChainMiddlewareServer(t *testing.T) {
-	plain := NewPlainServeMux()
-
-	runner := testrunner.NewHttpTestRunner(t).WithHandler(plain)
-
-	t.Run("Plain runner", func(t *testing.T) {
-		res, err := runner.WithPath("/something").Get()
-		if err != nil {
-			t.Error(err)
-		}
-		assert.Equal(t, "200 OK", res.Status)
-		assert.Equal(t, "Something", testrunner.BodyAsString(t, res))
-
-		res, err = runner.WithPath("/something_else").Get()
-		if err != nil {
-			t.Error(err)
-		}
-		assert.Equal(t, "200 OK", res.Status)
-		assert.Equal(t, "Something else", testrunner.BodyAsString(t, res))
-	})
-
-	changeSomething := func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if r.URL.String() == "/something" {
-				w.Write([]byte("First Middleware with "))
-			}
-			next.ServeHTTP(w, r)
-		})
-	}
-
-	blockSomethingElse := func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if r.URL.String() == "/something_else" {
-				http.Error(w, "Not allowed", http.StatusMethodNotAllowed)
-				return
-			}
-			next.ServeHTTP(w, r)
-		})
-	}
-
-	chain := Chain(plain, changeSomething, blockSomethingElse)
-	runner = testrunner.NewHttpTestRunner(t).WithHandler(chain)
-
-	t.Run("Chained runner", func(t *testing.T) {
-		res, err := runner.WithPath("/something").Get()
-		if err != nil {
-			t.Error(err)
-		}
-		assert.Equal(t, "200 OK", res.Status)
-		assert.Equal(t, "First Middleware with Something", testrunner.BodyAsString(t, res))
-
-		res, err = runner.WithPath("/something_else").Get()
-		if err != nil {
-			t.Error(err)
-		}
-		assert.Equal(t, "405 Method Not Allowed", res.Status)
-		assert.Equal(t, "Not allowed\n", testrunner.BodyAsString(t, res))
-	})
-}
-
 func NewNoncedServeMux(t *testing.T) http.Handler {
 	s := dummy.NewDummyInMemoryNonceService()
 	nonced := NewNoncedHandler(s)

server_test.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/candango/gopeasant/dummy"
-	"github.com/candango/gopeasant/testrunner"
+	"github.com/candango/httpok/testrunner"
 	"github.com/stretchr/testify/assert"
 )