Update Go versions used in CI

Merge remote-tracking branch 'refs/remotes/origin/master'
Update goquery dependencies
2024-04-21 12:31:36 +00:00 · 2022-11-17 10:06:24 -05:00 · 2022-11-16 21:09:11 -05:00 · 2022-11-16 21:08:40 -05:00 · 2022-06-10 09:48:40 -04:00 · 2022-06-10 05:05:08 -06:00
8 changed files with 75 additions and 153 deletions
@@ -1,104 +0,0 @@
-image: fedora/latest
-packages:
-  - tar
-environment:
-  GOROOT: /tmp/go
-  GOPATH: /home/build
-  GOBIN: /home/build/bin
-sources:
-  - https://github.com/PuerkitoBio/goquery
-tasks:
-  - setup: |
-      mkdir bin
-      mkdir -p src/github.com/PuerkitoBio
-      mv goquery src/github.com/PuerkitoBio/
-  - go1_7: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.7.6.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_8: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.8.7.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_9: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.9.7.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_10: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.10.8.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_11: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.11.13.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_12: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.12.17.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_13: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.13.15.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_14: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.14.12.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_15: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.15.5.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
-  - go1_16: |
-      cd /tmp
-      rm -rf go
-      curl -Lo golang.tar.gz https://golang.org/dl/go1.16beta1.linux-amd64.tar.gz
-      tar xvf golang.tar.gz
-      cd /home/build/src/github.com/PuerkitoBio/goquery
-      /tmp/go/bin/go version
-      /tmp/go/bin/go get -t .
-      /tmp/go/bin/go test -v
@@ -0,0 +1,25 @@
+name: test
+on: [push, pull_request]
+
+env:
+  GOPROXY: https://proxy.golang.org,direct
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.18.x, 1.19.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Test
+        run: go test ./... -v -cover
@@ -1,31 +0,0 @@
-arch:
-    - amd64
-    - ppc64le
-language: go
-
-go:
-    - 1.7.x
-    - 1.8.x
-    - 1.9.x
-    - 1.10.x
-    - 1.11.x
-    - 1.12.x
-    - 1.13.x
-    - 1.14.x
-    - 1.15.x
-    - tip
-
-jobs:
- exclude:
-    - arch: ppc64le
-      go: 1.7.x
-    - arch: ppc64le
-      go: 1.8.x
-    - arch: ppc64le
-      go: 1.9.x
-    - arch: ppc64le
-      go: 1.10.x
-    - arch: ppc64le
-      go: 1.11.x
-    - arch: ppc64le
-      go: 1.12.x
@@ -1,7 +1,6 @@
 # goquery - a little like that j-thing, only in Go

