[fix] use latest htmlquery - closes gocolly#280

colly.go

@@ -38,7 +38,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/net/html"
 	"google.golang.org/appengine/urlfetch"
 
 	"github.com/PuerkitoBio/goquery"
@@ -988,7 +987,7 @@ func (c *Collector) handleOnXML(resp *Response) error {
 		}
 
 		for _, cc := range c.xmlCallbacks {
-			htmlquery.FindEach(doc, cc.Query, func(i int, n *html.Node) {
+			for _, n := range htmlquery.Find(doc, cc.Query) {
 				e := NewXMLElementFromHTMLNode(resp, n)
 				if c.debugger != nil {
 					c.debugger.Event(createEvent("xml", resp.Request.ID, c.ID, map[string]string{
@@ -997,7 +996,7 @@ func (c *Collector) handleOnXML(resp *Response) error {
 					}))
 				}
 				cc.Function(e)
-			})
+			}
 		}
 	} else if strings.Contains(contentType, "xml") {
 		doc, err := xmlquery.Parse(bytes.NewBuffer(resp.Body))

xmlelement.go

@@ -134,13 +134,13 @@ func (h *XMLElement) ChildAttr(xpathQuery, attrName string) string {
 func (h *XMLElement) ChildAttrs(xpathQuery, attrName string) []string {
 	var res []string
 	if h.isHTML {
-		htmlquery.FindEach(h.DOM.(*html.Node), xpathQuery, func(i int, child *html.Node) {
+		for _, child := range htmlquery.Find(h.DOM.(*html.Node), xpathQuery) {
 			for _, attr := range child.Attr {
 				if attr.Key == attrName {
 					res = append(res, strings.TrimSpace(attr.Val))
 				}
 			}
-		})
+		}
 	} else {
 		xmlquery.FindEach(h.DOM.(*xmlquery.Node), xpathQuery, func(i int, child *xmlquery.Node) {
 			for _, attr := range child.Attr {
@@ -158,9 +158,9 @@ func (h *XMLElement) ChildAttrs(xpathQuery, attrName string) []string {
 func (h *XMLElement) ChildTexts(xpathQuery string) []string {
 	texts := make([]string, 0)
 	if h.isHTML {
-		htmlquery.FindEach(h.DOM.(*html.Node), xpathQuery, func(i int, child *html.Node) {
+		for _, child := range htmlquery.Find(h.DOM.(*html.Node), xpathQuery) {
 			texts = append(texts, strings.TrimSpace(htmlquery.InnerText(child)))
-		})
+		}
 	} else {
 		xmlquery.FindEach(h.DOM.(*xmlquery.Node), xpathQuery, func(i int, child *xmlquery.Node) {
 			texts = append(texts, strings.TrimSpace(child.InnerText()))