Skip to content

Use Default Case instead of forced lowercase in ToMTag #54

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
sugab wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use Default Case instead of forced lowercase in ToMTag #54

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96816c6
Use `DefaultCase` in `ToMTag` function
sugab Sep 17, 2020
0066e3f
User first tag name
sugab Sep 17, 2020
85750f3
feat check whether field is castable
novalagung Jan 25, 2021
b542799
Merge pull request #1 from novalagung/master
sugab Jan 26, 2021
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
17 changes: 10 additions & 7 deletions m.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func ToM(data interface{}) (M, error) {
}

func ToMTag(data interface{}, tagName string) (M, error) {
return tomTagName(data, CaseLower, tagName)
return tomTagName(data, DefaultCase, tagName)
}

var _tagName string
Expand Down Expand Up @@ -119,7 +119,7 @@ func tomTagName(data interface{}, namePattern string, tagName string) (M, error)
f := rv.Type().Field(i)
fieldName := f.Name
if f.Tag.Get(tagName) != "" {
fieldName = f.Tag.Get(tagName)
fieldName = strings.Split(f.Tag.Get(tagName), ",")[0]
}
if fieldName == "-" {
continue
Expand All @@ -135,13 +135,16 @@ func tomTagName(data interface{}, namePattern string, tagName string) (M, error)

// If the type is struct but not time.Time or is a map
if (f.Type.Kind() == reflect.Struct && f.Type != reflect.TypeOf(time.Time{})) || f.Type.Kind() == reflect.Map {

// Then we need to call this function again to fetch the sub value
subRes, err := tom(rv.Field(i).Interface(), namePattern)
if err != nil {
return nil, err
}
if rv.Field(i).CanInterface() {
subRes, err := tom(rv.Field(i).Interface(), namePattern)
if err != nil {
return nil, err
}

res[fieldName] = subRes
res[fieldName] = subRes
}

// Skip the rest
continue
Expand Down