From 25911f640f7db0fe031a60362b561e34bf5e9da8 Mon Sep 17 00:00:00 2001 From: EwenQuim Date: Mon, 9 Dec 2024 18:09:55 +0100 Subject: [PATCH] Gin compatibility --- extra/fuegogin/adaptor.go | 50 ++++++++++++++ extra/fuegogin/adaptor_test.go | 33 +++++++++ extra/fuegogin/context.go | 121 +++++++++++++++++++++++++++++++++ extra/fuegogin/go.mod | 50 ++++++++++++++ extra/fuegogin/go.sum | 121 +++++++++++++++++++++++++++++++++ extra/fuegogin/lib/lib.go | 36 ++++++++++ extra/fuegogin/serve/main.go | 16 +++++ go.work | 1 + html.go | 2 +- 9 files changed, 429 insertions(+), 1 deletion(-) create mode 100644 extra/fuegogin/adaptor.go create mode 100644 extra/fuegogin/adaptor_test.go create mode 100644 extra/fuegogin/context.go create mode 100644 extra/fuegogin/go.mod create mode 100644 extra/fuegogin/go.sum create mode 100644 extra/fuegogin/lib/lib.go create mode 100644 extra/fuegogin/serve/main.go diff --git a/extra/fuegogin/adaptor.go b/extra/fuegogin/adaptor.go new file mode 100644 index 00000000..a64d72d3 --- /dev/null +++ b/extra/fuegogin/adaptor.go @@ -0,0 +1,50 @@ +package fuegogin + +import ( + "github.com/gin-gonic/gin" + + "github.com/go-fuego/fuego" +) + +func Get[T, B any]( + s *fuego.Server, + e *gin.Engine, + path string, + handler func(c *ContextWithBody[T]) (B, error), + options ...func(*fuego.BaseRoute), +) *fuego.Route[B, T] { + return Handle(s, e, "GET", path, handler) +} + +func Post[T, B any]( + s *fuego.Server, + e *gin.Engine, + path string, + handler func(c *ContextWithBody[T]) (B, error), + options ...func(*fuego.BaseRoute), +) *fuego.Route[B, T] { + return Handle(s, e, "GET", path, handler) +} + +func Handle[T, B any]( + s *fuego.Server, + e *gin.Engine, + method, + path string, + handler func(c *ContextWithBody[T]) (B, error), + options ...func(*fuego.BaseRoute), +) *fuego.Route[B, T] { + e.Handle(method, path, func(c *gin.Context) { + ans, err := handler(&ContextWithBody[T]{}) + if err != nil { + c.Error(err) + return + } + + c.JSON(200, ans) + }) + + // Also register the route with fuego!!! + // Useful for the OpenAPI spec but also allows for to run Fuego in parallel. + return fuego.Get(s, path, handler, options...) +} diff --git a/extra/fuegogin/adaptor_test.go b/extra/fuegogin/adaptor_test.go new file mode 100644 index 00000000..69a50261 --- /dev/null +++ b/extra/fuegogin/adaptor_test.go @@ -0,0 +1,33 @@ +package fuegogin_test + +import ( + "net/http/httptest" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/go-fuego/fuego/extra/fuegogin/lib" +) + +func TestXxx(t *testing.T) { + e, _ := lib.SetupGin() + + t.Run("simply test gin", func(t *testing.T) { + r := httptest.NewRequest("GET", "/gin", nil) + w := httptest.NewRecorder() + + e.ServeHTTP(w, r) + + require.Equal(t, 200, w.Code) + }) + + t.Run("test fuego plugin", func(t *testing.T) { + r := httptest.NewRequest("GET", "/fuego", nil) + w := httptest.NewRecorder() + + e.ServeHTTP(w, r) + + require.Equal(t, 200, w.Code) + require.Equal(t, `{"message":"Hello "}`, w.Body.String()) + }) +} diff --git a/extra/fuegogin/context.go b/extra/fuegogin/context.go new file mode 100644 index 00000000..acda03d1 --- /dev/null +++ b/extra/fuegogin/context.go @@ -0,0 +1,121 @@ +package fuegogin + +import ( + "context" + "net/http" + "net/url" + + "github.com/go-fuego/fuego" +) + +type ContextWithBody[B any] struct{} + +// Body implements fuego.Ctx. +func (c *ContextWithBody[B]) Body() (B, error) { + panic("unimplemented") +} + +// Context implements fuego.Ctx. +func (c *ContextWithBody[B]) Context() context.Context { + panic("unimplemented") +} + +// Cookie implements fuego.Ctx. +func (c *ContextWithBody[B]) Cookie(name string) (*http.Cookie, error) { + panic("unimplemented") +} + +// Header implements fuego.Ctx. +func (c *ContextWithBody[B]) Header(key string) string { + panic("unimplemented") +} + +// MainLang implements fuego.Ctx. +func (c *ContextWithBody[B]) MainLang() string { + panic("unimplemented") +} + +// MainLocale implements fuego.Ctx. +func (c *ContextWithBody[B]) MainLocale() string { + panic("unimplemented") +} + +// MustBody implements fuego.Ctx. +func (c *ContextWithBody[B]) MustBody() B { + panic("unimplemented") +} + +// PathParam implements fuego.Ctx. +func (c *ContextWithBody[B]) PathParam(name string) string { + panic("unimplemented") +} + +// QueryParam implements fuego.Ctx. +func (c *ContextWithBody[B]) QueryParam(name string) string { + panic("unimplemented") +} + +// QueryParamArr implements fuego.Ctx. +func (c *ContextWithBody[B]) QueryParamArr(name string) []string { + panic("unimplemented") +} + +// QueryParamBool implements fuego.Ctx. +func (c *ContextWithBody[B]) QueryParamBool(name string) bool { + panic("unimplemented") +} + +// QueryParamBoolErr implements fuego.Ctx. +func (c *ContextWithBody[B]) QueryParamBoolErr(name string) (bool, error) { + panic("unimplemented") +} + +// QueryParamInt implements fuego.Ctx. +func (c *ContextWithBody[B]) QueryParamInt(name string) int { + panic("unimplemented") +} + +// QueryParamIntErr implements fuego.Ctx. +func (c *ContextWithBody[B]) QueryParamIntErr(name string) (int, error) { + panic("unimplemented") +} + +// QueryParams implements fuego.Ctx. +func (c *ContextWithBody[B]) QueryParams() url.Values { + panic("unimplemented") +} + +// Redirect implements fuego.Ctx. +func (c *ContextWithBody[B]) Redirect(code int, url string) (any, error) { + panic("unimplemented") +} + +// Render implements fuego.Ctx. +func (c *ContextWithBody[B]) Render(templateToExecute string, data any, templateGlobsToOverride ...string) (fuego.CtxRenderer, error) { + panic("unimplemented") +} + +// Request implements fuego.Ctx. +func (c *ContextWithBody[B]) Request() *http.Request { + panic("unimplemented") +} + +// Response implements fuego.Ctx. +func (c *ContextWithBody[B]) Response() http.ResponseWriter { + panic("unimplemented") +} + +// SetCookie implements fuego.Ctx. +func (c *ContextWithBody[B]) SetCookie(cookie http.Cookie) { + panic("unimplemented") +} + +// SetHeader implements fuego.Ctx. +func (c *ContextWithBody[B]) SetHeader(key, value string) { + panic("unimplemented") +} + +// SetStatus implements fuego.Ctx. +func (c *ContextWithBody[B]) SetStatus(code int) { + panic("unimplemented") +} diff --git a/extra/fuegogin/go.mod b/extra/fuegogin/go.mod new file mode 100644 index 00000000..c860c21a --- /dev/null +++ b/extra/fuegogin/go.mod @@ -0,0 +1,50 @@ +module github.com/go-fuego/fuego/extra/fuegogin + +go 1.22.5 + +require ( + github.com/gin-gonic/gin v1.10.0 + github.com/go-fuego/fuego v0.16.1 + github.com/stretchr/testify v1.10.0 +) + +require ( + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gabriel-vasile/mimetype v1.4.7 // indirect + github.com/getkin/kin-openapi v0.128.0 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.23.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect + github.com/gorilla/schema v1.4.1 // indirect + github.com/invopop/yaml v0.3.1 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/perimeterx/marshmallow v1.1.5 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + golang.org/x/arch v0.8.0 // indirect + golang.org/x/crypto v0.30.0 // indirect + golang.org/x/net v0.32.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/extra/fuegogin/go.sum b/extra/fuegogin/go.sum new file mode 100644 index 00000000..fed7c256 --- /dev/null +++ b/extra/fuegogin/go.sum @@ -0,0 +1,121 @@ +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA= +github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU= +github.com/getkin/kin-openapi v0.128.0 h1:jqq3D9vC9pPq1dGcOCv7yOp1DaEe7c/T1vzcLbITSp4= +github.com/getkin/kin-openapi v0.128.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-fuego/fuego v0.16.1 h1:G+sDF55BjFI7FH7dd07HDx4jfNPxXEeab+YKuLjj5zY= +github.com/go-fuego/fuego v0.16.1/go.mod h1:ARPlRxY+RgbahF6ZvnjsESGQd3h/jCw8ksCJxKLbgjY= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= +github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= +github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E= +github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM= +github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso= +github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= +github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= +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/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/thejerf/slogassert v0.3.4 h1:VoTsXixRbXMrRSSxDjYTiEDCM4VWbsYPW5rB/hX24kM= +github.com/thejerf/slogassert v0.3.4/go.mod h1:0zn9ISLVKo1aPMTqcGfG1o6dWwt+Rk574GlUxHD4rs8= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY= +golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= +golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/extra/fuegogin/lib/lib.go b/extra/fuegogin/lib/lib.go new file mode 100644 index 00000000..4c7e1478 --- /dev/null +++ b/extra/fuegogin/lib/lib.go @@ -0,0 +1,36 @@ +package lib + +import ( + "github.com/gin-gonic/gin" + + "github.com/go-fuego/fuego" + "github.com/go-fuego/fuego/extra/fuegogin" +) + +type HelloRequest struct { + Name string `json:"name"` +} + +type HelloResponse struct { + Message string `json:"message"` +} + +func SetupGin() (*gin.Engine, *fuego.Server) { + e := gin.Default() + s := fuego.NewServer() + + e.GET("/gin", ginController) + fuegogin.Get(s, e, "/fuego", fuegoController) + + return e, s +} + +func ginController(c *gin.Context) { + c.String(200, "pong") +} + +func fuegoController(c *fuegogin.ContextWithBody[HelloRequest]) (HelloResponse, error) { + return HelloResponse{ + Message: "Hello ", + }, nil +} diff --git a/extra/fuegogin/serve/main.go b/extra/fuegogin/serve/main.go new file mode 100644 index 00000000..0bceb7ab --- /dev/null +++ b/extra/fuegogin/serve/main.go @@ -0,0 +1,16 @@ +package main + +import "github.com/go-fuego/fuego/extra/fuegogin/lib" + +func main() { + e, s := lib.SetupGin() + + go func() { + s.Run() + }() + + err := e.Run(":8080") + if err != nil { + panic(err) + } +} diff --git a/go.work b/go.work index 0d2d1f60..01c6faea 100644 --- a/go.work +++ b/go.work @@ -10,6 +10,7 @@ use ( ./examples/generate-opengraph-image ./examples/hello-world ./examples/openapi + ./extra/fuegogin ./extra/markdown ./middleware/basicauth ./middleware/cache diff --git a/html.go b/html.go index 4d8cc59b..5ff246b1 100644 --- a/html.go +++ b/html.go @@ -49,7 +49,7 @@ type Renderer interface { type Gomponent = Renderer // HTML is a marker type used to differentiate between a string response and an HTML response. -// To use templating, use [Ctx.Render]. +// To use templating, use [ctx.Render]. type HTML string // H is a shortcut for map[string]any