docs: refactor tests, Property -> Field, Add Last

Author: ahl5esoft

Diff for: README.md

@@ -9,7 +9,7 @@
                                                                                  \_/__/
 ```
 
-# Underscore.go [![GoDoc](https://godoc.org/github.com/ahl5esoft/golang-underscore?status.svg)](https://godoc.org/github.com/ahl5esoft/golang-underscore) [![Go Report Card](https://goreportcard.com/badge/github.com/ahl5esoft/golang-underscore)](https://goreportcard.com/report/github.com/ahl5esoft/golang-underscore) ![Version](https://img.shields.io/badge/version-2.1.1-green.svg)
+# Underscore.go [![GoDoc](https://godoc.org/github.com/ahl5esoft/golang-underscore?status.svg)](https://godoc.org/github.com/ahl5esoft/golang-underscore) [![Go Report Card](https://goreportcard.com/badge/github.com/ahl5esoft/golang-underscore)](https://goreportcard.com/report/github.com/ahl5esoft/golang-underscore) ![Version](https://img.shields.io/badge/version-2.1.2-green.svg)
 like <a href="http://underscorejs.org/">underscore.js</a> and C# LINQ, but for Go
 
 ## Installation
@@ -31,6 +31,7 @@ like <a href="http://underscorejs.org/">underscore.js</a> and C# LINQ, but for G
 * [`Count`](#count)
 * [`Distinct`](#distinct), [`DistinctBy`](#distinctBy)
 * [`Each`](#each)
+* [`Field`](#field), [`FieldValue`](#fieldValue)
 * [`Filter`](#where), [`FilterBy`](#whereBy)
 * [`Find`](#find), [`FindBy`](#findBy)
 * [`FindIndex`](#findIndex), [`FindIndexBy`](#findIndexBy)
@@ -45,7 +46,6 @@ like <a href="http://underscorejs.org/">underscore.js</a> and C# LINQ, but for G
 * [`MapMany`](#selectMany), [`MapManyBy`](#selectManyBy)
 * [`Object`](#object)
 * [`Order`](#order), [`OrderBy`](#orderBy)
-* [`Property`](#property), [`PropertyRV`](#propertyRV)
 * [`Range`](#range)
 * [`Reduce`](#aggregate)
 * [`Reject`](#reject), [`RejectBy`](#rejectBy)
@@ -294,6 +294,58 @@ Chain(arr).Each(func(r testModel, i int) {
 })
 ```
 
+<a name="field" />
+
+### Field(name)
+
+__Arguments__
+
+* `name` - field name
+
+__Return__
+
+* func(interface{}) interface{}
+
+__Examples__
+
+```go
+item := testModel{ 1, "one" }
+
+getAge := Field("age")
+_, err := getAge(item)
+// err != nil
+
+getName := Field("name")
+name, err := getName(item)
+// name = "one"
+```
+
+<a name="fieldValue" />
+
+### FieldValue(name)
+
+__Arguments__
+
+* `name` - field name
+
+__Return__
+
+* func(interface{}) reflect.Value
+
+__Examples__
+
+```go
+item := testModel{ 1, "one" }
+
+getAgeValue := FieldValue("age")
+res := getAgeValue(item)
+// res != reflect.Value(nil)
+
+getNameValue := FieldValue("name")
+nameValue, err := getNameValue(item)
+// nameValue = reflect.ValueOf("one")
+```
+
 <a name="find" />
 
 ### Find(predicate) IEnumerable
@@ -595,19 +647,17 @@ __Examples__
 arr := []int{1, 2, 3}
 var res int
 chain(arr).Last().Value(&res)
-// or
-res := Last(arr).(int)
 // res = 3
 
