feat(mimetype/toml): 添加 TOML 支持

Author: caixw

mimetype/cbor/cbor_test.go

@@ -1,12 +1,24 @@
-// SPDX-FileCopyrightText: 2024 caixw
+// SPDX-FileCopyrightText: 2024-2025 caixw
 //
 // SPDX-License-Identifier: MIT
 
 package cbor
 
-import "github.com/issue9/web"
+import (
+	"testing"
+
+	"github.com/issue9/assert/v4"
+
+	"github.com/issue9/web"
+	"github.com/issue9/web/mimetype/mimetypetest"
+)
 
 var (
 	_ web.MarshalFunc   = Marshal
 	_ web.UnmarshalFunc = Unmarshal
 )
+
+func TestCBOR(t *testing.T) {
+	a := assert.New(t, false)
+	mimetypetest.Test(a, Marshal, Unmarshal)
+}

mimetype/gob/gob_test.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018-2024 caixw
+// SPDX-FileCopyrightText: 2018-2025 caixw
 //
 // SPDX-License-Identifier: MIT
 
@@ -11,6 +11,7 @@ import (
 	"github.com/issue9/assert/v4"
 
 	"github.com/issue9/web"
+	"github.com/issue9/web/mimetype/mimetypetest"
 )
 
 var (
@@ -43,4 +44,6 @@ func TestGOB(t *testing.T) {
 
 	data, err = Marshal(nil, nil)
 	a.Error(err).Nil(data)
+
+	mimetypetest.Test(a, Marshal, Unmarshal)
 }

mimetype/mimetypetest/mimetypetest.go

@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: 2025 caixw
+//
+// SPDX-License-Identifier: MIT
+
+// Package mimetypetest 提供了用于测试 mimetype 的函数
+package mimetypetest
+
+import (
+	"bytes"
+	"net/http"
+
+	"github.com/issue9/assert/v4"
+	"golang.org/x/text/language"
+
+	"github.com/issue9/web"
+	"github.com/issue9/web/server"
+	"github.com/issue9/web/server/servertest"
+)
+
+var inst = &web.Problem{
+	Type:     "https://example.com/probs/test",
+	Title:    "test",
+	Status:   200,
+	Detail:   "test",
+	Instance: "instance",
+}
+
+func Test(a *assert.Assertion, m web.MarshalFunc, u web.UnmarshalFunc) {
+	s, err := server.NewHTTP("test", "1.0", &server.Options{
+		HTTPServer: &http.Server{Addr: ":8080"},
+		Language:   language.English,
+	})
+	a.NotError(err).NotNil(s)
+
+	s.Routers().New("main", nil).Get("/path", func(ctx *web.Context) web.Responser {
+		data, err := m(ctx, inst)
+		a.NotError(err).NotNil(data)
+
+		inst2 := &web.Problem{}
+		a.NotError(u(bytes.NewBuffer(data), inst2))
+		a.Equal(inst, inst2)
+
+		return web.OK(nil)
+	})
+
+	defer servertest.Run(a, s)()
+	defer s.Close(0)
+
+	servertest.Get(a, "http://localhost:8080/path").
+		Do(nil).
+		Status(http.StatusOK)
+}

mimetype/toml/toml.go

@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2025 caixw
+//
+// SPDX-License-Identifier: MIT
+
+// Package toml [TOML] 编码
+//
+// [TOML]: https://toml.io/cn/
+package toml
+
+import (
+	"io"
+
+	"github.com/BurntSushi/toml"
+
+	"github.com/issue9/web"
+)
+
+const (
+	Mimetype        = "application/toml"
+	ProblemMimetype = "application/problem+toml"
+)
+
+func Marshal(_ *web.Context, v any) ([]byte, error) { return toml.Marshal(v) }
+
+func Unmarshal(r io.Reader, v any) error {
+	_, err := toml.NewDecoder(r).Decode(v)
+	return err
+}

mimetype/toml/toml_test.go

@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: 2025 caixw
+//
+// SPDX-License-Identifier: MIT
+
+package toml
+
+import (
+	"testing"
+
+	"github.com/issue9/assert/v4"
+
+	"github.com/issue9/web"
+	"github.com/issue9/web/mimetype/mimetypetest"
+)
+
+var (
+	_ web.MarshalFunc   = Marshal
+	_ web.UnmarshalFunc = Unmarshal
+)
+
+func TestTOML(t *testing.T) {
+	a := assert.New(t, false)
+	mimetypetest.Test(a, Marshal, Unmarshal)
+}

mimetype/yaml/yaml_test.go

@@ -4,9 +4,21 @@
 
 package yaml
 
-import "github.com/issue9/web"
+import (
+	"testing"
+
+	"github.com/issue9/assert/v4"
+
+	"github.com/issue9/web"
+	"github.com/issue9/web/mimetype/mimetypetest"
+)
 
 var (
 	_ web.MarshalFunc   = Marshal
 	_ web.UnmarshalFunc = Unmarshal
 )
+
+func TestYAML(t *testing.T) {
+	a := assert.New(t, false)
+	mimetypetest.Test(a, Marshal, Unmarshal)
+}