refactor Document to no longer be an Element.

2 files changed, 111 insertions, 10 deletions

diff --git a/suds/sax/document.py b/suds/sax/document.py
index 170858f..c39922f 100644
--- a/suds/sax/document.py
+++ b/suds/sax/document.py
@@ -25,15 +25,19 @@ from suds.sax.element import Element
 
 log = getLogger(__name__)
 
-class Document(Element):
-    """ simple document """
+class Document:
+    """ An XML Document """
     
     DECL = '<?xml version="1.0" encoding="UTF-8"?>'
 
     def __init__(self, root=None):
-        Element.__init__(self, 'document')
-        if root is not None:
-            self.append(root)
+        """
+        @param root: A root L{Element} or name used to build
+            the document root element.
+        @type root: (L{Element}|str|None)
+        """
+        self.__root = None
+        self.append(root)    
 
     def root(self):
         """
@@ -41,14 +45,111 @@ class Document(Element):
         @return: The document root.
         @rtype: L{Element}
         """
-        if len(self.children):
-            return self.children[0]
+        return self.__root
+        
+    def append(self, node):
+        """
+        Append (set) the document root.
+        @param node: A root L{Element} or name used to build
+            the document root element.
+        @type node: (L{Element}|str|None)
+        """
+        if isinstance(node, basestring):
+            self.__root = Element(node)
+            return
+        if isinstance(node, Element):
+            self.__root = node
+            return
+        
+    def getChild(self, name, ns=None, default=None):
+        """
+        Get a child by (optional) name and/or (optional) namespace.
+        @param name: The name of a child element (may contain prefix).
+        @type name: basestring
+        @param ns: An optional namespace used to match the child.
+        @type ns: (I{prefix}, I{name})
+        @param default: Returned when child not-found.
+        @type default: L{Element}
+        @return: The requested child, or I{default} when not-found.
+        @rtype: L{Element}
+        """
+        if self.__root is None:
+            return default
+        if ns is None:
+            prefix, name = splitPrefix(name)
+            if prefix is None:
+                ns = None
+            else:
+                ns = self.__root.resolvePrefix(prefix)
+        if self.__root.match(name, ns):
+            return self.__root
         else:
+            return default
+        
+    def childAtPath(self, path):
+        """
+        Get a child at I{path} where I{path} is a (/) separated
+        list of element names that are expected to be children.
+        @param path: A (/) separated list of element names.
+        @type path: basestring
+        @return: The leaf node at the end of I{path}
+        @rtype: L{Element}
+        """
+        if self.__root is None:
+            return None
+        if path[0] == '/':
+            path = path[1:]
+        path = path.split('/',1)
+        if self.getChild(path[0]) is None:
             return None
+        if len(path) > 1:
+            return self.__root.childAtPath(path[1])
+        else:
+            return self.__root
+        
+    def childrenAtPath(self, path):
+        """
+        Get a list of children at I{path} where I{path} is a (/) separated
+        list of element names that are expected to be children.
+        @param path: A (/) separated list of element names.
+        @type path: basestring
+        @return: The collection leaf nodes at the end of I{path}
+        @rtype: [L{Element},...]
+        """
+        if self.__root is None:
+            return []
+        if path[0] == '/':
+            path = path[1:]
+        path = path.split('/',1)
+        if self.getChild(path[0]) is None:
+            return []
+        if len(path) > 1:
+            return self.__root.childrenAtPath(path[1])
+        else:
+            return [self.__root,]
+        
+    def getChildren(self, name=None, ns=None):
+        """
+        Get a list of children by (optional) name and/or (optional) namespace.
+        @param name: The name of a child element (may contain prefix).
+        @type name: basestring
+        @param ns: An optional namespace used to match the child.
+        @type ns: (I{prefix}, I{name})
+        @return: The list of matching children.
+        @rtype: [L{Element},...]
+        """
+        if name is None:
+            matched = self.__root
+        else:
+            matched = self.getChild(name, ns)
+        if matched is None:
+            return []
+        else:
+            return [matched,]
         
     def str(self):
         """
-        Get a string representation of this XML fragment.
+        Get a string representation of this XML document.
         @return: A I{pretty} string.
         @rtype: basestring
         """
@@ -62,7 +163,7 @@ class Document(Element):
     
     def plain(self):
         """
-        Get a string representation of this XML fragment.
+        Get a string representation of this XML document.
         @return: A I{plain} string.
         @rtype: basestring
         """
diff --git a/suds/sax/parser.py b/suds/sax/parser.py
index 69f871b..6fe7a18 100644
--- a/suds/sax/parser.py
+++ b/suds/sax/parser.py
@@ -49,7 +49,7 @@ class Handler(ContentHandler):
  
     def startElement(self, name, attrs):
         top = self.top()
-        node = Element(unicode(name), parent=top)
+        node = Element(unicode(name))
         for a in attrs.getNames():
             n = unicode(a)
             v = unicode(attrs.getValue(a))