feat: Added type Int, package ints and Improve strs (#13)

Author: flc1125

examples/main.go

@@ -1,45 +1,55 @@
 package main
 
 import (
-	"github.com/go-packagist/support/str"
+	"github.com/go-packagist/support/ints"
+	"github.com/go-packagist/support/strs"
 )
 
 func main() {
+	strCase()
+	intCase()
+}
+
+func strCase() {
 	// strings
-	println(str.InArray("abc", []string{"abc", "def"}))
-	println(str.Is("ab*", "abc"))
-	println(str.Md5("abc"))
-	println(str.Strpos("aabbcc", "a"))
-	println(str.Strrpos("aabbcc", "a"))
-	println(str.Strrev("abc"))
-	println(str.Strtr("aabbcc", "a", "b"))
-	println(str.StrShuffle("abc"))
-	println(str.StrPad("abc", 6, " ", str.StrPadLeft))
-	println(str.Length("张三")) // 2
-	println(str.Strcut("abc", 0, 1))
-	println(str.Limit("abc", 1, "..."))
+	println(strs.InArray("abc", []string{"abc", "def"}))
+	println(strs.Is("ab*", "abc"))
+	println(strs.Md5("abc"))
+	println(strs.Strpos("aabbcc", "a"))
+	println(strs.Strrpos("aabbcc", "a"))
+	println(strs.Strrev("abc"))
+	println(strs.Strtr("aabbcc", "a", "b"))
+	println(strs.Shuffle("abc"))
+	println(strs.StrPad("abc", 6, " ", strs.StrPadLeft))
+	println(strs.Length("张三")) // 2
+	println(strs.Strcut("abc", 0, 1))
+	println(strs.Limit("abc", 1, "..."))
 
 	// string Atoi
-	println(str.Atoi("1").Val())
-	println(str.Atoi("a").Err())
-	println(str.Atoi("a").IsOk())
+	println(strs.Atoi("1").Val())
+	println(strs.Atoi("a").Err())
+	println(strs.Atoi("a").IsOk())
 
 	// Type String
-	println(str.String("abc").Is("ab*"))
-	println(str.String("abc").InArray([]string{"abc", "def"}))
-	println(str.String("abc").Md5())
-	println(str.String("abc").Sha1())
-	println(str.String("aabbcc").Strpos("a"))
-	println(str.String("aabbcc").Strrpos("a"))
-	println(str.String("abc").Strrev())
-	println(str.String("aabbcc").Strtr("a", "b"))
-	println(str.String("abc").StrShuffle())
-	println(str.String("1").Atoi().Val())
-	println(str.String("a").Atoi().Err())
-	println(str.String("a").Atoi().IsOk())
-	println(str.String("abc").Bytes())
-	println(str.String("abc").StrPad(6, " ", str.StrPadLeft))
-	println(str.String("张三").Length()) // 2
-	println(str.String("abc").Strcut(0, 1))
-	println(str.String("abc").Limit(1, "..."))
+	println(strs.String("abc").Is("ab*"))
+	println(strs.String("abc").InArray([]string{"abc", "def"}))
+	println(strs.String("abc").Md5())
+	println(strs.String("abc").Sha1())
+	println(strs.String("aabbcc").Strpos("a"))
+	println(strs.String("aabbcc").Strrpos("a"))
+	println(strs.String("abc").Strrev())
+	println(strs.String("aabbcc").Strtr("a", "b"))
+	println(strs.String("abc").Shuffle())
+	println(strs.String("1").Atoi().Val())
+	println(strs.String("a").Atoi().Err())
+	println(strs.String("a").Atoi().IsOk())
+	println(strs.String("abc").Bytes())
+	println(strs.String("abc").StrPad(6, " ", strs.StrPadLeft))
+	println(strs.String("张三").Length()) // 2
+	println(strs.String("abc").Strcut(0, 1))
+	println(strs.String("abc").Limit(1, "..."))
+}
+
+func intCase() {
+	ints.InArray(1, []int{1, 2, 3})
 }

ints/int.go

@@ -0,0 +1,28 @@
+package ints
+
+type Int int
+
+// InArray returns true if the int is in the array.
+func (i Int) InArray(arr []int) bool {
+	return InArray(int(i), arr)
+}
+
+// Val returns the int value.
+func (i Int) Val() int {
+	return int(i)
+}
+
+// Itoa converts an int to a string.
+func (i Int) Itoa() string {
+	return Itoa(int(i))
+}
+
+// String alias for Itoa.
+func (i Int) String() string {
+	return Itoa(int(i))
+}
+
+// Bytes returns the bytes of the string.
+func (i Int) Bytes() []byte {
+	return []byte(i.String())
+}

ints/int_test.go

@@ -0,0 +1,31 @@
+package ints
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestInt_InArray(t *testing.T) {
+	assert.True(t, Int(1).InArray([]int{1, 2, 3}))
+	assert.False(t, Int(4).InArray([]int{1, 2, 3}))
+}
+
+func TestInt_Itoa(t *testing.T) {
+	assert.Equal(t, "1", Int(1).Itoa())
+	assert.Equal(t, "2", Int(2).Itoa())
+}
+
+func TestInt_String(t *testing.T) {
+	assert.Equal(t, "1", Int(1).String())
+	assert.Equal(t, "2", Int(2).String())
+}
+
+func TestInt_Bytes(t *testing.T) {
+	assert.Equal(t, []byte("1"), Int(1).Bytes())
+	assert.Equal(t, []byte("2"), Int(2).Bytes())
+}
+
+func TestInt_Val(t *testing.T) {
+	assert.Equal(t, 1, Int(1).Val())
+	assert.Equal(t, 2, Int(2).Val())
+}

ints/ints.go

@@ -0,0 +1,64 @@
+package ints
+
+import (
+	"github.com/go-packagist/support/strs"
+	"math/rand"
+	"strconv"
+	"strings"
+)
+
+// InArray returns true if val is in arr.
+func InArray(val int, arr []int) bool {
+	for _, v := range arr {
+		if v == val {
+			return true
+		}
+	}
+
+	return false
+}
+
+// Itoa converts an int to a string.
+func Itoa(i int) string {
+	return strconv.Itoa(i)
+}
+
+// Split splits a string into an array of ints.
+func Split(s, sep string) []int {
+	split := strings.Split(s, sep)
+	arr := make([]int, len(split))
+
+	for i, v := range split {
+		arr[i] = strs.Atoi(v).Val()
+	}
+
+	return arr
+}
+
+// Random returns a random int between min and max.
+func Random(min, max int) int {
+	return min + rand.Intn(max-min)
+}
+
+// RandomString returns a random string of length.
+func RandomString(length int) string {
+	var letters = []rune("0123456789")
+
+	b := make([]rune, length)
+	for i := range b {
+		b[i] = letters[rand.Intn(len(letters))]
+	}
+
+	return string(b)
+}
+
+// Range returns an array of ints between min and max.
+func Range(min, max int) []int {
+	arr := make([]int, max-min+1)
+
+	for i := min; i <= max; i++ {
+		arr[i-min] = i
+	}
+
+	return arr
+}

ints/ints_test.go

@@ -0,0 +1,44 @@
+package ints
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestInArray(t *testing.T) {
+	assert.True(t, InArray(1, []int{1, 2, 3}))
+	assert.False(t, InArray(4, []int{1, 2, 3}))
+}
+
+func TestItoa(t *testing.T) {
+	assert.Equal(t, "1", Itoa(1))
+	assert.Equal(t, "2", Itoa(2))
+}
+
+func TestSplit(t *testing.T) {
+	assert.Equal(t, []int{1, 2, 3}, Split("1,2,3", ","))
+}
+
+func TestRandom(t *testing.T) {
+	r1, r2 := Random(1, 1000), Random(1, 1000)
+	println(r1, r2)
+
+	assert.True(t, r1 >= 1 && r1 <= 1000)
+	assert.True(t, r2 >= 1 && r2 <= 1000)
+	assert.NotEqual(t, r1, r2)
+}
+
+func TestRandomString(t *testing.T) {
+	s1, s2 := RandomString(10), RandomString(10)
+	println(s1, s2)
+
+	assert.Equal(t, 10, len(s1))
+	assert.Equal(t, 10, len(s2))
+	assert.NotEqual(t, s1, s2)
+}
+
+func TestRange(t *testing.T) {
+	assert.Equal(t, []int{1}, Range(1, 1))
+	assert.Equal(t, []int{1, 2, 3}, Range(1, 3))
+	assert.Equal(t, []int{1, 2, 3, 4}, Range(1, 4))
+}

str/atoi.go strs/atoi.gostr/atoi.go renamed to strs/atoi.go

@@ -1,4 +1,4 @@
-package str
+package strs
 
 import "strconv"
 

str/atoi_test.go strs/atoi_test.gostr/atoi_test.go renamed to strs/atoi_test.go

@@ -1,4 +1,4 @@
-package str
+package strs
 
 import (
 	"github.com/stretchr/testify/assert"

str/docs.go strs/docs.gostr/docs.go renamed to strs/docs.go

@@ -1,4 +1,4 @@
-package str
+package strs
 
 // use `_strings` instead of `strings` to avoid name collision
 // some functions see https://www.php.net/manual/zh/ref.strings.php

str/string.go strs/string.gostr/string.go renamed to strs/string.go

@@ -1,7 +1,12 @@
-package str
+package strs
 
 type String string
 
+// String returns the string value.
+func (s String) Val() string {
+	return string(s)
+}
+
 // Is checks if the string matches the pattern.
 func (s String) Is(pattern string) bool {
 	return Is(pattern, string(s))
@@ -42,9 +47,9 @@ func (s String) Strtr(from, to string) string {
 	return Strtr(string(s), from, to)
 }
 
-// StrShuffle returns a string with the characters in reverse order.
-func (s String) StrShuffle() string {
-	return StrShuffle(string(s))
+// Shuffle returns a string with the characters in reverse order.
+func (s String) Shuffle() string {
+	return Shuffle(string(s))
 }
 
 // Atoi returns the integer value of a string.

str/string_test.go strs/string_test.gostr/string_test.go renamed to strs/string_test.go

@@ -1,4 +1,4 @@
-package str
+package strs
 
 import (
 	"github.com/stretchr/testify/assert"