Compare commits

...
Author SHA1 Message Date
Martin Angers 171b719dd6 add fedora build manifest 2021-01-11 19:07:57 -05:00
Martin Angers f41c56001f Cut new release 2021-01-11 18:44:58 -05:00
Martin Angers 8a11cc402f Ignore non-element nodes when inserting html in a selection 2021-01-11 18:43:18 -05:00
Martin AngersandGitHub 70a02e53e3 Merge pull request #364 from santosh653/master
AddingPowerSupport_CI/Testing
2020-12-08 08:09:26 -05:00
santosh653andGitHub 3798c63c0d Update .travis.yml
Excluding unsupported versions for Power., ie go <=1.12.x
2020-12-07 23:31:38 -05:00
santosh653andGitHub 705a0066a5 Update .travis.yml
Adding power support & updating the go versions to >=1.13 as lower versions are not supported.,
2020-12-07 06:53:59 -05:00
Martin AngersandGitHub a48bafac4b Merge pull request #362 from vhodges/master
Update README.md, closes #361
2020-11-30 18:58:28 -05:00
Vince HodgesandGitHub af965a4d72 Update README.md 2020-11-30 15:54:55 -08:00
5 changed files with 100 additions and 0 deletions
+20
View File
@@ -0,0 +1,20 @@
image: fedora/latest
packages:
- git
- go
sources:
- https://github.com/PuerkitoBio/goquery
tasks:
- go1_2: |
cd goquery
go get golang.org/dl/go1.2.2
go1.2.2 download
go1.2.2 version
go1.2.2 test -v
- go1_3: |
cd goquery
go get golang.org/dl/go1.3.3
go1.3.3 download
go1.3.3 version
go1.3.3 test -v
+27
View File
@@ -1,3 +1,6 @@
arch:
- amd64
- ppc64le
language: go
go:
@@ -15,3 +18,27 @@ go:
- 1.13.x
- tip
jobs:
exclude:
- arch: ppc64le
go: 1.2.x
- arch: ppc64le
go: 1.3.x
- arch: ppc64le
go: 1.4.x
- arch: ppc64le
go: 1.5.x
- arch: ppc64le
go: 1.6.x
- 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
+2
View File
@@ -37,6 +37,7 @@ 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.**
* **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.
* **2018-11-15 (v1.5.0)** : Go module support (thanks @Zaba505).
@@ -147,6 +148,7 @@ func main() {
- [Dataflow kit](https://github.com/slotix/dataflowkit), Web Scraping framework for Gophers.
- [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.
## Support
+3
View File
@@ -661,6 +661,9 @@ func (s *Selection) eachNodeHtml(htmlStr string, isParent bool, mergeFn func(n *
if isParent {
context = n.Parent
} else {
if n.Type != html.ElementNode {
continue
}
context = n
}
if context != nil {
+48
View File
@@ -1,6 +1,7 @@
package goquery
import (
"log"
"testing"
)
@@ -689,3 +690,50 @@ func TestParsingRespectsVaryingContext(t *testing.T) {
oBothA)
}
}
func TestHtmlWithNonElementNode(t *testing.T) {
const data = `
<html>
<head>
</head>
<body>
<p>
This is <span>some</span><b>text</b>.
</p>
</body>
</html>
`
cases := map[string]func(*Selection, string) *Selection{
"AfterHtml": (*Selection).AfterHtml,
"AppendHtml": (*Selection).AppendHtml,
"BeforeHtml": (*Selection).BeforeHtml,
"PrependHtml": (*Selection).PrependHtml,
"ReplaceWithHtml": (*Selection).ReplaceWithHtml,
"SetHtml": (*Selection).SetHtml,
}
for nm, fn := range cases {
// this test is only to make sure that the HTML parsing/manipulation
// methods do not raise panics when executed over Selections that contain
// non-Element nodes.
t.Run(nm, func(t *testing.T) {
doc := loadString(t, data)
sel := doc.Find("p").Contents()
func() {
defer func() {
if err := recover(); err != nil {
t.Fatal(err)
}
}()
fn(sel, "<div></div>")
}()
// print the resulting document in verbose mode
h, err := OuterHtml(doc.Selection)
if err != nil {
log.Fatal(err)
}
t.Log(h)
})
}
}