add Unmarshaller.unmarshal()

Steve Canny · Steve Canny · commit b8edb94ce2fc · 2013-08-05T14:56:07.000-07:00
diff --git a/opc/package.py b/opc/package.py
@@ -51,3 +51,23 @@ def unmarshal(pkg_reader, pkg, part_factory):
         contents of *pkg_reader*, delegating construction of each part to
         *part_factory*. Package relationships are added to *pkg*.
         """
+        parts = Unmarshaller._unmarshal_parts(pkg_reader, part_factory)
+        Unmarshaller._unmarshal_relationships(pkg_reader, pkg, parts)
+        for part in parts.values():
+            part._after_unmarshal()
+
+    @staticmethod
+    def _unmarshal_parts(pkg_reader, part_factory):
+        """
+        Return a dictionary of |Part| instances unmarshalled from
+        *pkg_reader*, keyed by partname. Side-effect is that each part in
+        *pkg_reader* is constructed using *part_factory*.
+        """
+
+    @staticmethod
+    def _unmarshal_relationships(pkg_reader, pkg, parts):
+        """
+        Add a relationship to the source object corresponding to each of the
+        relationships in *pkg_reader* with its target_part set to the actual
+        target part in *parts*.
+        """
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -13,9 +13,9 @@
 
 from mock import Mock
 
-from opc.package import OpcPackage
+from opc.package import OpcPackage, Unmarshaller
 
-from .unitutil import class_mock
+from .unitutil import class_mock, method_mock
 
 
 class DescribeOpcPackage(object):
@@ -44,3 +44,31 @@ def it_can_open_a_pkg_file(self, PackageReader_, PartFactory_,
         Unmarshaller_.unmarshal.assert_called_once_with(pkg_reader, pkg,
                                                         PartFactory_)
         assert isinstance(pkg, OpcPackage)
+
+
+class DescribeUnmarshaller(object):
+
+    @pytest.fixture
+    def _unmarshal_parts(self, request):
+        return method_mock(Unmarshaller, '_unmarshal_parts', request)
+
+    @pytest.fixture
+    def _unmarshal_relationships(self, request):
+        return method_mock(Unmarshaller, '_unmarshal_relationships', request)
+
+    def it_can_unmarshal_from_a_pkg_reader(self, _unmarshal_parts,
+                                           _unmarshal_relationships):
+        # mockery ----------------------
+        pkg = Mock(name='pkg')
+        pkg_reader = Mock(name='pkg_reader')
+        part_factory = Mock(name='part_factory')
+        parts = {1: Mock(name='part_1'), 2: Mock(name='part_2')}
+        _unmarshal_parts.return_value = parts
+        # exercise ---------------------
+        Unmarshaller.unmarshal(pkg_reader, pkg, part_factory)
+        # verify -----------------------
+        _unmarshal_parts.assert_called_once_with(pkg_reader, part_factory)
+        _unmarshal_relationships.assert_called_once_with(pkg_reader, pkg,
+                                                         parts)
+        for part in parts.values():
+            part._after_unmarshal.assert_called_once_with()
