add CT_Types.add_default() and .add_override()

Steve Canny · Steve Canny · commit 74c06f9e7cc7 · 2013-08-05T15:08:42.000-07:00
diff --git a/opc/oxml.py b/opc/oxml.py
@@ -180,6 +180,22 @@ class CT_Types(OxmlBaseElement):
     ``<Types>`` element, the container element for Default and Override
     elements in [Content_Types].xml.
     """
+    def add_default(self, ext, content_type):
+        """
+        Add a child ``<Default>`` element with attributes set to parameter
+        values.
+        """
+        default = CT_Default.new(ext, content_type)
+        self.append(default)
+
+    def add_override(self, partname, content_type):
+        """
+        Add a child ``<Override>`` element with attributes set to parameter
+        values.
+        """
+        override = CT_Override.new(partname, content_type)
+        self.append(override)
+
     @property
     def defaults(self):
         try:
diff --git a/tests/test_oxml.py b/tests/test_oxml.py
@@ -74,3 +74,13 @@ def it_can_construct_a_new_types_element(self):
         types = CT_Types.new()
         expected_xml = a_Types().empty().xml
         assert types.xml == expected_xml
+
+    def it_can_build_types_element_incrementally(self):
+        types = CT_Types.new()
+        types.add_default('.xml', 'application/xml')
+        types.add_default('.jpeg', 'image/jpeg')
+        types.add_override('/docProps/core.xml', 'app/vnd.type1')
+        types.add_override('/ppt/presentation.xml', 'app/vnd.type2')
+        types.add_override('/docProps/thumbnail.jpeg', 'image/jpeg')
+        expected_types_xml = a_Types().xml
+        assert types.xml == expected_types_xml
diff --git a/tests/unitdata.py b/tests/unitdata.py
@@ -50,6 +50,11 @@ def with_extension(self, extension):
         self._extension = extension
         return self
 
+    def without_namespace(self):
+        """Don't include an 'xmlns=' attribute"""
+        self._namespace = ''
+        return self
+
     @property
     def xml(self):
         """Return Default element"""
@@ -81,6 +86,11 @@ def with_partname(self, partname):
         self._partname = partname
         return self
 
+    def without_namespace(self):
+        """Don't include an 'xmlns=' attribute"""
+        self._namespace = ''
+        return self
+
     @property
     def xml(self):
         """Return Override element"""
@@ -152,11 +162,13 @@ def xml(self):
             xml += (a_Default().with_extension(extension)
                                .with_content_type(content_type)
                                .with_indent(2)
+                               .without_namespace()
                                .xml)
         for partname, content_type in self._overrides:
             xml += (an_Override().with_partname(partname)
                                  .with_content_type(content_type)
                                  .with_indent(2)
+                                 .without_namespace()
                                  .xml)
         xml += '</Types>\n'
         return xml
