feat: v2.1.0

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.0.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.0-green.svg)
 like <a href="http://underscorejs.org/">underscore.js</a> and C# LINQ, but for Go
 
 ## Installation
@@ -64,19 +64,22 @@ like <a href="http://underscorejs.org/">underscore.js</a> and C# LINQ, but for G
 
 __Arguments__
 
+* `iterator` - func(element or value, key or index, memo) memo
 * `memo` - anyType
-* `iterator` - func(memo, element or value, key or index) memo
 
 __Examples__
 
 ```go
-dst := make([]int, 0)
-Chain([]int{1, 2}).Aggregate(make([]int, 0), func(memo []int, n, _ int) []int {
-	memo = append(memo, n)
-	memo = append(memo, n+10)
-	return memo
-}).Value(&dst)
-// dst = [1 11 2 12]
+var res []int
+Chain([]int{1, 2}).Aggregate(
+	func(memo []int, n, _ int) []int {
+		memo = append(memo, n)
+		memo = append(memo, n+10)
+		return memo
+	},
+	make([]int, 0),
+).Value(&res)
+// res = [1 11 2 12]
 ```
 
 __Same__
@@ -970,6 +973,12 @@ __Same__
 * `FilterBy`
 
 ## Release Notes
+~~~
+v2.1.0 (2019-06-27)
+* IEnumerable增加Order、OrderBy、Sort、SortBy
+* IEnumerable.Aggregate(memo interface{}, fn interface{}) -> IEnumerable.Aggregate(fn interface{}, memo interface{})
+~~~
+
 ~~~
 v2.0.0 (2019-06-27)
 * 删除IQuery

Diff for: aggregate.go

@@ -2,7 +2,7 @@ package underscore
 
 import "reflect"
 
-func (m enumerable) Aggregate(memo interface{}, fn interface{}) IEnumerable {
+func (m enumerable) Aggregate(fn interface{}, memo interface{}) IEnumerable {
 	fnValue := reflect.ValueOf(fn)
 	iterator := m.GetEnumerator()
 	memoValue := reflect.ValueOf(memo)

Diff for: aggregate_test.go

@@ -9,34 +9,43 @@ import (
 func Benchmark_Aggregate(b *testing.B) {
 	for n := 0; n < b.N; n++ {
 		total := 0
-		Range(1, 100, 1).Aggregate(make([]int, 0), func(memo []int, r, _ int) []int {
-			memo = append(memo, r)
-			memo = append(memo, -r)
-			return memo
-		}).Value(&total)
+		Range(1, 100, 1).Aggregate(
+			func(memo []int, r, _ int) []int {
+				memo = append(memo, r)
+				memo = append(memo, -r)
+				return memo
+			},
+			make([]int, 0),
+		).Value(&total)
 	}
 }
 
 func Benchmark_Aggregate_NoValue(b *testing.B) {
 	for n := 0; n < b.N; n++ {
-		Range(1, 100, 1).Aggregate(make([]int, 0), func(memo []int, r, _ int) []int {
-			memo = append(memo, r)
-			memo = append(memo, -r)
-			return memo
-		})
+		Range(1, 100, 1).Aggregate(
+			func(memo []int, r, _ int) []int {
+				memo = append(memo, r)
+				memo = append(memo, -r)
+				return memo
+			},
+			make([]int, 0),
+		)
 	}
 }
 
 func Test_Aggregate(t *testing.T) {
-	dst := make([]int, 0)
-	Chain([]int{1, 2}).Aggregate(make([]int, 0), func(memo []int, n, _ int) []int {
-		memo = append(memo, n)
-		memo = append(memo, n+10)
-		return memo
-	}).Value(&dst)
+	var res []int
+	Chain([]int{1, 2}).Aggregate(
+		func(memo []int, n, _ int) []int {
+			memo = append(memo, n)
+			memo = append(memo, n+10)
+			return memo
+		},
+		make([]int, 0),
+	).Value(&res)
 	assert.EqualValues(
 		t,
-		dst,
+		res,
 		[]int{1, 11, 2, 12},
 	)
 }

Diff for: reduce.go

@@ -1,5 +1,5 @@
 package underscore
 
-func (m enumerable) Reduce(memo interface{}, fn interface{}) IEnumerable {
-	return m.Aggregate(memo, fn)
+func (m enumerable) Reduce(fn interface{}, memo interface{}) IEnumerable {
+	return m.Aggregate(fn, memo)
 }

Diff for: reduce_test.go

@@ -1,15 +1,24 @@
 package underscore
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
 
 func Test_Reduce(t *testing.T) {
-	dst := make([]int, 0)
-	Chain([]int{1, 2}).Reduce(make([]int, 0), func(memo []int, n, _ int) []int {
-		memo = append(memo, n)
-		memo = append(memo, n+10)
-		return memo
-	}).Value(&dst)
-	if !(len(dst) == 4 && dst[0] == 1 && dst[1] == 11 && dst[2] == 2 && dst[3] == 12) {
-		t.Error(dst)
-	}
+	var res []int
+	Chain([]int{1, 2}).Reduce(
+		func(memo []int, n, _ int) []int {
+			memo = append(memo, n)
+			memo = append(memo, n+10)
+			return memo
+		},
+		make([]int, 0),
+	).Value(&res)
+	assert.EqualValues(
+		t,
+		res,
+		[]int{1, 11, 2, 12},
+	)
 }