Merge pull request #22 from kdar/select-nodes-direct

added SelectNodesDirect function

document.go

@@ -86,6 +86,12 @@ func (this *Document) SelectNodes(namespace, name string) []*Node {
 	return this.Root.SelectNodes(namespace, name)
 }
 
+// Select all nodes directly under this document, with the given namespace
+// and name. Returns an empty slice if no matches were found.
+func (this *Document) SelectNodesDirect(namespace, name string) []*Node {
+	return this.Root.SelectNodesDirect(namespace, name)
+}
+
 // Select all nodes with the given namespace and name, also recursing into the
 // children of those matches. Returns an empty slice if no matches were found.
 func (this *Document) SelectNodesRecursive(namespace, name string) []*Node {

node.go

@@ -397,6 +397,19 @@ func (this *Node) SelectNodes(namespace, name string) []*Node {
 	return list
 }
 
+// Select multiple nodes directly under this node, by name.
+func (this *Node) SelectNodesDirect(namespace, name string) []*Node {
+	list := make([]*Node, 0, 16)
+
+	for _, v := range this.Children {
+		if (namespace == "*" || v.Name.Space == namespace) && (name == "*" || v.Name.Local == name) {
+			list = append(list, v)
+		}
+	}
+
+	return list
+}
+
 // Select multiple nodes by name
 func (this *Node) SelectNodesRecursive(namespace, name string) []*Node {
 	list := make([]*Node, 0, 16)

xmlx_test.go

@@ -5,8 +5,8 @@
 package xmlx
 
 import (
-	"testing"
 	"encoding/xml"
+	"testing"
 )
 
 func TestLoadLocal(t *testing.T) {
@@ -256,9 +256,9 @@ func TestElementNodeValueFetch(t *testing.T) {
 }
 
 // node.SetValue(x); x == node.GetValue
-func TestElementNodeValueFetchAndSetIdentity (t *testing.T) {
+func TestElementNodeValueFetchAndSetIdentity(t *testing.T) {
 	// Setup: <root><text>xyzzy</text></root>
-	// The xmlx parser creates a nameless NT_TEXT node containing the value 'xyzzy' 
+	// The xmlx parser creates a nameless NT_TEXT node containing the value 'xyzzy'
 	rootN := NewNode(NT_ROOT)
 	rootN.Name = xml.Name{Space: "", Local: "root"}
 	textN := NewNode(NT_ELEMENT)
@@ -269,12 +269,12 @@ func TestElementNodeValueFetchAndSetIdentity (t *testing.T) {
 	textN.AddChild(namelessN)
 
 	targetN := rootN.SelectNode("", "text") // selects textN
-	if (targetN != textN) {
+	if targetN != textN {
 		t.Errorf("Failed to get the correct textN, got %#v", targetN)
 	}
-	
+
 	// targetN.Value is empty (as the value lives in the childNode)
-	if (targetN.Value != "") {
+	if targetN.Value != "" {
 		t.Errorf("Failed to prepare correctly, TargetN.Value is not empty, it contains %#v", targetN.Value)
 	}
 
@@ -316,7 +316,7 @@ func TestElementNodeValueFetchAndSet(t *testing.T) {
 	if carN == nil {
 		t.Fatalf("Failed to get the car, got nil, wanted Node{car}")
 	}
-	
+
 	colorNode := carN.SelectNode("", "color")
 	if colorNode == nil {
 		t.Fatalf("Failed to get the color, got nil, wanted Node{color}")
@@ -337,7 +337,6 @@ func TestElementNodeValueFetchAndSet(t *testing.T) {
 	<found />
 	ue</available></car>`
 
-
 	if got := doc.Root.String(); got != expected {
 		t.Fatalf("expected: \n%s\ngot: \n%s\n", expected, got)
 	}
@@ -368,3 +367,34 @@ func TestElementNodeValueFetchAndSet(t *testing.T) {
 		t.Fatalf("expected: \n%s\ngot: \n%s\n", expected, got)
 	}
 }
+
+func TestSelectNodesDirect(t *testing.T) {
+	data := `<root><wrapper><hidden></hidden>
+	<hidden></hidden></wrapper></root>`
+	doc := New()
+
+	if err := doc.LoadString(data, nil); nil != err {
+		t.Fatalf("LoadString(): %s", err)
+	}
+
+	root := doc.SelectNode("*", "root")
+	if root == nil {
+		t.Fatalf("Failed to get root, got nil, wanted Node{root}")
+	}
+
+	nodes := root.SelectNodesDirect("*", "hidden")
+
+	if len(nodes) != 0 {
+		t.Errorf("SelectDirectNodes should not select children of children.")
+	}
+
+	wrapper := root.SelectNode("*", "wrapper")
+	if wrapper == nil {
+		t.Fatalf("Failed to get wrapper, got nil, wanted Node{wrapper}")
+	}
+
+	nodes = wrapper.SelectNodesDirect("*", "hidden")
+	if len(nodes) != 2 {
+		t.Errorf("Unexcepted hidden nodes found. Expected: 2, Got: %d", len(nodes))
+	}
+}