Merge pull request #9 from MrWormHole/master

Support for *[] to *[] and definitive error messages

Author: devfeel

convert.go

@@ -178,7 +178,7 @@ func ToInt64(value interface{}) (d int64) {
 	case uint, uint8, uint16, uint32, uint64:
 		d = int64(val.Uint())
 	default:
-		panic(fmt.Errorf("ToInt64 need numeric not `%T`", value))
+		panic(fmt.Errorf("ToInt64 needs numeric type, not `%T`", value))
 	}
 	return
 }

mapper.go

@@ -93,7 +93,7 @@ func SetEnabledMapperStructField(isEnabled bool) {
 func Register(obj interface{}) error {
 	objValue := reflect.ValueOf(obj)
 	if objValue == ZeroValue {
-		return errors.New("no exists this value")
+		return errors.New("obj value does not exist")
 	}
 	return registerValue(objValue)
 }
@@ -102,7 +102,7 @@ func Register(obj interface{}) error {
 func registerValue(objValue reflect.Value) error {
 	regValue := objValue
 	if objValue == ZeroValue {
-		return errors.New("no exists this value")
+		return errors.New("obj value does not exist")
 	}
 
 	if regValue.Type().Kind() == reflect.Ptr {
@@ -205,10 +205,10 @@ func MapToSlice(fromMap map[string]interface{}, toSlice interface{}) error {
 	var err error
 	toValue := reflect.ValueOf(toSlice)
 	if toValue.Kind() != reflect.Ptr {
-		return errors.New("toSlice must pointer of slice")
+		return errors.New("toSlice must be a pointer to a slice")
 	}
 	if toValue.IsNil() {
-		return errors.New("toSlice must not nil pointer")
+		return errors.New("toSlice must not be a nil pointer")
 	}
 
 	toElemType := reflect.TypeOf(toSlice).Elem().Elem()
@@ -247,10 +247,10 @@ func MapperMapSlice(fromMaps map[string]map[string]interface{}, toSlice interfac
 	var err error
 	toValue := reflect.ValueOf(toSlice)
 	if toValue.Kind() != reflect.Ptr {
-		return errors.New("toSlice must pointer of slice")
+		return errors.New("toSlice must be a pointer to a slice")
 	}
 	if toValue.IsNil() {
-		return errors.New("toSlice must not nil pointer")
+		return errors.New("toSlice must not be a nil pointer")
 	}
 
 	toElemType := reflect.TypeOf(toSlice).Elem().Elem()
@@ -280,10 +280,10 @@ func MapperSlice(fromSlice, toSlice interface{}) error {
 	var err error
 	toValue := reflect.ValueOf(toSlice)
 	if toValue.Kind() != reflect.Ptr {
-		return errors.New("toSlice must pointer of slice")
+		return errors.New("toSlice must be a pointer to a slice")
 	}
 	if toValue.IsNil() {
-		return errors.New("toSlice must not nil pointer")
+		return errors.New("toSlice must not be a nil pointer")
 	}
 
 	elemType := reflect.TypeOf(toSlice).Elem().Elem()

mapper_internal.go

@@ -234,8 +234,15 @@ func checkIsRegister(objElem reflect.Value) bool {
 //convert slice interface{} to []interface{}
 func convertToSlice(arr interface{}) []interface{} {
 	v := reflect.ValueOf(arr)
-	if v.Kind() != reflect.Slice {
-		panic("toslice arr not slice")
+	if v.Kind() == reflect.Ptr {
+		if v.Elem().Kind() != reflect.Slice {
+			panic("fromSlice arr is not a pointer to a slice")
+		}
+		v = v.Elem()
+	} else {
+		if v.Kind() != reflect.Slice {
+			panic("fromSlice arr is not a slice")
+		}
 	}
 	l := v.Len()
 	ret := make([]interface{}, l)

mapper_test.go

@@ -1,7 +1,6 @@
 package mapper
 
 import (
-	"fmt"
 	"reflect"
 	"strconv"
 	"sync"
@@ -121,8 +120,34 @@ func Test_MapperSlice(t *testing.T) {
 		t.Error(err)
 	} else {
 		t.Log(toSlice, len(toSlice))
-		for _, v := range toSlice {
-			fmt.Println(v)
+		for i := 0; i < len(fromSlice); i++ {
+			if !reflect.DeepEqual(fromSlice[i].Name, toSlice[i].Name) ||
+				!reflect.DeepEqual(fromSlice[i].Sex, toSlice[i].Sex) ||
+				!reflect.DeepEqual(fromSlice[i].AA, toSlice[i].BB) {
+				t.Fail()
+			}
+		}
+	}
+}
+
+func Test_MapperSlice2(t *testing.T) {
+	SetEnabledTypeChecking(true)
+	var fromSlice []*FromStruct
+	var toSlice []*ToStruct
+	for i := 0; i < 10; i++ {
+		fromSlice = append(fromSlice, &FromStruct{Name: "From" + strconv.Itoa(i), Sex: true, AA: "AA" + strconv.Itoa(i)})
+	}
+	err := MapperSlice(&fromSlice, &toSlice)
+	if err != nil {
+		t.Error(err)
+	} else {
+		t.Log(toSlice, len(toSlice))
+		for i := 0; i < len(fromSlice); i++ {
+			if !reflect.DeepEqual(fromSlice[i].Name, toSlice[i].Name) ||
+				!reflect.DeepEqual(fromSlice[i].Sex, toSlice[i].Sex) ||
+				!reflect.DeepEqual(fromSlice[i].AA, toSlice[i].BB) {
+				t.Fail()
+			}
 		}
 	}
 }
@@ -139,8 +164,34 @@ func Test_MapperStructSlice(t *testing.T) {
 		t.Error(err)
 	} else {
 		t.Log(toSlice, len(toSlice))
-		for _, v := range toSlice {
-			fmt.Println(v)
+		for i := 0; i < len(fromSlice); i++ {
+			if !reflect.DeepEqual(fromSlice[i].Name, toSlice[i].Name) ||
+				!reflect.DeepEqual(fromSlice[i].Sex, toSlice[i].Sex) ||
+				!reflect.DeepEqual(fromSlice[i].AA, toSlice[i].BB) {
+				t.Fail()
+			}
+		}
+	}
+}
+
+func Test_MapperStructSlice2(t *testing.T) {
+	SetEnabledTypeChecking(true)
+	var fromSlice []FromStruct
+	var toSlice []ToStruct
+	for i := 0; i < 10; i++ {
+		fromSlice = append(fromSlice, FromStruct{Name: "From" + strconv.Itoa(i), Sex: true, AA: "AA" + strconv.Itoa(i)})
+	}
+	err := MapperSlice(&fromSlice, &toSlice)
+	if err != nil {
+		t.Error(err)
+	} else {
+		t.Log(toSlice, len(toSlice))
+		for i := 0; i < len(fromSlice); i++ {
+			if !reflect.DeepEqual(fromSlice[i].Name, toSlice[i].Name) ||
+				!reflect.DeepEqual(fromSlice[i].Sex, toSlice[i].Sex) ||
+				!reflect.DeepEqual(fromSlice[i].AA, toSlice[i].BB) {
+				t.Fail()
+			}
 		}
 	}
 }