Tidy up parse package

Author: stilvoid

go.mod

@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2
+	github.com/clbanning/mxj v1.8.4
 	github.com/clbanning/x2j v0.0.0-20180326210544-5e605d46809c
 	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
 	github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3

go.sum

@@ -1,5 +1,7 @@
 github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 h1:axBiC50cNZOs7ygH5BgQp4N+aYrZ2DNpWZ1KG3VOSOM=
 github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2/go.mod h1:jnzFpU88PccN/tPPhCpnNU8mZphvKxYM9lLNkd8e+os=
+github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
+github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
 github.com/clbanning/x2j v0.0.0-20180326210544-5e605d46809c h1:gZ7YRTPnL5fRduIw4unEfQWLB/DInK29N2zYza16wfQ=
 github.com/clbanning/x2j v0.0.0-20180326210544-5e605d46809c/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=

parse/benchmark_test.go

@@ -1,6 +1,10 @@
-package parse
+package parse_test
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stilvoid/please/parse"
+)
 
 const jsonInput = `{
     "description": "some example json",
@@ -42,30 +46,30 @@ const queryInput = `an+array=0%3Dfirst%2Bentry%261%3Dnested%253Dobject%262%3D0%2
 
 func BenchmarkJSON(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		parseJSON([]byte(jsonInput))
+		parse.Json([]byte(jsonInput))
 	}
 }
 
 func BenchmarkYAML(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		parseYAML([]byte(yamlInput))
+		parse.Yaml([]byte(yamlInput))
 	}
 }
 
 func BenchmarkXML(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		parseXML([]byte(xmlInput))
+		parse.Xml([]byte(xmlInput))
 	}
 }
 
 func BenchmarkQuery(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		parseQuery([]byte(queryInput))
+		parse.Query([]byte(queryInput))
 	}
 }
 
 func BenchmarkHTML(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		parseHTML([]byte(xmlInput))
+		parse.Html([]byte(xmlInput))
 	}
 }

parse/csv.go

@@ -5,6 +5,6 @@ import (
 	"encoding/csv"
 )
 
-func parseCSV(input []byte) (interface{}, error) {
+func Csv(input []byte) (interface{}, error) {
 	return csv.NewReader(bytes.NewReader(input)).ReadAll()
 }

parse/csv_test.go

@@ -1,8 +1,10 @@
-package parse
+package parse_test
 
 import (
 	"reflect"
 	"testing"
+
+	"github.com/stilvoid/please/parse"
 )
 
 func TestCSV(t *testing.T) {
@@ -11,12 +13,12 @@ func TestCSV(t *testing.T) {
 		"2-1,2-2"
 
 	expected := [][]string{
-		[]string{"col1", "col2"},
-		[]string{"1-1", "1-2"},
-		[]string{"2-1", "2-2"},
+		{"col1", "col2"},
+		{"1-1", "1-2"},
+		{"2-1", "2-2"},
 	}
 
-	actual, err := parseCSV([]byte(input))
+	actual, err := parse.Csv([]byte(input))
 
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)

parse/html.go

@@ -9,13 +9,7 @@ import (
 	"golang.org/x/net/html"
 )
 
-type node struct {
-	Node  interface{}   `xml:",any"`
-	List  []interface{} `xml:",any"`
-	Value interface{}   `xml:",any"`
-}
-
-func parseHTML(input []byte) (interface{}, error) {
+func Html(input []byte) (interface{}, error) {
 	var parsed interface{}
 
 	doc, err := html.Parse(bytes.NewReader(input))

parse/html_test.go

@@ -1,8 +1,10 @@
-package parse
+package parse_test
 
 import (
 	"reflect"
 	"testing"
+
+	"github.com/stilvoid/please/parse"
 )
 
 func TestHTML(t *testing.T) {
@@ -32,7 +34,7 @@ func TestHTML(t *testing.T) {
 		},
 	}
 
-	actual, err := parseHTML([]byte(input))
+	actual, err := parse.Html([]byte(input))
 
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)

parse/json.go

@@ -2,7 +2,7 @@ package parse
 
 import "encoding/json"
 
-func parseJSON(input []byte) (interface{}, error) {
+func Json(input []byte) (interface{}, error) {
 	var parsed interface{}
 
 	err := json.Unmarshal(input, &parsed)

parse/json_test.go

@@ -1,8 +1,10 @@
-package parse
+package parse_test
 
 import (
 	"reflect"
 	"testing"
+
+	"github.com/stilvoid/please/parse"
 )
 
 func TestJSON(t *testing.T) {
@@ -47,7 +49,7 @@ func TestJSON(t *testing.T) {
 		input := inputs[i]
 		expected := expecteds[i]
 
-		actual, err := parseJSON([]byte(input))
+		actual, err := parse.Json([]byte(input))
 
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)

parse/mime.go

@@ -7,7 +7,7 @@ import (
 	"net/textproto"
 )
 
-func parseMIME(input []byte) (interface{}, error) {
+func Mime(input []byte) (interface{}, error) {
 	inputReader := bufio.NewReader(bytes.NewReader(input))
 
 	reader := textproto.NewReader(inputReader)