Merge branch '#76'

close #75

Author: zhengchun

go.mod

@@ -5,5 +5,6 @@ go 1.14
 require (
 	github.com/antchfx/xpath v1.3.3
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
+	github.com/stretchr/testify v1.10.0
 	golang.org/x/net v0.33.0
 )

go.sum

@@ -1,8 +1,22 @@
 github.com/antchfx/xpath v1.3.3 h1:tmuPQa1Uye0Ym1Zn65vxPgfltWb/Lxu2jeqIGteJSRs=
 github.com/antchfx/xpath v1.3.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -69,3 +83,8 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

query.go

@@ -112,15 +112,17 @@ func LoadURL(url string) (*html.Node, error) {
 	encoding := resp.Header.Get("Content-Encoding")
 	switch encoding {
 	case "gzip":
-		reader, err = gzip.NewReader(resp.Body)
+		gzipReader, err := gzip.NewReader(resp.Body)
 		if err != nil {
 			return nil, err
 		}
+		reader = gzipReader
 	case "deflate":
-		reader, err = zlib.NewReader(resp.Body)
+		zlibReader, err := zlib.NewReader(resp.Body)
 		if err != nil {
 			return nil, err
 		}
+		reader = zlibReader
 	case "":
 		reader = resp.Body
 	default:

query_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/antchfx/xpath"
+	"github.com/stretchr/testify/require"
 	"golang.org/x/net/html"
 )
 
@@ -191,6 +192,57 @@ func TestConcurrentQuery(t *testing.T) {
 	wg.Wait()
 }
 
+func TestLoadURL_ErrorCases(t *testing.T) {
+	tests := []struct {
+		name            string
+		contentEncoding string
+		responseBody    []byte
+		expectedError   string
+	}{
+		{
+			name:            "ZlibReaderError",
+			contentEncoding: "deflate",
+			responseBody:    []byte("invalid zlib data"),
+			expectedError:   "zlib",
+		},
+		{
+			name:            "EmptyContentEncodingNilBody",
+			contentEncoding: "",
+			responseBody:    nil,
+			expectedError:   "EOF",
+		},
+		{
+			name:            "GzipReaderError",
+			contentEncoding: "gzip",
+			responseBody:    []byte("invalid gzip data"),
+			expectedError:   "gzip",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create a local HTTP server
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.Header().Set("Content-Encoding", tt.contentEncoding)
+				w.WriteHeader(http.StatusOK)
+				w.Write(tt.responseBody)
+			}))
+			defer server.Close()
+
+			node, err := LoadURL(server.URL)
+
+			// Assert that the returned node is nil
+			require.Nil(t, node)
+
+			// Assert that an error is returned
+			require.NotNil(t, err)
+
+			// Optionally, check the error message
+			require.Contains(t, err.Error(), tt.expectedError)
+		})
+	}
+}
+
 func loadHTML(str string) *html.Node {
 	node, err := Parse(strings.NewReader(str))
 	if err != nil {