oxml: add CT_R.new()

Steve Canny · Steve Canny · commit ba9e945f4f9e · 2013-12-20T20:10:44.000-08:00
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
@@ -14,7 +14,7 @@
 
 from docx.oxml.base import register_custom_element_class
 from docx.oxml.parts import CT_Body
-from docx.oxml.text import CT_P
+from docx.oxml.text import CT_P, CT_R
 
 
 # ===========================================================================
@@ -23,3 +23,4 @@
 
 register_custom_element_class('w:body',     CT_Body)
 register_custom_element_class('w:p',        CT_P)
+register_custom_element_class('w:r',        CT_R)
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -32,3 +32,16 @@ def new():
         xml = '<w:p %s/>' % nsdecls('w')
         p = oxml_fromstring(xml)
         return p
+
+
+class CT_R(OxmlBaseElement):
+    """
+    ``<w:r>`` element, containing the properties and text for a run.
+    """
+    @staticmethod
+    def new():
+        """
+        Return a new ``<w:r>`` element.
+        """
+        xml = '<w:r %s/>' % nsdecls('w')
+        return oxml_fromstring(xml)
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -9,9 +9,9 @@
 
 """Test suite for the docx.oxml.text module."""
 
-from docx.oxml.text import CT_P
+from docx.oxml.text import CT_P, CT_R
 
-from ..unitdata import a_p
+from ..unitdata import a_p, an_r
 
 
 class DescribeCT_P(object):
@@ -20,3 +20,10 @@ def it_can_construct_a_new_p_element(self):
         p = CT_P.new()
         expected_xml = a_p().with_nsdecls().xml
         assert p.xml == expected_xml
+
+
+class DescribeCT_R(object):
+
+    def it_can_construct_a_new_r_element(self):
+        r = CT_R.new()
+        assert r.xml == an_r().with_nsdecls().xml
diff --git a/tests/unitdata.py b/tests/unitdata.py
@@ -101,6 +101,22 @@ def xml(self):
         return xml
 
 
+class CT_RBuilder(BaseBuilder):
+    """
+    Test data builder for a CT_R (<w:r>) XML element that appears within the
+    body element of a document.xml file.
+    """
+    def __init__(self):
+        """Establish instance variables with default values"""
+        super(CT_RBuilder, self).__init__()
+
+    @property
+    def xml(self):
+        """Return element XML based on attribute settings"""
+        indent = ' ' * self._indent
+        return '%s<w:r%s/>\n' % (indent, self._nsdecls)
+
+
 class CT_SectPrBuilder(BaseBuilder):
     """
     Test data builder for a CT_SectPr (<w:sectPr>) XML element that appears
@@ -131,3 +147,8 @@ def a_p():
 def a_sectPr():
     """Return a CT_SectPr instance"""
     return CT_SectPrBuilder()
+
+
+def an_r():
+    """Return a CT_RBuilder instance"""
+    return CT_RBuilder()
