hdr: add PartFactory loads HeaderPart

Author: scanny

docx/__init__.py

@@ -12,6 +12,7 @@
 from docx.opc.parts.coreprops import CorePropertiesPart
 
 from docx.parts.document import DocumentPart
+from docx.parts.hdrftr import HeaderPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
@@ -27,6 +28,7 @@ def part_class_selector(content_type, reltype):
 PartFactory.part_class_selector = part_class_selector
 PartFactory.part_type_for[CT.OPC_CORE_PROPERTIES] = CorePropertiesPart
 PartFactory.part_type_for[CT.WML_DOCUMENT_MAIN] = DocumentPart
+PartFactory.part_type_for[CT.WML_HEADER] = HeaderPart
 PartFactory.part_type_for[CT.WML_NUMBERING] = NumberingPart
 PartFactory.part_type_for[CT.WML_SETTINGS] = SettingsPart
 PartFactory.part_type_for[CT.WML_STYLES] = StylesPart
@@ -35,6 +37,7 @@ def part_class_selector(content_type, reltype):
     CT,
     CorePropertiesPart,
     DocumentPart,
+    HeaderPart,
     NumberingPart,
     PartFactory,
     SettingsPart,

docx/oxml/__init__.py

@@ -84,12 +84,20 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:numbering',     CT_Numbering)
 register_element_cls('w:startOverride', CT_DecimalNumber)
 
-from .section import CT_HdrFtrRef, CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType  # noqa
-register_element_cls('w:headerReference', CT_HdrFtrRef)
-register_element_cls('w:pgMar', CT_PageMar)
-register_element_cls('w:pgSz', CT_PageSz)
-register_element_cls('w:sectPr', CT_SectPr)
-register_element_cls('w:type', CT_SectType)
+from .section import (  # noqa
+    CT_HdrFtr,
+    CT_HdrFtrRef,
+    CT_PageMar,
+    CT_PageSz,
+    CT_SectPr,
+    CT_SectType,
+)
+register_element_cls("w:hdr", CT_HdrFtr)
+register_element_cls("w:headerReference", CT_HdrFtrRef)
+register_element_cls("w:pgMar", CT_PageMar)
+register_element_cls("w:pgSz", CT_PageSz)
+register_element_cls("w:sectPr", CT_SectPr)
+register_element_cls("w:type", CT_SectType)
 
 from .shape import (  # noqa
     CT_Blip,

docx/oxml/section.py

@@ -17,6 +17,13 @@
 )
 
 
+class CT_HdrFtr(BaseOxmlElement):
+    """`w:hdr` and `w:ftr`, the root element for header and footer part respectively"""
+
+    p = ZeroOrMore('w:p', successors=())
+    tbl = ZeroOrMore('w:tbl', successors=())
+
+
 class CT_HdrFtrRef(BaseOxmlElement):
     """`w:headerReference` and `w:footerReference` elements"""
 

features/hdr-header-footer.feature

@@ -27,7 +27,6 @@ Feature: Header and footer behaviors
       | with no    | True  |
 
 
-  @wip
   Scenario: _Header inherits content
     Given a _Header object with a header definition as header
       And the next _Header object with no header definition as header_2

tests/parts/test_hdrftr.py

@@ -6,7 +6,8 @@
 
 import pytest
 
-from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
+from docx.opc.part import PartFactory
 from docx.package import Package
 from docx.parts.hdrftr import HeaderPart
 
@@ -16,6 +17,20 @@
 
 class DescribeHeaderPart(object):
 
+    def it_is_used_by_loader_to_construct_header_part(
+        self, package_, HeaderPart_load_, header_part_
+    ):
+        partname = "header1.xml"
+        content_type = CT.WML_HEADER
+        reltype = RT.HEADER
+        blob = "<w:hdr/>"
+        HeaderPart_load_.return_value = header_part_
+
+        part = PartFactory(partname, content_type, reltype, blob, package_)
+
+        HeaderPart_load_.assert_called_once_with(partname, content_type, blob, package_)
+        assert part is header_part_
+
     def it_can_create_a_new_header_part(
         self, package_, _default_header_xml_, parse_xml_, _init_
     ):
@@ -48,6 +63,14 @@ def it_loads_default_header_XML_from_a_template_to_help(self):
     def _default_header_xml_(self, request):
         return method_mock(request, HeaderPart, "_default_header_xml", autospec=False)
 
+    @pytest.fixture
+    def HeaderPart_load_(self, request):
+        return method_mock(request, HeaderPart, "load", autospec=False)
+
+    @pytest.fixture
+    def header_part_(self, request):
+        return instance_mock(request, HeaderPart)
+
     @pytest.fixture
     def _init_(self, request):
         return initializer_mock(request, HeaderPart, autospec=True)