img: add ImageParts._add_image_part()

Steve Canny · Steve Canny · commit c79684ca7b2d · 2013-12-28T03:01:26.000-08:00
diff --git a/docx/package.py b/docx/package.py
@@ -8,7 +8,7 @@
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.package import OpcPackage
-from docx.parts.image import Image
+from docx.parts.image import Image, ImagePart
 from docx.shared import lazyproperty
 
 
@@ -76,10 +76,12 @@ def get_or_add_image_part(self, image_descriptor):
 
     def _add_image_part(self, image):
         """
-        Return the image part in this collection having a SHA1 hash matching
-        *sha1*, or |None| if not found.
+        Return an |ImagePart| instance newly created from image and appended
+        to the collection.
         """
-        raise NotImplementedError
+        image_part = ImagePart.from_image(image)
+        self.append(image_part)
+        return image_part
 
     def _get_by_sha1(self, sha1):
         """
diff --git a/docx/parts/image.py b/docx/parts/image.py
@@ -72,6 +72,13 @@ def filename(self):
         """
         raise NotImplementedError
 
+    @classmethod
+    def from_image(cls, image):
+        """
+        Return an |ImagePart| instance newly created from *image*.
+        """
+        raise NotImplementedError
+
     @property
     def height(self):
         """
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -36,6 +36,16 @@ def it_can_add_a_new_image_part(self, add_image_part_fixture):
         image_parts._add_image_part.assert_called_once_with(image_)
         assert image_part is image_part_
 
+    def it_can_really_add_a_new_image_part(
+            self, really_add_image_part_fixture):
+        image_parts, image_, ImagePart_, image_part_ = (
+            really_add_image_part_fixture
+        )
+        image_part = image_parts._add_image_part(image_)
+        ImagePart_.from_image.assert_called_once_with(image_)
+        assert image_part in image_parts
+        assert image_part is image_part_
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
@@ -74,6 +84,12 @@ def image_(self, request, sha1):
     def image_descriptor_(self, request):
         return instance_mock(request, str)
 
+    @pytest.fixture
+    def ImagePart_(self, request, image_part_):
+        ImagePart_ = class_mock(request, 'docx.package.ImagePart')
+        ImagePart_.from_image.return_value = image_part_
+        return ImagePart_
+
     @pytest.fixture
     def image_part_(self, request, sha1):
         image_part_ = instance_mock(request, ImagePart)
@@ -84,6 +100,11 @@ def image_part_(self, request, sha1):
     def new_image_part_(self, request):
         return instance_mock(request, ImagePart)
 
+    @pytest.fixture
+    def really_add_image_part_fixture(self, image_, ImagePart_, image_part_):
+        image_parts = ImageParts()
+        return image_parts, image_, ImagePart_, image_part_
+
     @pytest.fixture
     def sha1(self):
         return 'F008AH'
