xmlch: add public adder for ZeroOrMore

Steve Canny · Steve Canny · commit e17d3714666b · 2014-06-15T22:58:01.000-07:00
diff --git a/docx/oxml/parts/document.py b/docx/oxml/parts/document.py
@@ -25,23 +25,9 @@ class CT_Body(BaseOxmlElement):
     p = ZeroOrMore('w:p', successors=('w:sectPr',))
     tbl = ZeroOrMore('w:tbl', successors=('w:sectPr',))
 
-    def add_p(self):
-        """
-        Return a new <w:p> element that has been added at the end of any
-        existing body content.
-        """
-        return self._add_p()
-
     def _insert_p(self, p):
         return self._append_blocklevelelt(p)
 
-    def add_tbl(self):
-        """
-        Return a new <w:tbl> element that has been added at the end of any
-        existing body content.
-        """
-        return self._add_tbl()
-
     def _insert_tbl(self, tbl):
         return self._append_blocklevelelt(tbl)
 
diff --git a/docx/oxml/xmlchemy.py b/docx/oxml/xmlchemy.py
@@ -332,6 +332,21 @@ def _add_list_getter(self):
     def _add_method_name(self):
         return '_add_%s' % self._prop_name
 
+    def _add_public_adder(self):
+        """
+        Add a public ``add_x()`` method to the parent element class.
+        """
+        def add_child(obj):
+            private_add_method = getattr(obj, self._add_method_name)
+            child = private_add_method()
+            return child
+
+        add_child.__doc__ = (
+            'Add a new ``<%s>`` child element unconditionally, inserted in t'
+            'he correct sequence.' % self._nsptagname
+        )
+        self._add_to_class(self._public_add_method_name, add_child)
+
     def _add_to_class(self, name, method):
         """
         Add *method* to the target class as *name*, unless *name* is already
@@ -384,6 +399,16 @@ def get_child_element_list(obj):
         )
         return get_child_element_list
 
+    @lazyproperty
+    def _public_add_method_name(self):
+        """
+        add_childElement() is public API for a repeating element, allowing
+        new elements to be added to the sequence. May be overridden to
+        provide a friendlier API to clients having domain appropriate
+        parameter names for required attributes.
+        """
+        return 'add_%s' % self._prop_name
+
     @lazyproperty
     def _remove_method_name(self):
         return '_remove_%s' % self._prop_name
@@ -519,31 +544,6 @@ def populate_class_members(self, element_cls, prop_name):
         self._add_public_adder()
         delattr(element_cls, prop_name)
 
-    def _add_public_adder(self):
-        """
-        Add a public ``add_x()`` method to the parent element class.
-        """
-        def add_child(obj):
-            private_add_method = getattr(obj, self._add_method_name)
-            child = private_add_method()
-            return child
-
-        add_child.__doc__ = (
-            'Add a new ``<%s>`` child element unconditionally, inserted in t'
-            'he correct sequence.' % self._nsptagname
-        )
-        self._add_to_class(self._public_add_method_name, add_child)
-
-    @lazyproperty
-    def _public_add_method_name(self):
-        """
-        add_childElement() is public API for a repeating element, allowing
-        new elements to be added to the sequence. May be overridden to
-        provide a friendlier API to clients having domain appropriate
-        parameter names for required attributes.
-        """
-        return 'add_%s' % self._prop_name
-
 
 class ZeroOrMore(_BaseChildElement):
     """
@@ -560,6 +560,7 @@ def populate_class_members(self, element_cls, prop_name):
         self._add_creator()
         self._add_inserter()
         self._add_adder()
+        self._add_public_adder()
         delattr(element_cls, prop_name)
 
 
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
@@ -527,6 +527,15 @@ def it_adds_an_add_method_for_the_child_element(self, add_fixture):
             'Add a new ``<w:zomChild>`` child element '
         )
 
+    def it_adds_a_public_add_method_for_the_child_element(self, add_fixture):
+        parent, expected_xml = add_fixture
+        zomChild = parent.add_zomChild()
+        assert parent.xml == expected_xml
+        assert isinstance(zomChild, CT_ZomChild)
+        assert parent._add_zomChild.__doc__.startswith(
+            'Add a new ``<w:zomChild>`` child element '
+        )
+
     def it_removes_the_property_root_name_used_for_declaration(self):
         assert not hasattr(CT_Parent, 'zomChild')
 
