Compare commits

...
Author SHA1 Message Date
Martin Angers 39fb6d4dc4 Prepare for patch release 2023-02-18 10:29:26 -05:00
Martin AngersandGitHub 33955beabb Merge pull request #439 from PuerkitoBio/dependabot/go_modules/golang.org/x/net-0.7.0
Bump golang.org/x/net from 0.2.0 to 0.7.0
2023-02-18 10:24:07 -05:00
dependabot[bot]andGitHub 015f32a1b4 Bump golang.org/x/net from 0.2.0 to 0.7.0
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.2.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/compare/v0.2.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-18 03:21:47 +00:00
Martin AngersandGitHub 3b7929a0d7 Merge pull request #434 from PuerkitoBio/update-go
Update Go versions used in CI
2022-11-17 10:09:36 -05:00
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
Martin Angers 372d5bdaa0 Add changelog 2021-07-11 09:51:06 -04:00
Martin Angers 5dfda0e354 Merge branch 'jauderho-update-gomod' 2021-07-11 09:49:15 -04:00
Jauder Ho d6951d24bb Update go modules 2021-07-11 05:44:15 +00:00
Jauder HoandGitHub c09491e08b Update dependabot.yml 2021-07-11 05:37:44 +00:00
Jauder HoandGitHub 02e233c33a Create dependabot.yml 2021-07-11 05:36:11 +00:00
Martin Angers e11510b114 Update changelog for 1.7.0 2021-06-14 09:16:48 -04:00
Martin Angers a9cfd6779b Merge branch 'wip-i255-single-match' 2021-06-14 09:09:43 -04:00
10 changed files with 96 additions and 158 deletions
-104
View File
@@ -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
+7
View File
@@ -0,0 +1,7 @@
version: 2
updates:
# Maintain dependencies for Go
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"
+25
View File
@@ -0,0 +1,25 @@
name: test
on: [push, pull_request]
env:
GOPROXY: https://proxy.golang.org,direct
jobs:
test:
strategy:
matrix:
go-version: [1.19.x, 1.20.x]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
- name: Checkout code
uses: actions/checkout@v3
- name: Test
run: go test ./... -v -cover
-31
View File
@@ -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 -1
View File
@@ -1,4 +1,4 @@
Copyright (c) 2012-2016, Martin Angers & Contributors
Copyright (c) 2012-2021, Martin Angers & Contributors
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+15 -6
View File
@@ -1,5 +1,8 @@
# 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) [![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)
[![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)
goquery brings a syntax and a set of features similar to [jQuery][] to the [Go language][go]. It is based on Go's [net/html package][html] and the CSS Selector library [cascadia][]. Since the net/html parser returns nodes, and not a full-featured DOM tree, jQuery's stateful manipulation functions (like height(), css(), detach()) have been left off.
@@ -19,7 +22,7 @@ Syntax-wise, it is as close as possible to jQuery, with the same function names
## Installation
Please note that because of the net/html dependency, goquery requires Go1.1+.
Please note that because of the net/html dependency, goquery requires Go1.1+ and is tested on Go1.7+.
$ go get github.com/PuerkitoBio/goquery
@@ -37,6 +40,10 @@ Please note that because of the net/html dependency, goquery requires Go1.1+.
**Note that goquery's API is now stable, and will not break.**
* **2023-02-18 (v1.8.1)** : Update `go.mod` dependencies, update CI workflow.
* **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.
* **2020-10-08 (v1.6.0)** : Parse html in context of the container node for all functions that deal with html strings (`AfterHtml`, `AppendHtml`, etc.). Thanks to [@thiemok][thiemok] and [@davidjwilkins][djw] for their work on this.
* **2020-02-04 (v1.5.1)** : Update module dependencies.
@@ -50,7 +57,7 @@ Please note that because of the net/html dependency, goquery requires Go1.1+.
* **2016-08-28 (v1.0.1)** : Optimize performance for large documents.
* **2016-07-27 (v1.0.0)** : Tag version 1.0.0.
* **2016-06-15** : Invalid selector strings internally compile to a `Matcher` implementation that never matches any node (instead of a panic). So for example, `doc.Find("~")` returns an empty `*Selection` object.
* **2016-02-02** : Add `NodeName` utility function similar to the DOM's `nodeName` property. It returns the tag name of the first element in a selection, and other relevant values of non-element nodes (see godoc for details). Add `OuterHtml` utility function similar to the DOM's `outerHTML` property (named `OuterHtml` in small caps for consistency with the existing `Html` method on the `Selection`).
* **2016-02-02** : Add `NodeName` utility function similar to the DOM's `nodeName` property. It returns the tag name of the first element in a selection, and other relevant values of non-element nodes (see [doc][] for details). Add `OuterHtml` utility function similar to the DOM's `outerHTML` property (named `OuterHtml` in small caps for consistency with the existing `Html` method on the `Selection`).
* **2015-04-20** : Add `AttrOr` helper method to return the attribute's value or a default value if absent. Thanks to [piotrkowalczuk][piotr].
* **2015-02-04** : Add more manipulation functions - Prepend* - thanks again to [Andrew Stone][thatguystone].
* **2014-11-28** : Add more manipulation functions - ReplaceWith*, Wrap* and Unwrap - thanks again to [Andrew Stone][thatguystone].
@@ -79,7 +86,7 @@ jQuery often has many variants for the same function (no argument, a selector st
Utility functions that are not in jQuery but are useful in Go are implemented as functions (that take a `*Selection` as parameter), to avoid a potential naming clash on the `*Selection`'s methods (reserved for jQuery-equivalent behaviour).
The complete [godoc reference documentation can be found here][doc].
The complete [package reference documentation can be found here][doc].
Please note that Cascadia's selectors do not necessarily match all supported selectors of jQuery (Sizzle). See the [cascadia project][cascadia] for details. Invalid selector strings compile to a `Matcher` that fails to match any node. Behaviour of the various functions that take a selector string as argument follows from that fact, e.g. (where `~` is an invalid selector string):
@@ -148,6 +155,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
@@ -177,10 +186,10 @@ The [BSD 3-Clause license][bsd], the same as the [Go language][golic]. Cascadia'
[bsd]: http://opensource.org/licenses/BSD-3-Clause
[golic]: http://golang.org/LICENSE
[caslic]: https://github.com/andybalholm/cascadia/blob/master/LICENSE
[doc]: http://godoc.org/github.com/PuerkitoBio/goquery
[doc]: https://pkg.go.dev/github.com/PuerkitoBio/goquery
[index]: http://api.jquery.com/index/
[gonet]: https://github.com/golang/net/
[html]: http://godoc.org/golang.org/x/net/html
[html]: https://pkg.go.dev/golang.org/x/net/html
[wiki]: https://github.com/PuerkitoBio/goquery/wiki/Tips-and-tricks
[thatguystone]: https://github.com/thatguystone
[piotr]: https://github.com/piotrkowalczuk
+1 -1
View File
@@ -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()
}
}
+2 -2
View File
@@ -1,8 +1,8 @@
module github.com/PuerkitoBio/goquery
require (
github.com/andybalholm/cascadia v1.1.0
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
github.com/andybalholm/cascadia v1.3.1
golang.org/x/net v0.7.0
)
go 1.13
+30 -5
View File
@@ -1,8 +1,33 @@
github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
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/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
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.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
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.5.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.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
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.7.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=
+15 -8
View File
@@ -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