guard import

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
change import paths
2021-10-25 20:41:38 +03:00 · 2021-10-25 20:28:35 +03:00 · 2021-09-27 04:25:56 +00:00 · 2021-09-27 04:24:57 +00:00 · 2021-09-23 17:39:40 +03:00 · 2021-09-23 05:19:01 +00:00
5 changed files with 75 additions and 33 deletions
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -25,7 +25,7 @@ jobs:
          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
    steps:
      - name: Approve Changes and Merge changes if label 'dependencies' is set
-        uses: actions/github-script@v4
+        uses: actions/github-script@v5
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
--- a/codec_test.go
+++ b/codec_test.go
@@ -3,8 +3,40 @@ package xml
 import (
 	"bytes"
 	"testing"
+
+	"go.unistack.org/micro/v3/codec"
 )

+func TestFrame(t *testing.T) {
+	s := &codec.Frame{Data: []byte("test")}
+
+	buf, err := NewCodec().Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(buf, []byte(`test`)) {
+		t.Fatalf("bytes not equal %s != %s", buf, `test`)
+	}
+}
+
+func TestFrameFlatten(t *testing.T) {
+	s := &struct {
+		One  string
+		Name *codec.Frame `xml:"name" codec:"flatten"`
+	}{
+		One:  "xx",
+		Name: &codec.Frame{Data: []byte("test")},
+	}
+
+	buf, err := NewCodec().Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(buf, []byte(`test`)) {
+		t.Fatalf("bytes not equal %s != %s", buf, `test`)
+	}
+}
+
 func TestReadBody(t *testing.T) {
 	s := &struct {
 		Name string
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
-module github.com/unistack-org/micro-codec-xml/v3
+module go.unistack.org/micro-codec-xml/v3

 go 1.16

-require github.com/unistack-org/micro/v3 v3.7.1
+require go.unistack.org/micro/v3 v3.8.4
--- a/go.sum
+++ b/go.sum
@@ -1,30 +1,26 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc=
-github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg=
-github.com/unistack-org/micro/v3 v3.7.1 h1:gjCon1U8i9upNgw9+iEgbZh2LCeBizDYotQ+THHV0lo=
-github.com/unistack-org/micro/v3 v3.7.1/go.mod h1:gBoY6gvzeFiJTZ4FgDttGNSs4Y1+1PRg2cV1yTRMSlg=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
+go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
+go.unistack.org/micro/v3 v3.8.4 h1:Nny6JT7TlDS0e5bPVmbbpKXrisMQ6q9cvao5uyaa3eo=
+go.unistack.org/micro/v3 v3.8.4/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/xml.go
+++ b/xml.go
@@ -1,49 +1,63 @@
 // Package xml provides a xml codec
-package xml
+package xml // import "go.unistack.org/micro-codec-xml/v3"

 import (
 	"encoding/xml"
 	"io"

-	"github.com/unistack-org/micro/v3/codec"
-	rutil "github.com/unistack-org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v3/codec"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )

-type xmlCodec struct{}
+var _ codec.Codec = &xmlCodec{}
+
+type xmlCodec struct {
+	opts codec.Options
+}

 const (
 	flattenTag = "flatten"
 )

-func (c *xmlCodec) Marshal(v interface{}) ([]byte, error) {
-	switch m := v.(type) {
-	case nil:
+func (c *xmlCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
+	if v == nil {
 		return nil, nil
-	case *codec.Frame:
-		return m.Data, nil
 	}

-	if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
+	options := c.opts
+	for _, o := range opts {
+		o(&options)
+	}
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
 		v = nv
 	}

+	if m, ok := v.(*codec.Frame); ok {
+		return m.Data, nil
+	}
+
 	return xml.Marshal(v)
 }

-func (c *xmlCodec) Unmarshal(b []byte, v interface{}) error {
+func (c *xmlCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) error {
 	if len(b) == 0 || v == nil {
 		return nil
 	}

+	options := c.opts
+	for _, o := range opts {
+		o(&options)
+	}
+
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
+		v = nv
+	}
+
 	if m, ok := v.(*codec.Frame); ok {
 		m.Data = b
 		return nil
 	}

-	if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
-		v = nv
-	}
-
 	return xml.Unmarshal(b, v)
 }

@@ -86,6 +100,6 @@ func (c *xmlCodec) String() string {
 	return "xml"
 }

-func NewCodec() codec.Codec {
-	return &xmlCodec{}
+func NewCodec(opts ...codec.Option) *xmlCodec {
+	return &xmlCodec{opts: codec.NewOptions(opts...)}
 }
Author	SHA1	Message	Date
Vasiliy Tolstov	933de678cd	guard import Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-25 20:41:38 +03:00
Vasiliy Tolstov	a67f2bb719	change import paths Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-25 20:28:35 +03:00
github-actions[bot]	04fa09bd63	Merge pull request #36 from unistack-org/dependabot/github_actions/actions/github-script-5 Bump actions/github-script from 4 to 5	2021-09-27 04:25:56 +00:00
dependabot[bot]	555ea51811	Bump actions/github-script from 4 to 5 Bumps [actions/github-script](https://github.com/actions/github-script) from 4 to 5. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-27 04:24:57 +00:00
Vasiliy Tolstov	3ba495e1f1	fix flatten codec.Frame case Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-23 17:39:40 +03:00
github-actions[bot]	4fd05f2da8	Merge pull request #35 from unistack-org/dependabot/go_modules/github.com/unistack-org/micro/v3-3.7.4 Bump github.com/unistack-org/micro/v3 from 3.7.1 to 3.7.4	2021-09-23 05:19:01 +00:00
dependabot[bot]	91c80cb527	Bump github.com/unistack-org/micro/v3 from 3.7.1 to 3.7.4 Bumps [github.com/unistack-org/micro/v3](https://github.com/unistack-org/micro) from 3.7.1 to 3.7.4. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.7.1...v3.7.4) --- updated-dependencies: - dependency-name: github.com/unistack-org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-23 05:18:10 +00:00
Vasiliy Tolstov	1cf78d0bab	update for latest micro Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-23 06:39:12 +03:00