Skip to content

Added the ability to specify a marshaller to use (instead of only json) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sdedelbrock wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added the ability to specify a marshaller to use (instead of only json) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ type Person struct {

func main(){
var i = Person{}
err := schema.Unmarshal([]byte(`{}`), &i)
err := schema.Unmarshal(json.Unmarshall,[]byte(`{}`), &i)
fmt.Println(err) // Schema: The Field FirstName is required
err = schema.Unmarshal([]byte(`{"first-name":"Charlie", "last-name":"Chaplin"}`), &i)
err = schema.Unmarshal(json.Unmarshall,[]byte(`{"first-name":"Charlie", "last-name":"Chaplin"}`), &i)
fmt.Println(err,i) //<nil> {Charlie Chap}
}
```
12 changes: 7 additions & 5 deletions schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package schema

import (
"encoding/json"
"reflect"
"regexp"
"strconv"
Expand All @@ -14,6 +13,9 @@ type SchemaError struct {
ErrType string
}

type Marshaller func(interface{}) ([]byte, error)
type Unmarshaller func([]byte, interface{}) error

func (s *SchemaError) Error() string {
switch s.ErrType {
case "req":
Expand All @@ -22,17 +24,17 @@ func (s *SchemaError) Error() string {
return "Schema: Unknown error on Field " + s.Field
}

func Unmarshal(data []byte, v interface{}) error {
err := json.Unmarshal(data, &v)
func Unmarshal(um Unmarshaller, data []byte, v interface{}) error {
err := um(data, &v)
if err != nil {
return err
}

return conform(reflect.ValueOf(v))
}

func Marshal(v interface{}) ([]byte, error) {
j, err := json.Marshal(v)
func Marshal(m Marshaller, v interface{}) ([]byte, error) {
j, err := m(v)
if err != nil {
return nil, err
}
Expand Down
12 changes: 6 additions & 6 deletions schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ func TestTruncateReallyComplicatedStruct(t *testing.T) {
parent := `{"test_ptrs1":[{"name":"John","age":25,"hair":[{"color":"brown"}]},{"name":"John","age":25,"hair":[{"color":"brown"}]}],"test_ptrs2":[{"name":"John","age":25,"hair":[{"color":"brown"}]},{"name":"John","age":25,"hair":[{"color":"brown"}]}],"test_ptrs3":[{"name":"John","age":25,"hair":[{"color":"brown"}]},{"name":"John","age":25,"hair":[{"color":"brown"}]}],"test_slices1":[{"name":"John","age":25,"hair":[{"color":"brown"}]},{"name":"John","age":25,"hair":[{"color":"brown"}]}],"test_slices2":[{"name":"John","age":25,"hair":[{"color":"brown"}]},{"name":"John","age":25,"hair":[{"color":"brown"}]}],"test_slices3":[{"name":"John","age":25,"hair":[{"color":"brown"}]},{"name":"John","age":25,"hair":[{"color":"brown"}]}],"tests1":[{"name":"John","age":25,"hair":{"color":"brown"}},{"name":"John","age":25,"hair":{"color":"brown"}}],"tests2":[{"name":"John","age":25,"hair":{"color":"brown"}},{"name":"John","age":25,"hair":{"color":"brown"}}],"tests3":[{"name":"John","age":25,"hair":{"color":"brown"}},{"name":"John","age":25,"hair":{"color":"brown"}}]}`
expected := `{"test_ptrs1":[{"name":"John","age":25,"hair":[{"color":"br"}]},{"name":"John","age":25,"hair":[{"color":"br"}]}],"test_slices1":[{"name":"John","age":25,"hair":[{"color":"br"}]},{"name":"John","age":25,"hair":[{"color":"br"}]}],"tests1":[{"name":"John","age":25,"hair":{"color":"br"}},{"name":"John","age":25,"hair":{"color":"br"}}],"test_ptrs2":[{"name":"John","age":25,"hair":[{"color":"br"}]},{"name":"John","age":25,"hair":[{"color":"br"}]}],"test_slices2":[{"name":"John","age":25,"hair":[{"color":"br"}]},{"name":"John","age":25,"hair":[{"color":"br"}]}],"tests2":[{"name":"John","age":25,"hair":{"color":"br"}},{"name":"John","age":25,"hair":{"color":"br"}}],"test_ptrs3":[{"name":"John","age":25,"hair":[{"color":"br"}]},{"name":"John","age":25,"hair":[{"color":"br"}]}],"test_slices3":[{"name":"John","age":25,"hair":[{"color":"br"}]},{"name":"John","age":25,"hair":[{"color":"br"}]}],"tests3":[{"name":"John","age":25,"hair":{"color":"br"}},{"name":"John","age":25,"hair":{"color":"br"}}]}`

err := Unmarshal([]byte(parent), p)
err := Unmarshal(json.Unmarshal, []byte(parent), p)
if err != nil {
t.Error(err)
}

output, err := Marshal(p)
output, err := Marshal(json.Marshal, p)

if !bytes.Equal([]byte(expected), output) {
var dst bytes.Buffer
Expand All @@ -73,7 +73,7 @@ func TestTruncateComplicatedStruct(t *testing.T) {
var s = &TestSlice{}
testPtr := `{"name": "John", "age" : 25, "hair": [{"color": "brown"}, {"color": "blonde"}]}`

err := Unmarshal([]byte(testPtr), s)
err := Unmarshal(json.Unmarshal, []byte(testPtr), s)
if err != nil {
t.Error(err)
}
Expand All @@ -88,7 +88,7 @@ func TestTruncateComplicatedStruct2(t *testing.T) {
var s = &TestPtr{}
testPtr := `{"name": "John", "age" : 25, "hair": [{"color": "brown"}]}`

err := Unmarshal([]byte(testPtr), s)
err := Unmarshal(json.Unmarshal, []byte(testPtr), s)
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestRequired(t *testing.T) {

for _, f := range fixtures {
t.Log(f.name)
err := Unmarshal([]byte(f.json), f.s)
err := Unmarshal(json.Unmarshal, []byte(f.json), f.s)
if fmt.Sprint(err) != fmt.Sprint(f.Expected) {
t.Error(f.name, f.msg, err)
}
Expand All @@ -138,7 +138,7 @@ func TestTruncateString(t *testing.T) {

for _, f := range fixtures {
t.Log(f.name)
err := Unmarshal([]byte(f.json), f.s)
err := Unmarshal(json.Unmarshal, []byte(f.json), f.s)
if fmt.Sprint(err) != fmt.Sprint(f.ExpectedErr) {
t.Error(f.msg, err)
}
Expand Down