-dict := map[string]string{
-	"a": "aa",
-	"b": "bb",
+var res []int
+src := [][]int{
+	{1, 2, 3, 4},
+	{5, 6},
 }
-var str string
-Chain(dict).Last().Value(&str)
-// or
-str := Last(dict).(string)
-// res = "aa" or "bb"
+Chain(src).Last().Map(func(r, _ int) int {
+	return r + 5
+}).Value(&res)
+// res = [10, 11]
 ```
 
 <a name="object" />
@@ -679,58 +729,6 @@ __Same__
 
 * `SortBy`
 
-<a name="property" />
-
-### Property(name)
-
-__Arguments__
-
-* `name` - property name
-
-__Return__
-
-* func(interface{}) (interface{}, error)
-
-__Examples__
-
-```go
-item := testModel{ 1, "one" }
-
-getAge := Property("age")
-_, err := getAge(item)
-// err != nil
-
-getName := Property("name")
-name, err := getName(item)
-// name = "one"
-```
-
-<a name="propertyRV" />
-
-### Property(name)
-
-__Arguments__
-
-* `name` - property name
-
-__Return__
-
-* func(interface{}) (reflect.Value, error)
-
-__Examples__
-
-```go
-item := testModel{ 1, "one" }
-
-getAgeRV := PropertyRV("age")
-_, err := getAgeRV(item)
-// err != nil
-
-getNameRV := PropertyRV("name")
-nameRV, err := getNameRV(item)
-// nameRV = reflect.ValueOf("one")
-```
-
 <a name="range" />
 
 ### Range(start, stop, step) IEnumerable

Diff for: distinct.go

@@ -21,7 +21,7 @@ func (m enumerable) Distinct(selector interface{}) IEnumerable {
 					for ok = iterator.MoveNext(); ok; ok = iterator.MoveNext() {
 						valueValue = iterator.GetValue()
 						keyValue = iterator.GetKey()
-						v := getFuncReturnRV(selectValue, iterator).Interface()
+						v := getReturnValue(selectValue, iterator).Interface()
 						if _, has := set[v]; !has {
 							set[v] = true
 							return
@@ -35,7 +35,7 @@ func (m enumerable) Distinct(selector interface{}) IEnumerable {
 }
 
 func (m enumerable) DistinctBy(fieldName string) IEnumerable {
-	getter := PropertyRV(fieldName)
+	getter := FieldValue(fieldName)
 	return m.Distinct(func(value, _ interface{}) facade {
 		return facade{
 			getter(value),

Diff for: each_test.go

@@ -3,7 +3,7 @@ package underscore
 import (
 	"testing"
 
-	"github.com/go-playground/assert/v2"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_Each(t *testing.T) {

Diff for: enumerator.go

@@ -16,7 +16,7 @@ func (m enumerator) GetKey() reflect.Value {
 }
 
 func (m enumerator) GetValue() reflect.Value {
-	return getRealRV(m.value)
+	return getRealValue(m.value)
 }
 
 func (m *enumerator) MoveNext() (ok bool) {

Diff for: property.go renamed to field.go

@@ -5,22 +5,22 @@ import (
 	"strings"
 )
 
-// GetProeprtyRVFunc is get property reflect.Value func
-type GetProeprtyRVFunc func(interface{}) reflect.Value
+// GetFieldValueFunc is get field reflect.Value func
+type GetFieldValueFunc func(interface{}) reflect.Value
 
-// Property is 获取属性函数
-func Property(name string) func(interface{}) interface{} {
-	fn := PropertyRV(name)
+// Field is 获取字段函数
+func Field(name string) func(interface{}) interface{} {
+	fn := FieldValue(name)
 	return func(item interface{}) interface{} {
 		return fn(item).Interface()
 	}
 }
 
-// PropertyRV is 获取reflect.Value
-func PropertyRV(name string) GetProeprtyRVFunc {
-	var getter GetProeprtyRVFunc
+// FieldValue is 获取reflect.Value
+func FieldValue(name string) GetFieldValueFunc {
+	var getter GetFieldValueFunc
 	getter = func(item interface{}) reflect.Value {
-		itemRV := getRealRV(item)
+		itemRV := getRealValue(item)
 		itemRT := itemRV.Type()
 		for i := 0; i < itemRT.NumField(); i++ {
 			field := itemRT.Field(i)

Diff for: field_test.go

@@ -0,0 +1,85 @@
+package underscore
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Benchmark_Field(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		Field("id")(testModel{ID: 1, Name: "one"})
+	}
+}
+
+func Benchmark_FieldValue(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		FieldValue("id")(testModel{ID: 1, Name: "one"})
+	}
+}
+
+func Benchmark_FieldValue_InvalidName(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		FieldValue("$$")(testModel{ID: 1, Name: "one"})
+	}
+}
+
+func Benchmark_FieldValue_Nested(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		FieldValue("id")(testNestedModel{
+			testModel: testModel{
+				ID: 11,
+			},
+		})
+	}
+}
+
+func Benchmark_FieldValue_Ptr(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		FieldValue("id")(&testModel{ID: 1, Name: "ptr"})
+	}
+}
+
+func Test_Field(t *testing.T) {
+	item := testModel{ID: 1, Name: "one"}
+	getName := Field("name")
+	name := getName(item)
+	assert.Equal(
+		t,
+		name,
+		item.Name,
+	)
+}
+
+func Test_Field_Nested(t *testing.T) {
+	item := testNestedModel{
+		testModel: testModel{
+			ID: 11,
+		},
+	}
+	id, ok := Field("id")(item).(int)
+	assert.True(t, ok)
+	assert.Equal(t, id, 11)
+}
+
+func Test_Field_Ptr(t *testing.T) {
+	item := &testModel{ID: 1, Name: "ptr"}
+	nameGetter := Field("name")
+	name := nameGetter(item)
+	assert.Equal(t, name, item.Name)
+}
+
+func Test_FieldValue(t *testing.T) {
+	item := testModel{ID: 1, Name: "one"}
+
+	value := FieldValue("$$")(item)
+	assert.Equal(t, value, nilValue)
+
+	getNameValue := FieldValue("name")
+	nameValue := getNameValue(item)
+	assert.Equal(
+		t,
+		nameValue.String(),
+		item.Name,
+	)
+}

Diff for: filter_test.go

@@ -1,6 +1,10 @@
 package underscore
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
 
 func Test_Filter(t *testing.T) {
 	src := []testModel{
@@ -9,13 +13,15 @@ func Test_Filter(t *testing.T) {
 		{ID: 3, Name: "three"},
 		{ID: 4, Name: "three"},
 	}
-	dst := make([]testModel, 0)
+	var res []testModel
 	Chain(src).Filter(func(r testModel, _ int) bool {
 		return r.ID%2 == 0
-	}).Value(&dst)
-	if !(len(dst) == 2 && dst[0] == src[1] && dst[1] == src[3]) {
-		t.Error(dst)
-	}
+	}).Value(&res)
+	assert.EqualValues(
+		t,
+		res,
+		[]testModel{src[1], src[3]},
+	)
 }
 
 func Test_FilterBy(t *testing.T) {
@@ -25,11 +31,13 @@ func Test_FilterBy(t *testing.T) {
 		{ID: 3, Name: "three"},
 		{ID: 4, Name: "three"},
 	}
-	dst := make([]testModel, 0)
+	var res []testModel
 	Chain(src).FilterBy(map[string]interface{}{
 		"Name": "one",
-	}).Value(&dst)
-	if !(len(dst) == 2 && dst[0] == src[0] && dst[1] == src[1]) {
-		t.Error("wrong result")
-	}
+	}).Value(&res)
+	assert.EqualValues(
+		t,
+		res,
+		[]testModel{src[0], src[1]},
+	)
 }