Skip to content

Commit

Permalink
Merge pull request #13 from franciscocpg/fix-date-time
Browse files Browse the repository at this point in the history 
Fix date time
  • Loading branch information
@franciscocpg
franciscocpg authored Nov 8, 2017
2 parents f29b058 + 08c4789 commit f06ae3c
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 31 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
vendor/
coverage.out
github_deploy_key
github_deploy_key.pub
github_deploy_key.pub
debug.test
30 changes: 22 additions & 8 deletions reflections.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ func setField(v reflect.Value, name string, currName string, value interface{})
v = reflect.Indirect(v)
switch v.Kind() {
case reflect.Struct, reflect.Ptr:
if len(currName) == 0 {
valueOf := reflect.ValueOf(value)
if v.Type() != valueOf.Type() {
return fmt.Errorf("Provided value type (%v) didn't match obj field type (%v)\n", valueOf.Type(), v.Type())
}
v.Set(valueOf)
return nil
}

currName, nextFieldName := getCurrAndNextFieldName(currName)
if v.Kind() == reflect.Struct {
v = v.FieldByName(currName)
Expand Down Expand Up @@ -155,14 +164,17 @@ func fieldsNames(obj interface{}, parent string) ([]string, error) {
var fields []string
for i := 0; i < fieldsCount; i++ {
field := objType.Field(i)
if !isExportableField(field) {
continue
}

var fieldName string
if isExportableField(field) {
fieldName = field.Name
if len(parent) > 0 {
fieldName = parent + "." + fieldName
}
fields = append(fields, fieldName)
fieldName = field.Name
if len(parent) > 0 {
fieldName = parent + "." + fieldName
}
fields = append(fields, fieldName)

if k := objValue.Field(i).Kind(); k == reflect.Struct || k == reflect.Ptr {
nestedFields, _ := fieldsNames(objValue.Field(i).Interface(), fieldName)
fields = append(fields, nestedFields...)
Expand All @@ -186,9 +198,11 @@ func Fields(obj interface{}) ([]reflect.StructField, error) {
var fields []reflect.StructField
for i := 0; i < fieldsCount; i++ {
field := objType.Field(i)
if isExportableField(field) {
fields = append(fields, field)
if !isExportableField(field) {
continue
}

fields = append(fields, field)
if k := objValue.Field(i).Kind(); k == reflect.Struct || k == reflect.Ptr {
nestedFields, _ := Fields(objValue.Field(i).Interface())
fields = append(fields, nestedFields...)
Expand Down
95 changes: 73 additions & 22 deletions reflections_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package reflectme
import (
"reflect"
"testing"
"time"

"github.com/stretchr/testify/assert"
)
Expand All @@ -20,6 +21,14 @@ type TestStruct struct {
unexported uint64
Dummy string `test:"dummytag"`
Yummy int `test:"yummytag"`
DateTime time.Time
}

type TestStructDifferentType struct {
unexported uint64
Dummy string `test:"dummytag"`
Yummy int `test:"yummytag"`
DateTime string
}

type TestNestedPointerStruct struct {
Expand Down Expand Up @@ -524,7 +533,7 @@ func TestFieldsNames_on_struct(t *testing.T) {

fields, err := FieldsNames(dummyStruct)
assert.NoError(t, err)
assert.Equal(t, fields, []string{"Dummy", "Yummy"})
assert.Equal(t, fields, []string{"Dummy", "Yummy", "DateTime"})
}

func TestFieldsNames_on_nested_struct(t *testing.T) {
Expand Down Expand Up @@ -558,7 +567,7 @@ func TestFieldsNames_on_struct_pointer(t *testing.T) {

fields, err := FieldsNames(dummyStruct)
assert.NoError(t, err)
assert.Equal(t, fields, []string{"Dummy", "Yummy"})
assert.Equal(t, fields, []string{"Dummy", "Yummy", "DateTime"})
}

func TestFieldsNames_on_nested_struct_pointer(t *testing.T) {
Expand Down Expand Up @@ -600,7 +609,7 @@ func TestFieldsNames_with_non_exported_fields(t *testing.T) {

fields, err := FieldsNames(dummyStruct)
assert.NoError(t, err)
assert.Equal(t, fields, []string{"Dummy", "Yummy"})
assert.Equal(t, fields, []string{"Dummy", "Yummy", "DateTime"})
}

func TestFields_on_struct(t *testing.T) {
Expand All @@ -611,7 +620,7 @@ func TestFields_on_struct(t *testing.T) {

fields, err := Fields(dummyStruct)
assert.NoError(t, err)
expFields := []string{"Dummy", "Yummy"}
expFields := []string{"Dummy", "Yummy", "DateTime"}
for i, field := range fields {
assert.Equal(t, expFields[i], field.Name)
}
Expand All @@ -625,7 +634,7 @@ func TestFields_on_struct_pointer(t *testing.T) {

fields, err := Fields(dummyStruct)
assert.NoError(t, err)
expFields := []string{"Dummy", "Yummy"}
expFields := []string{"Dummy", "Yummy", "DateTime"}
assert.Equal(t, len(expFields), len(fields))
for i, field := range fields {
assert.Equal(t, expFields[i], field.Name)
Expand All @@ -648,7 +657,7 @@ func TestFields_with_non_exported_fields(t *testing.T) {

fields, err := Fields(dummyStruct)
assert.NoError(t, err)
expFields := []string{"Dummy", "Yummy"}
expFields := []string{"Dummy", "Yummy", "DateTime"}
assert.Equal(t, len(expFields), len(fields))
for i, field := range fields {
assert.Equal(t, expFields[i], field.Name)
Expand Down Expand Up @@ -778,8 +787,9 @@ func TestTags_on_struct(t *testing.T) {
tags, err := Tags(dummyStruct, "test")
assert.NoError(t, err)
assert.Equal(t, tags, map[string]string{
"Dummy": "dummytag",
"Yummy": "yummytag",
"Dummy": "dummytag",
"Yummy": "yummytag",
"DateTime": "",
})
}

Expand All @@ -792,8 +802,9 @@ func TestTags_on_struct_pointer(t *testing.T) {
tags, err := Tags(dummyStruct, "test")
assert.NoError(t, err)
assert.Equal(t, tags, map[string]string{
"Dummy": "dummytag",
"Yummy": "yummytag",
"Dummy": "dummytag",
"Yummy": "yummytag",
"DateTime": "",
})
}

Expand All @@ -805,30 +816,36 @@ func TestTags_on_non_struct(t *testing.T) {
}

func TestItems_on_struct(t *testing.T) {
now := time.Now()
dummyStruct := TestStruct{
Dummy: "test",
Yummy: 123,
Dummy: "test",
Yummy: 123,
DateTime: now,
}

tags, err := Items(dummyStruct)
assert.NoError(t, err)
assert.Equal(t, tags, map[string]interface{}{
"Dummy": "test",
"Yummy": 123,
"Dummy": "test",
"Yummy": 123,
"DateTime": now,
})
}

func TestItems_on_struct_pointer(t *testing.T) {
now := time.Now()
dummyStruct := &TestStruct{
Dummy: "test",
Yummy: 123,
Dummy: "test",
Yummy: 123,
DateTime: now,
}

tags, err := Items(dummyStruct)
assert.NoError(t, err)
assert.Equal(t, tags, map[string]interface{}{
"Dummy": "test",
"Yummy": 123,
"Dummy": "test",
"Yummy": 123,
"DateTime": now,
})
}

Expand All @@ -840,9 +857,11 @@ func TestItems_on_non_struct(t *testing.T) {
}

func TestCopy_with_default_values(t *testing.T) {
now := time.Now()
dummyStruct1 := TestStruct{
Dummy: "test",
Yummy: 0,
Dummy: "test",
Yummy: 0,
DateTime: now,
}
dummyStruct2 := TestStruct{
Dummy: "test1",
Expand All @@ -852,6 +871,38 @@ func TestCopy_with_default_values(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, dummyStruct1.Dummy, dummyStruct2.Dummy)
assert.Equal(t, dummyStruct1.Yummy, dummyStruct2.Yummy)
assert.Equal(t, dummyStruct1.DateTime, dummyStruct2.DateTime)
}

func TestCopy_with_different_type_ptr(t *testing.T) {
DefaultCopyOptions.IgnoreNotFoundFields = false
now := time.Now()
dummyStruct1 := TestStruct{
Dummy: "test",
Yummy: 0,
DateTime: now,
}
dummyStruct2 := TestStructDifferentType{
Dummy: "test1",
Yummy: 1,
}
err := Copy(dummyStruct1, &dummyStruct2)
assert.Error(t, err)
}

func TestCopy_with_different_type(t *testing.T) {
DefaultCopyOptions.IgnoreNotFoundFields = false
dummyStruct1 := TestStructDifferentType{
Dummy: "test",
Yummy: 0,
DateTime: "now",
}
dummyStruct2 := TestStruct{
Dummy: "test1",
Yummy: 1,
}
err := Copy(dummyStruct1, &dummyStruct2)
assert.Error(t, err)
}

func TestCopy_not_copying_zero_values(t *testing.T) {
Expand All @@ -870,7 +921,7 @@ func TestCopy_not_copying_zero_values(t *testing.T) {
assert.Equal(t, 1, dummyStruct2.Yummy)
}

func TestCopy_ignoring_not_founded_fields(t *testing.T) {
func TestCopy_ignoring_not_found_fields(t *testing.T) {
DefaultCopyOptions.IgnoreNotFoundFields = true
dummyStruct1 := TestStruct{
Dummy: "test",
Expand All @@ -885,7 +936,7 @@ func TestCopy_ignoring_not_founded_fields(t *testing.T) {
assert.Equal(t, dummyStruct1.Dummy, dummyStruct2.Dummy)
}

func TestCopy_not_ignoring_not_founded_fields(t *testing.T) {
func TestCopy_not_ignoring_not_found_fields(t *testing.T) {
DefaultCopyOptions.IgnoreNotFoundFields = false
dummyStruct1 := TestStruct{
Dummy: "test",
Expand Down

0 comments on commit f06ae3c

Please sign in to comment.