Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,18 @@ _testmain.go
old.txt
new.txt

/.idea
/.idea# Devenv
.devenv*
devenv.local.nix

# direnv
.direnv

# pre-commit
.pre-commit-config.yaml

# devenv nix files
devenv.nix
devenv.yaml
devenv.lock
.envrc
10 changes: 9 additions & 1 deletion decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,15 @@ func (d *decoder) setFieldByType(current reflect.Value, namespace []byte, idx in
return
}

v.Set(reflect.ValueOf(val))
if kind == reflect.Ptr {
newVal := reflect.New(v.Type().Elem())
if set = d.setFieldByType(newVal.Elem(), namespace, idx); set {
v.Set(newVal)
}
} else {
v.Set(reflect.ValueOf(val))
}

set = true
return
}
Expand Down
55 changes: 49 additions & 6 deletions decoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -830,28 +830,71 @@ func TestDecoderStruct(t *testing.T) {

func TestDecoderNativeTime(t *testing.T) {

type TType time.Time
type TTypePtr *time.Time
type TTypePtrWithCustomDecoder *time.Time

type TestError struct {
Time time.Time
TimeNoValue time.Time
TimePtr *time.Time
Time time.Time
TimeNoValue time.Time
TimePtr *time.Time
TimeType TType
TimeTypeNoValue TType
TimeTypePtr TTypePtr
TimeTypePtrNoValue TTypePtr
TimeTypePtrWithCustomDecoder TTypePtrWithCustomDecoder
TimeTypePtrWithCustomDecoderNoValue TTypePtrWithCustomDecoder
}

values := url.Values{
"Time": []string{"2006-01-02T15:04:05Z"},
"TimeNoValue": []string{""},
"TimePtr": []string{"2006-01-02T15:04:05Z"},
"Time": []string{"2006-01-02T15:04:05Z"},
"TimeNoValue": []string{""},
"TimePtr": []string{"2006-01-02T15:04:05Z"},
"TimeType": []string{"2006-01-02T15:04:05Z"},
"TimeTypeNoValue": []string{""},
"TimeTypePtr": []string{"2006-01-02T15:04:05Z"},
"TimeTypePtrNoValue": []string{""},
"TimeTypePtrWithCustomDecoder": []string{"2006-01-02T15:04:05Z"},
"TimeTypePtrWithCustomDecoderNoValue": []string{""},
}

var test TestError

decoder := NewDecoder()
decoder.RegisterCustomTypeFunc(func(s []string) (interface{}, error) {
if s[0] == "" {
return TType{}, nil
}
parsed, err := time.Parse(time.RFC3339, s[0])
if err != nil {
return nil, err
}
return TType(parsed), nil
}, TType{})
decoder.RegisterCustomTypeFunc(func(s []string) (interface{}, error) {
if s[0] == "" {
return nil, nil
}
parsed, err := time.Parse(time.RFC3339, s[0])
if err != nil {
return nil, err
}
return TTypePtrWithCustomDecoder(&parsed), nil
}, TTypePtrWithCustomDecoder(nil))

errs := decoder.Decode(&test, values)
Equal(t, errs, nil)

tm, _ := time.Parse(time.RFC3339, "2006-01-02T15:04:05Z")
Equal(t, test.Time.Equal(tm), true)
Equal(t, test.TimeNoValue.Equal(tm), false)
Equal(t, tm.Equal(time.Time(test.TimeType)), true)
Equal(t, time.Time(test.TimeTypeNoValue).Equal(tm), false)
Equal(t, time.Time(test.TimeTypeNoValue).IsZero(), true)
Equal(t, (*time.Time)(test.TimeTypePtr).Equal(tm), true)
Equal(t, test.TimeTypePtrNoValue, nil)
Equal(t, (*time.Time)(test.TimeTypePtrWithCustomDecoder).Equal(tm), true)
Equal(t, test.TimeTypePtrWithCustomDecoderNoValue, nil)

NotEqual(t, test.TimePtr, nil)
Equal(t, (*test.TimePtr).Equal(tm), true)
Expand Down