refactor: simplify decoder, add tests (#89)

Author: abemedia

decoder/adapters.go

@@ -0,0 +1,86 @@
+package decoder
+
+import (
+	"github.com/abemedia/go-don/internal/byteconv"
+	"github.com/abemedia/httprouter"
+	"github.com/valyala/fasthttp"
+)
+
+type Map map[string][]string
+
+func (m Map) Get(key string) string {
+	if m == nil {
+		return ""
+	}
+	if vs := m[key]; len(vs) > 0 {
+		return vs[0]
+	}
+	return ""
+}
+
+func (m Map) Values(key string) []string {
+	if m == nil {
+		return nil
+	}
+	return m[key]
+}
+
+type Args fasthttp.Args
+
+func (ps *Args) Get(key string) string {
+	return byteconv.Btoa((*fasthttp.Args)(ps).Peek(key))
+}
+
+func (ps *Args) Values(key string) []string {
+	args := (*fasthttp.Args)(ps).PeekMulti(key)
+	if len(args) == 0 {
+		return nil
+	}
+
+	res := make([]string, len(args))
+	for i := range args {
+		res[i] = byteconv.Btoa(args[i])
+	}
+
+	return res
+}
+
+type Header fasthttp.RequestHeader
+
+func (ps *Header) Get(key string) string {
+	return byteconv.Btoa((*fasthttp.RequestHeader)(ps).Peek(key))
+}
+
+func (ps *Header) Values(key string) []string {
+	args := (*fasthttp.RequestHeader)(ps).PeekAll(key)
+	if len(args) == 0 {
+		return nil
+	}
+
+	res := make([]string, len(args))
+	for i := range args {
+		res[i] = byteconv.Btoa(args[i])
+	}
+
+	return res
+}
+
+type Params httprouter.Params
+
+func (ps Params) Get(key string) string {
+	for i := range ps {
+		if ps[i].Key == key {
+			return ps[i].Value
+		}
+	}
+	return ""
+}
+
+func (ps Params) Values(key string) []string {
+	for i := range ps {
+		if ps[i].Key == key {
+			return []string{ps[i].Value}
+		}
+	}
+	return nil
+}

decoder/adapters_test.go

@@ -0,0 +1,57 @@
+package decoder_test
+
+import (
+	"testing"
+
+	"github.com/abemedia/go-don/decoder"
+	"github.com/abemedia/httprouter"
+	"github.com/google/go-cmp/cmp"
+	"github.com/valyala/fasthttp"
+)
+
+func TestAdapters(t *testing.T) {
+	t.Run("Args", func(t *testing.T) {
+		in := &fasthttp.Args{}
+		in.Add("string", "string")
+		testAdapter(t, (*decoder.Args)(in))
+	})
+
+	t.Run("Header", func(t *testing.T) {
+		in := &fasthttp.RequestHeader{}
+		in.Add("string", "string")
+		testAdapter(t, (*decoder.Header)(in))
+	})
+
+	t.Run("Params", func(t *testing.T) {
+		in := httprouter.Params{{Key: "string", Value: "string"}}
+		testAdapter(t, decoder.Params(in))
+	})
+}
+
+func testAdapter(t *testing.T, in decoder.Getter) {
+	t.Helper()
+
+	type item struct {
+		String  string   `field:"string"`
+		Strings []string `field:"string"`
+	}
+
+	want := &item{
+		String:  "string",
+		Strings: []string{"string"},
+	}
+
+	dec, err := decoder.NewCached(item{}, "field")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	got := &item{}
+	if err = dec.Decode(in, got); err != nil {
+		t.Fatal(err)
+	}
+
+	if diff := cmp.Diff(want, got); diff != "" {
+		t.Errorf(diff)
+	}
+}

decoder/args.go

@@ -33,7 +33,7 @@ func BenchmarkDecoder(b *testing.B) {
 		NestedPtr *child
 	}
 
-	in := decoder.MapGetter{
+	in := decoder.Map{
 		"string":  {"string"},
 		"strings": {"string", "string"},
 		"int":     {"1"},
@@ -63,7 +63,7 @@ func BenchmarkDecoder(b *testing.B) {
 	})
 
 	b.Run("DonCached", func(b *testing.B) {
-		dec, err := decoder.NewCachedDecoder(test{}, "schema")
+		dec, err := decoder.NewCached(test{}, "schema")
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -77,7 +77,7 @@ func BenchmarkDecoder(b *testing.B) {
 	})
 
 	b.Run("Don", func(b *testing.B) {
-		dec := decoder.NewDecoder("schema")
+		dec := decoder.New("schema")
 
 		for i := 0; i < b.N; i++ {
 			out := &test{}