Rename a bunch of packages and rid of "util" suffix

cache/loadingCache.go

@@ -5,7 +5,7 @@ import (
 
 	lru "github.com/hashicorp/golang-lru"
 
-	"github.com/jf-tech/omniparser/mathutil"
+	"github.com/jf-tech/omniparser/maths"
 )
 
 // LoadingCache is a key/value cache with a user specified loading function and an optional capacity.
@@ -34,7 +34,7 @@ func NewLoadingCache(capacity ...int) *LoadingCache {
 		capv = capacity[0]
 	}
 	if capv == 0 {
-		capv = mathutil.MaxIntValue - 1
+		capv = maths.MaxIntValue - 1
 	}
 	cache, _ := lru.New(capv)
 	return &LoadingCache{capacity: capv, cache: cache}

cache/loadingCache_test.go

@@ -7,9 +7,8 @@ import (
 	"testing"
 
 	"github.com/antchfx/xpath"
+	"github.com/jf-tech/omniparser/maths"
 	"github.com/stretchr/testify/assert"
-
-	"github.com/jf-tech/omniparser/mathutil"
 )
 
 func TestNewLoadingCache(t *testing.T) {
@@ -29,7 +28,7 @@ func TestNewLoadingCache(t *testing.T) {
 			name:             "0 capacity specified, no limit",
 			capacity:         []int{0, -5}, // the second invalid value -5 is ignored.
 			panicErr:         "",
-			expectedCapacity: mathutil.MaxIntValue - 1,
+			expectedCapacity: maths.MaxIntValue - 1,
 		},
 		{
 			name:             "> 0 capacity specified",

jsonutil/jsonutil.go → jsons/jsons.go

@@ -1,4 +1,4 @@
-package jsonutil
+package jsons
 
 import (
 	"bytes"

jsonutil/jsonutil_test.go → jsons/jsons_test.go

@@ -1,4 +1,4 @@
-package jsonutil
+package jsons
 
 import (
 	"testing"

mathutil/mathutil.go → maths/maths.go

@@ -1,4 +1,4 @@
-package mathutil
+package maths
 
 // MaxInt returns the bigger value of the two input ints.
 func MaxInt(x, y int) int {

mathutil/mathutil_test.go → maths/maths_test.go

@@ -1,4 +1,4 @@
-package mathutil
+package maths
 
 import (
 	"testing"

nodeutil/marshal_test.go → nodes/marshal_test.go

@@ -1,12 +1,12 @@
-package nodeutil
+package nodes
 
 import (
 	"encoding/json"
 	"fmt"
 
 	node "github.com/antchfx/xmlquery"
 
-	"github.com/jf-tech/omniparser/jsonutil"
+	"github.com/jf-tech/omniparser/jsons"
 )
 
 func nodeName(n *node.Node) string {
@@ -83,5 +83,5 @@ func nodeToInterface(n *node.Node) interface{} {
 }
 
 func jsonify(n *node.Node) string {
-	return jsonutil.BPM(nodeToInterface(n))
+	return jsons.BPM(nodeToInterface(n))
 }

nodeutil/node.go → nodes/node.go

@@ -1,4 +1,4 @@
-package nodeutil
+package nodes
 
 import (
 	"encoding/xml"

nodeutil/node_test.go → nodes/node_test.go

@@ -1,4 +1,4 @@
-package nodeutil
+package nodes
 
 import (
 	"encoding/xml"

nodeutil/query.go → nodes/query.go

@@ -1,4 +1,4 @@
-package nodeutil
+package nodes
 
 import (
 	"errors"

nodeutil/query_test.go → nodes/query_test.go

@@ -1,4 +1,4 @@
-package nodeutil
+package nodes
 
 import (
 	"strings"

omniparser/schemaPlugin/header.go

@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/text/encoding/charmap"
 
-	"github.com/jf-tech/omniparser/strutil"
+	"github.com/jf-tech/omniparser/strs"
 )
 
 // ParserSettings defines the common header (and its JSON format) for all schemas across all schema plugins.
@@ -41,7 +41,7 @@ var SupportedEncodingMappings = map[string]encodingMappingFunc{
 // GetEncoding returns the encoding of the schema. If no encoding is specified in the schema, which
 // the most comment default case, it assumes the input stream will be in UTF-8.
 func (p ParserSettings) GetEncoding() string {
-	return strutil.StrPtrOrElse(p.Encoding, EncodingUTF8)
+	return strs.StrPtrOrElse(p.Encoding, EncodingUTF8)
 }
 
 // Header contains the common ParserSettings for all schemas.

omniparser/schemaPlugin/header_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/bradleyjkemp/cupaloy"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/jf-tech/omniparser/jsonutil"
-	"github.com/jf-tech/omniparser/testutil"
+	"github.com/jf-tech/omniparser/jsons"
+	"github.com/jf-tech/omniparser/testlib"
 )
 
 func TestSupportedEncodingMappingsDump(t *testing.T) {
@@ -19,7 +19,7 @@ func TestSupportedEncodingMappingsDump(t *testing.T) {
 		supported = append(supported, k)
 	}
 	sort.Strings(supported)
-	cupaloy.SnapshotT(t, jsonutil.BPM(supported))
+	cupaloy.SnapshotT(t, jsons.BPM(supported))
 }
 
 func TestSupportedEncodingMappings(t *testing.T) {
@@ -34,13 +34,13 @@ func TestSupportedEncodingMappings(t *testing.T) {
 
 func TestGetEncoding(t *testing.T) {
 	assert.Equal(
-		t, EncodingUTF8, (ParserSettings{Encoding: testutil.StrPtr(EncodingUTF8)}).GetEncoding())
+		t, EncodingUTF8, (ParserSettings{Encoding: testlib.StrPtr(EncodingUTF8)}).GetEncoding())
 	assert.Equal(
-		t, EncodingISO8859_1, (ParserSettings{Encoding: testutil.StrPtr(EncodingISO8859_1)}).GetEncoding())
+		t, EncodingISO8859_1, (ParserSettings{Encoding: testlib.StrPtr(EncodingISO8859_1)}).GetEncoding())
 	assert.Equal(
-		t, EncodingWindows1252, (ParserSettings{Encoding: testutil.StrPtr(EncodingWindows1252)}).GetEncoding())
+		t, EncodingWindows1252, (ParserSettings{Encoding: testlib.StrPtr(EncodingWindows1252)}).GetEncoding())
 	assert.Equal(
 		t, EncodingUTF8, (ParserSettings{}).GetEncoding())
 	assert.Equal(
-		t, "whatever", (ParserSettings{Encoding: testutil.StrPtr("whatever")}).GetEncoding())
+		t, "whatever", (ParserSettings{Encoding: testlib.StrPtr("whatever")}).GetEncoding())
 }

strutil/strutil.go → strs/strs.go

@@ -1,4 +1,4 @@
-package strutil
+package strs
 
 func StrPtrOrElse(sp *string, orElse string) string {
 	if sp != nil {

strutil/strutil_test.go → strs/strs_test.go

@@ -1,14 +1,14 @@
-package strutil
+package strs
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/jf-tech/omniparser/testutil"
+	"github.com/jf-tech/omniparser/testlib"
 )
 
 func TestStrPtrOrElse(t *testing.T) {
-	assert.Equal(t, "this", StrPtrOrElse(testutil.StrPtr("this"), "that"))
+	assert.Equal(t, "this", StrPtrOrElse(testlib.StrPtr("this"), "that"))
 	assert.Equal(t, "that", StrPtrOrElse(nil, "that"))
 }

testutil/testutil.go → testlib/testlib.go

@@ -1,4 +1,4 @@
-package testutil
+package testlib
 
 // IntPtr returns an int pointer with a given value.
 // Tests cases needed inline int pointer declaration can use this.

testutil/testutil_test.go → testlib/testlib_test.go

@@ -1,4 +1,4 @@
-package testutil
+package testlib
 
 import (
 	"testing"