-[![builds.sr.ht status](https://builds.sr.ht/~mna/goquery/commits/fedora.yml.svg)](https://builds.sr.ht/~mna/goquery/commits/fedora.yml?)
-[![build status](https://secure.travis-ci.org/PuerkitoBio/goquery.svg?branch=master)](http://travis-ci.org/PuerkitoBio/goquery)
+[![Build Status](https://github.com/PuerkitoBio/goquery/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/PuerkitoBio/goquery/actions)
 [![Go Reference](https://pkg.go.dev/badge/github.com/PuerkitoBio/goquery.svg)](https://pkg.go.dev/github.com/PuerkitoBio/goquery)
 [![Sourcegraph Badge](https://sourcegraph.com/github.com/PuerkitoBio/goquery/-/badge.svg)](https://sourcegraph.com/github.com/PuerkitoBio/goquery?badge)

@@ -41,6 +40,7 @@ Please note that because of the net/html dependency, goquery requires Go1.1+ and

 **Note that goquery's API is now stable, and will not break.**

+*    **2021-10-25 (v1.8.0)** : Add `Render` function to render a `Selection` to an `io.Writer` (thanks [@anthonygedeon](https://github.com/anthonygedeon)).
 *    **2021-07-11 (v1.7.1)** : Update go.mod dependencies and add dependabot config (thanks [@jauderho](https://github.com/jauderho)).
 *    **2021-06-14 (v1.7.0)** : Add `Single` and `SingleMatcher` functions to optimize first-match selection (thanks [@gdollardollar](https://github.com/gdollardollar)).
 *    **2021-01-11 (v1.6.1)** : Fix panic when calling `{Prepend,Append,Set}Html` on a `Selection` that contains non-Element nodes.
@@ -154,6 +154,8 @@ func main() {
 - [Geziyor](https://github.com/geziyor/geziyor), a fast web crawling & scraping framework for Go. Supports JS rendering.
 - [Pagser](https://github.com/foolin/pagser), a simple, easy, extensible, configurable HTML parser to struct based on goquery and struct tags.
 - [stitcherd](https://github.com/vhodges/stitcherd), A server for doing server side includes using css selectors and DOM updates.
+- [goskyr](https://github.com/jakopako/goskyr), an easily configurable command-line scraper written in Go.
+- [goGetJS](https://github.com/davemolk/goGetJS), a tool for extracting, searching, and saving JavaScript files (with optional headless browser).

 ## Support

@@ -46,6 +46,6 @@ func BenchmarkHtml(b *testing.B) {
 	sel := DocW().Find("h2")
 	b.StartTimer()
 	for i := 0; i < b.N; i++ {
-		sel.Html()
+		_, _ = sel.Html()
 	}
 }
@@ -1,8 +1,8 @@
 module github.com/PuerkitoBio/goquery

 require (
-	github.com/andybalholm/cascadia v1.2.0
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+	github.com/andybalholm/cascadia v1.3.1
+	golang.org/x/net v0.2.0
 )

 go 1.13
@@ -1,10 +1,33 @@
-github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
-github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
-golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
+github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
+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=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2,6 +2,7 @@ package goquery

 import (
 	"bytes"
+	"io"

 	"golang.org/x/net/html"
 )
@@ -50,28 +51,34 @@ func nodeName(node *html.Node) string {
 	case html.ElementNode, html.DoctypeNode:
 		return node.Data
 	default:
-		if node.Type >= 0 && int(node.Type) < len(nodeNames) {
+		if int(node.Type) < len(nodeNames) {
 			return nodeNames[node.Type]
 		}
 		return ""
 	}
 }

+// Render renders the HTML of the first item in the selection and writes it to
+// the writer. It behaves the same as OuterHtml but writes to w instead of
+// returning the string.
+func Render(w io.Writer, s *Selection) error {
+	if s.Length() == 0 {
+		return nil
+	}
+	n := s.Get(0)
+	return html.Render(w, n)
+}
+
 // OuterHtml returns the outer HTML rendering of the first item in
 // the selection - that is, the HTML including the first element's
 // tag and attributes.
 //
-// Unlike InnerHtml, this is a function and not a method on the Selection,
+// Unlike Html, this is a function and not a method on the Selection,
 // because this is not a jQuery method (in javascript-land, this is
 // a property provided by the DOM).
 func OuterHtml(s *Selection) (string, error) {
 	var buf bytes.Buffer
-
-	if s.Length() == 0 {
-		return "", nil
-	}
-	n := s.Get(0)
-	if err := html.Render(&buf, n); err != nil {
+	if err := Render(&buf, s); err != nil {
 		return "", err
 	}
 	return buf.String(), nil
Author	SHA1	Message	Date
Martin Angers	53d8b4dd6f	Update Go versions used in CI	2022-11-17 10:06:24 -05:00
Martin Angers	b103c0e59a	Merge remote-tracking branch 'refs/remotes/origin/master'	2022-11-16 21:09:11 -05:00
Martin Angers	36e95634e3	Update goquery dependencies	2022-11-16 21:08:40 -05:00
Martin AngersandGitHub	156fa4f6ae	Merge pull request #416 from davemolk/readme-add-goGetJS add goGetJS to readme	2022-06-10 09:48:40 -04:00
davemolk	c76525c424	add goGetJS to readme	2022-06-10 05:05:08 -06:00
Martin AngersandGitHub	3920ccc98a	Merge pull request #415 from jakopako/add-goskyr-to-related-projects README.md: Add goskyr to related projects.	2022-05-06 08:18:09 -04:00
jakopako	eef406fe05	added goskyr to related projects	2022-05-06 13:37:08 +02:00
Martin AngersandGitHub	ed0b238f66	Merge pull request #412 from mitar/patch-1 There is no InnerHtml.	2022-04-23 19:05:04 -04:00
MitarandGitHub	93ca487049	There is no InnerHtml.	2022-04-23 14:34:58 -07:00
Martin AngersandGitHub	8c90f82d4f	Merge pull request #404 from jauderho/master Updated go.mod dependencies per Snyk alert	2022-01-04 14:43:08 -05:00
Jauder Ho	5ffcf47d06	Updated go.mod dependencies per Snyk alert Signed-off-by: Jauder Ho <jauderho@users.noreply.github.com>	2022-01-04 17:28:09 +00:00
Martin Angers	7a43c97117	Make documentation more consistent	2021-10-25 20:31:05 -04:00
Martin Angers	a8c788f298	Add new version to changelog	2021-10-25 20:24:24 -04:00
Martin Angers	faf9b4dc84	Remove travis ci, add github actions badge	2021-10-25 20:21:06 -04:00
Martin Angers	a751e062fd	Remove sourcehut build, use github actions	2021-10-25 20:18:35 -04:00
Martin Angers	b6dc0bd0ea	Fix some small linting issues	2021-10-25 20:16:05 -04:00
Martin AngersandGitHub	4110e175b5	Merge pull request #399 from anthonygedeon/issue/377-save-manipulated-html Fixes #377, renders the html that can be manipulated with writer	2021-10-25 20:13:01 -04:00
Anthony Gedeon	d35d4cec3e	fix(doc): update docs for accurate representation of function	2021-10-25 18:16:30 -05:00
Anthony Gedeon	11e1233457	fix(test): remove Render testcase since OuterHtml handles Render internally	2021-10-25 18:16:09 -05:00
Anthony Gedeon	98eb88c22b	Fixes PuerkitoBio#377, renders the html that can be manipulated with an writer as input	2021-10-24 21:08:06 -05:00
Martin AngersandGitHub	6a7f1c4a50	Merge pull request #394 from kinoute/master upgrade Cascadia	2021-09-25 16:11:08 -04:00
Yann Defretin	7307e2457c	upgrade Cascadia	2021-09-25 22:04:20 +02:00
Martin AngersandGitHub	a7412da07a	Merge pull request #392 from kinoute/master use new Cascadia version	2021-09-22 17:38:44 -04:00
Yann Defretin	c5eeb05f52	use new Cascadia version	2021-09-22 19:09:37 +02:00