Merge pull request #33 from dustmop/any-tag-name

Find/FindAll with an empty string will match any tag

soup.go

@@ -318,10 +318,14 @@ func (r Root) FullText() string {
 	return buf.String()
 }
 
+func matchElementName(n *html.Node, name string) bool {
+	return name == "" || name == n.Data
+}
+
 // Using depth first search to find the first occurrence and return
 func findOnce(n *html.Node, args []string, uni bool, strict bool) (*html.Node, bool) {
 	if uni == true {
-		if n.Type == html.ElementNode && n.Data == args[0] {
+		if n.Type == html.ElementNode && matchElementName(n, args[0]) {
 			if len(args) > 1 && len(args) < 4 {
 				for i := 0; i < len(n.Attr); i++ {
 					attr := n.Attr[i]
@@ -353,7 +357,7 @@ func findAllofem(n *html.Node, args []string, strict bool) []*html.Node {
 	var f func(*html.Node, []string, bool)
 	f = func(n *html.Node, args []string, uni bool) {
 		if uni == true {
-			if n.Data == args[0] {
+			if matchElementName(n, args[0]) {
 				if len(args) > 1 && len(args) < 4 {
 					for i := 0; i < len(n.Attr); i++ {
 						attr := n.Attr[i]

soup_test.go

@@ -83,6 +83,16 @@ func TestFind(t *testing.T) {
 	if !reflect.DeepEqual(actual, "Just two divs peacing out") {
 		t.Error("Instead of `Just two divs peacing out`, got", actual)
 	}
+	// Find("") for any
+	actual = multipleClasses.Find("body").Find("").Text()
+	if !reflect.DeepEqual(actual, "Multiple classes") {
+		t.Error("Instead of `Multiple classes`, got", actual)
+	}
+	// Find("") with attributes
+	actual = doc.Find("", "id", "4").Text()
+	if !reflect.DeepEqual(actual, "Last one") {
+		t.Error("Instead of `Last one`, got", actual)
+	}
 }
 
 func TestFindNextPrevElement(t *testing.T) {
@@ -131,6 +141,13 @@ func TestFindAllBySingleClass(t *testing.T) {
 	}
 }
 
+func TestFindAllByAttribute(t *testing.T) {
+	actual := doc.FindAll("", "id", "2")
+	if len(actual) != 1 {
+		t.Errorf("Expected 1 element to be returned. Actual: %d", len(actual))
+	}
+}
+
 func TestFindBySingleClass(t *testing.T) {
 	actual := multipleClasses.Find("div", "class", "first")
 	if actual.Text() != "Multiple classes" {