Merge remote-tracking branch 'origin/feature/credentials-management' …

…into feat/#20-multipart

codec/codec.go

@@ -11,13 +11,17 @@ import (
 )
 
 const (
-	JSON                    = "application/json"
-	XML                     = "text/xml"
-	YAML                    = "text/yaml"
-	defaultValidateOnRead   = false
-	defaultValidateBefWrite = false
-	ValidateOnRead          = "ValidateOnRead"
-	ValidateBefWrite        = "ValidateBefWrite"
+	JSON                      = "application/json"
+	XML                       = "text/xml"
+	XmlApplicationContentType = "application/xml"
+	YAML                      = "text/yaml"
+	defaultValidateOnRead     = false
+	defaultValidateBefWrite   = false
+	ValidateOnRead            = "ValidateOnRead"
+	ValidateBefWrite          = "ValidateBefWrite"
+	Charset                   = "charset"
+	JsonEscapeHTML            = "JsonEscapeHTML"
+	PrettyPrint               = "PrettyPrint"
 )
 
 // StringEncoder Interface
@@ -112,19 +116,39 @@ func Get(contentType string, options map[string]interface{}) (c Codec, err error
 	bc := &BaseCodec{
 		options: options,
 	}
-	switch contentType {
+	typ := contentType
+	if strings.Contains(contentType, textutils.SemiColonStr) {
+		values := strings.Split(contentType, textutils.SemiColonStr)
+		l := len(values)
+		for i := 0; i < l; i++ {
+			val := strings.TrimSpace(values[i])
+			if i == 0 {
+				typ = val
+			} else {
+				if strings.HasPrefix(val, Charset) {
+					charset := strings.Split(val, textutils.EqualStr)
+					if len(charset) == 2 {
+						//Charset is added to the options but not used by the known json,xml and yaml Read Writers
+						bc.SetOption(Charset, strings.TrimSpace(charset[1]))
+					}
+				}
+			}
+		}
+	}
+
+	switch typ {
 	case JSON:
 		{
-			bc.readerWriter = &jsonRW{}
+			bc.readerWriter = &jsonRW{options: options}
 
 		}
-	case XML:
+	case XML, XmlApplicationContentType:
 		{
-			bc.readerWriter = &xmlRW{}
+			bc.readerWriter = &xmlRW{options: options}
 		}
 	case YAML:
 		{
-			bc.readerWriter = &yamlRW{}
+			bc.readerWriter = &yamlRW{options: options}
 		}
 	default:
 		err = errutils.FmtError("Unsupported contentType %s", contentType)

codec/json_codec.go

@@ -2,21 +2,46 @@ package codec
 
 import (
 	"encoding/json"
-	"go.nandlabs.io/commons/codec/validator"
 	"io"
+
+	"go.nandlabs.io/commons/codec/validator"
+)
+
+const (
+	jsonPrettyPrintPrefix = ""
+	jsonPrettyPrintIndent = "  "
 )
 
 var structValidator = validator.NewStructValidator()
 
 type jsonRW struct {
+	options map[string]interface{}
 }
 
-func (c *jsonRW) Write(v interface{}, w io.Writer) error {
+func (j *jsonRW) Write(v interface{}, w io.Writer) error {
+	//only utf-8 charset is supported
+	var escapeHtml = false
+	var prettyPrint = false
+	if j.options != nil {
+		if v, ok := j.options[JsonEscapeHTML]; ok {
+			escapeHtml = v.(bool)
+		}
+
+		if v, ok := j.options[PrettyPrint]; ok {
+			prettyPrint = v.(bool)
+		}
 
-	return json.NewEncoder(w).Encode(v)
+	}
+	encoder := json.NewEncoder(w)
+	if prettyPrint {
+		encoder.SetIndent(jsonPrettyPrintPrefix, jsonPrettyPrintIndent)
+	}
+	encoder.SetEscapeHTML(escapeHtml)
+	return encoder.Encode(v)
 
 }
 
-func (c *jsonRW) Read(r io.Reader, v interface{}) error {
-	return json.NewDecoder(r).Decode(v)
+func (j *jsonRW) Read(r io.Reader, v interface{}) error {
+	decoder := json.NewDecoder(r)
+	return decoder.Decode(v)
 }

codec/xml_codec.go

@@ -2,34 +2,34 @@ package codec
 
 import (
 	"encoding/xml"
-	"errors"
-	"fmt"
 	"io"
-	"io/ioutil"
+)
+
+const (
+	xmlPrettyPrintPrefix = ""
+	xmlPrettyPrintIndent = "    "
 )
 
 type xmlRW struct {
+	options map[string]interface{}
 }
 
 func (x *xmlRW) Write(v interface{}, w io.Writer) error {
-	output, err := xml.Marshal(v)
-	if err != nil {
-		return errors.New(fmt.Sprintf("xml marshal error: %d", err))
+	encoder := xml.NewEncoder(w)
+	var prettyPrint = false
+	if x.options != nil {
+		if v, ok := x.options[PrettyPrint]; ok {
+			prettyPrint = v.(bool)
+		}
 	}
-	_, errW := w.Write(output)
-	if errW != nil {
-		return errW
+	if prettyPrint {
+		encoder.Indent(xmlPrettyPrintPrefix, xmlPrettyPrintIndent)
 	}
-	return nil
+	return encoder.Encode(v)
+
 }
 
 func (x *xmlRW) Read(r io.Reader, v interface{}) error {
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return errors.New(fmt.Sprintf("xml input error: %d", err))
-	}
-	if errU := xml.Unmarshal(b, v); err != nil {
-		return errors.New(fmt.Sprintf("xml unmarshal error: %d", errU))
-	}
-	return nil
+	decoder := xml.NewDecoder(r)
+	return decoder.Decode(v)
 }

codec/yaml_codec.go

@@ -1,36 +1,21 @@
 package codec
 
 import (
-	"errors"
-	"fmt"
 	"io"
-	"io/ioutil"
 
 	"gopkg.in/yaml.v3"
 )
 
 type yamlRW struct {
+	options map[string]interface{}
 }
 
 func (y *yamlRW) Write(v interface{}, w io.Writer) error {
-	output, err := yaml.Marshal(v)
-	if err != nil {
-		return errors.New(fmt.Sprintf("xml marshal error: %d", err))
-	}
-	_, errW := w.Write(output)
-	if errW != nil {
-		return errW
-	}
-	return nil
+	encoder := yaml.NewEncoder(w)
+	return encoder.Encode(v)
 }
 
 func (y *yamlRW) Read(r io.Reader, v interface{}) error {
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return errors.New(fmt.Sprintf("xml input error: %d", err))
-	}
-	if errU := yaml.Unmarshal(b, v); err != nil {
-		return errors.New(fmt.Sprintf("xml unmarshal error: %d", errU))
-	}
-	return nil
+	decoder := yaml.NewDecoder(r)
+	return decoder.Decode(v)
 }

go.mod

@@ -2,4 +2,6 @@ module go.nandlabs.io/commons
 
 go 1.18
 
-require gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+require (
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+)

go.sum

@@ -1,3 +1,5 @@
+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=

vfs/base_fs.go

@@ -1,9 +1,10 @@
 package vfs
 
 import (
-	"go.nandlabs.io/commons/ioutils"
 	"io"
 	"net/url"
+
+	"go.nandlabs.io/commons/ioutils"
 )
 
 type BaseVFS struct {

vfs/local_file.go

@@ -1,12 +1,12 @@
 package vfs
 
 import (
-	"go.nandlabs.io/commons/errutils"
 	"io/fs"
 	"io/ioutil"
 	"net/url"
 	"os"
 
+	"go.nandlabs.io/commons/errutils"
 	"go.nandlabs.io/commons/fsutils"
 	"go.nandlabs.io/commons/textutils"
 )

vfs/vfs_manager.go

@@ -1,9 +1,10 @@
 package vfs
 
 import (
-	"go.nandlabs.io/commons/errutils"
 	"net/url"
 	"sync"
+
+	"go.nandlabs.io/commons/errutils"
 )
 
 var manager Manager