Skip to content
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

Supported set to pointers #64

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

Supported set to pointers #64

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
101 changes: 87 additions & 14 deletions value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,34 +353,107 @@ func (val *value) setStruct(k string, v interface{}, targetValue reflect.Value)

func castValue(f interface{}, v interface{}) interface{} {
switch f.(type) {
// string
case *string:
value := cast.ToString(v)
return &value
case string:
return cast.ToString(v)
// bool
case *bool:
value := cast.ToBool(v)
return &value
case bool:
return cast.ToBool(v)
// int
case *int:
value := cast.ToInt(v)
return &value
case int:
return cast.ToInt(v)
case int64:
return cast.ToInt64(v)
// uint
case *uint:
value := cast.ToUint(v)
return &value
case uint:
return cast.ToUint(v)
// int8
case *int8:
value := cast.ToInt8(v)
return &value
case int8:
return cast.ToInt8(v)
// unt8
case *uint8:
value := cast.ToUint8(v)
return &value
case uint8:
return cast.ToUint8(v)
// int16
case *int16:
value := cast.ToInt16(v)
return &value
case int16:
return cast.ToInt16(v)
// unit16
case *uint16:
value := cast.ToUint16(v)
return &value
case uint16:
return cast.ToUint16(v)
// int32
case *int32:
value := cast.ToInt32(v)
return &value
case int32:
return cast.ToInt32(v)
case float64:
return cast.ToFloat64(v)
case float32:
return cast.ToFloat32(v)
case uint64:
return cast.ToUint64(v)
// uint32
case *uint32:
value := cast.ToUint32(v)
return &value
case uint32:
return cast.ToUint32(v)
case uint8:
return cast.ToUint8(v)
case []string:
return cast.ToStringSlice(v)
case []int:
return cast.ToIntSlice(v)
// int64
case *int64:
value := cast.ToInt64(v)
return &value
case int64:
return cast.ToInt64(v)
// uint64
case *uint64:
value := cast.ToUint64(v)
return &value
case uint64:
return cast.ToUint64(v)
// float32
case *float32:
value := cast.ToFloat32(v)
return &value
case float32:
return cast.ToFloat32(v)
// float64
case *float64:
value := cast.ToFloat64(v)
return &value
case float64:
return cast.ToFloat64(v)
// time.Time
case *time.Time:
value := cast.ToTime(v)
return &value
case time.Time:
return cast.ToTime(v)
// time.Duration
case *time.Duration:
value := cast.ToDuration(v)
return &value
case time.Duration:
return cast.ToDuration(v)
// rest
case []string:
return cast.ToStringSlice(v)
case []int:
return cast.ToIntSlice(v)
case map[string]string:
return cast.ToStringMapString(v)
}
Expand Down
8 changes: 8 additions & 0 deletions value_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ func TestSetStruct(t *testing.T) {
func(t *testing.T) {
type TestConfigSub struct {
VV string `konfig:"vv"`
PS1 *string `konfig:"ps1"`
PS2 *string `konfig:"ps2"`
TT int `konfig:"tt"`
B bool `konfig:"bool"`
F float64 `konfig:"float64"`
Expand All @@ -156,10 +158,12 @@ func TestSetStruct(t *testing.T) {
SubMapT map[string]TestConfigSub `konfig:"submapt"`
}

var ps1 = "test3"
var expectedConfig = TestConfig{
V: "test",
T: TestConfigSub{
VV: "test2",
PS1: &ps1,
TT: 1,
B: true,
F: 1.9,
Expand Down Expand Up @@ -200,6 +204,7 @@ func TestSetStruct(t *testing.T) {
var v = Values{
"v": "test",
"sub.vv": "test2",
"sub.ps1": ps1,
"sub.tt": 1,
"subt.tt": 2,
"sub.bool": true,
Expand All @@ -223,6 +228,9 @@ func TestSetStruct(t *testing.T) {
var configValue = Value().(TestConfig)
require.Equal(t, "test", configValue.V)
require.Equal(t, "test2", configValue.T.VV)
require.NotNil(t, configValue.T.PS1)
require.Equal(t, "test3", *configValue.T.PS1)
require.Nil(t, configValue.T.PS2)
require.Equal(t, 1, configValue.T.TT)
require.Equal(t, 2, configValue.SubT.TT)
require.Equal(t, true, configValue.T.B)
Expand Down