PyPDFForm 1.5.2__tar.gz → 1.5.4__tar.gz

{pypdfform-1.5.2 → pypdfform-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyPDFForm
-Version: 1.5.2
+Version: 1.5.4
 Summary: The Python library for PDF forms.
 Home-page: https://github.com/chinapandaman/PyPDFForm
 Author: Jinge Li

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Contains any object users might need."""
 
-__version__ = "1.5.2"
+__version__ = "1.5.4"
 
 from .wrapper import FormWrapper, PdfWrapper
 

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/coordinate.py

@@ -40,6 +40,9 @@ def get_draw_checkbox_radio_coordinates(
 
 def get_draw_image_coordinates_resolutions(
     widget: dict,
+    preserve_aspect_ratio: bool,
+    image_width: float,
+    image_height: float,
 ) -> Tuple[float, float, float, float]:
     """
     Returns coordinates and resolutions to draw image at given a PDF form signature/image widget.
@@ -50,6 +53,18 @@ def get_draw_image_coordinates_resolutions(
     width = abs(float(widget[Rect][0]) - float(widget[Rect][2]))
     height = abs(float(widget[Rect][1]) - float(widget[Rect][3]))
 
+    if preserve_aspect_ratio:
+        ratio = max(image_width / width, image_height / height)
+
+        new_width = image_width / ratio
+        new_height = image_height / ratio
+
+        x += abs(new_width - width) / 2
+        y += abs(new_height - height) / 2
+
+        width = new_width
+        height = new_height
+
     return x, y, width, height
 
 

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/filler.py

@@ -13,7 +13,7 @@ from .coordinate import (get_draw_checkbox_radio_coordinates,
                          get_draw_text_coordinates,
                          get_text_line_x_coordinates)
 from .font import checkbox_radio_font_size
-from .image import any_image_to_jpg
+from .image import any_image_to_jpg, get_image_dimensions
 from .middleware.checkbox import Checkbox
 from .middleware.dropdown import Dropdown
 from .middleware.image import Image
@@ -62,7 +62,10 @@ def signature_image_handler(
     if stream is not None:
         any_image_to_draw = True
         stream = any_image_to_jpg(stream)
-        x, y, width, height = get_draw_image_coordinates_resolutions(widget)
+        image_width, image_height = get_image_dimensions(stream)
+        x, y, width, height = get_draw_image_coordinates_resolutions(
+            widget, middleware.preserve_aspect_ratio, image_width, image_height
+        )
         images_to_draw.append(
             [
                 stream,

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/image.py

@@ -2,7 +2,7 @@
 """Contains helpers for image."""
 
 from io import BytesIO
-from typing import Union
+from typing import Tuple, Union
 
 from PIL import Image
 
@@ -28,6 +28,18 @@ def rotate_image(image_stream: bytes, rotation: Union[float, int]) -> bytes:
     return result
 
 
+def get_image_dimensions(image_stream: bytes) -> Tuple[float, float]:
+    """Gets the width and height of an image."""
+
+    buff = BytesIO()
+    buff.write(image_stream)
+    buff.seek(0)
+
+    image = Image.open(buff)
+
+    return image.size
+
+
 def any_image_to_jpg(image_stream: bytes) -> bytes:
     """Converts an image of any type to jpg."""
 

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/middleware/image.py

@@ -6,3 +6,5 @@ from .signature import Signature
 
 class Image(Signature):
     """A class to represent an image field widget."""
+
+    preserve_aspect_ratio = False

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/middleware/radio.py

@@ -7,16 +7,7 @@ from .checkbox import Checkbox
 class Radio(Checkbox):
     """A class to represent a radiobutton widget."""
 
-    def __init__(
-        self,
-        name: str,
-        value: int = None,
-    ) -> None:
-        """Constructs all attributes for the radiobutton."""
-
-        super().__init__(name, value)
-
-        self.number_of_options = 0
+    number_of_options = 0
 
     @property
     def schema_definition(self) -> dict:

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/middleware/signature.py

@@ -11,6 +11,8 @@ from .base import Widget
 class Signature(Widget):
     """A class to represent a signature field widget."""
 
+    preserve_aspect_ratio = True
+
     def __init__(
         self,
         name: str,

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm/wrapper.py

@@ -166,10 +166,13 @@ class PdfWrapper(FormWrapper):
         if not other.stream:
             return self
 
-        new_obj = self.__class__()
-        new_obj.stream = merge_two_pdfs(self.stream, other.stream)
+        for k in self.widgets:
+            if k in other.widgets:
+                other.update_widget_key(k, f"{k}-{id(other)}", defer=True)
 
-        return new_obj
+        other.commit_widget_key_updates()
+
+        return self.__class__(merge_two_pdfs(self.stream, other.stream))
 
     @property
     def preview(self) -> bytes:

{pypdfform-1.5.2 → pypdfform-1.5.4}/PyPDFForm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyPDFForm
-Version: 1.5.2
+Version: 1.5.4
 Summary: The Python library for PDF forms.
 Home-page: https://github.com/chinapandaman/PyPDFForm
 Author: Jinge Li

{pypdfform-1.5.2 → pypdfform-1.5.4}/tests/test_functional_simple.py

@@ -2,7 +2,9 @@
 
 import os
 
-from PyPDFForm import FormWrapper
+from PyPDFForm import FormWrapper, PdfWrapper
+from PyPDFForm.constants import T, V
+from PyPDFForm.template import get_widgets_by_page
 
 
 def test_fill(template_stream, pdf_samples, data_dict, request):
@@ -151,3 +153,30 @@ def test_undo_checkbox(pdf_samples, request):
 
         assert len(obj.stream) == len(expected)
         assert obj.stream == expected
+
+
+def test_add_object_id(template_stream):
+    result = PdfWrapper()
+    ids = []
+
+    for i in range(5):
+        obj = PdfWrapper(
+            FormWrapper(template_stream).fill({"test": f"value-{i}"}).read()
+        )
+        result += obj
+        ids.append(id(obj))
+
+    merged = PdfWrapper(result.read())
+
+    for each in ids[1:]:
+        assert f"test-{each}" in merged.widgets
+
+    for page, widgets in get_widgets_by_page(result.read()).items():
+        for widget in widgets:
+            assert widget[T] in merged.widgets
+            if widget[T] == "test":
+                assert widget[V] == "value-0"
+            elif V in widget and "value-" in widget[V]:
+                assert widget[V] == f"value-{page // 3}"
+                assert widget[T].split("-")[0] == "test"
+                assert int(widget[T].split("-")[1]) in ids[1:]

pypdfform-1.5.4/tests/test_signature.py

@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+from PyPDFForm import PdfWrapper
+
+
+def test_fill_signature(pdf_samples, image_samples, request):
+    expected_path = os.path.join(pdf_samples, "signature", "test_fill_signature.pdf")
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(
+            os.path.join(pdf_samples, "signature", "sample_template_with_signature.pdf")
+        ).fill({"signature": os.path.join(image_samples, "sample_signature.png")})
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        if os.name != "nt":
+            assert len(obj.read()) == len(expected)
+            assert obj.read() == expected
+
+
+def test_signature_schema(pdf_samples):
+    obj = PdfWrapper(
+        os.path.join(pdf_samples, "signature", "sample_template_with_signature.pdf")
+    )
+
+    assert obj.widgets["signature"].schema_definition == {"type": "string"}
+
+
+def test_signature_sample_value(pdf_samples):
+    obj = PdfWrapper(
+        os.path.join(pdf_samples, "signature", "sample_template_with_signature.pdf")
+    )
+
+    assert obj.widgets["signature"].sample_value == os.path.expanduser(
+        "~/Downloads/sample_image.jpg"
+    )
+
+
+def test_fill_signature_overlap(pdf_samples, image_samples, request):
+    expected_path = os.path.join(
+        pdf_samples, "signature", "test_fill_signature_overlap.pdf"
+    )
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(
+            os.path.join(
+                pdf_samples, "signature", "sample_template_with_signature_overlap.pdf"
+            )
+        ).fill({"signature": os.path.join(image_samples, "sample_signature.png")})
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        if os.name != "nt":
+            assert len(obj.read()) == len(expected)
+            assert obj.read() == expected
+
+
+def test_fill_signature_overlap_not_preserve_aspect_ratio(
+    pdf_samples, image_samples, request
+):
+    expected_path = os.path.join(
+        pdf_samples,
+        "signature",
+        "test_fill_signature_overlap_not_preserve_aspect_ratio.pdf",
+    )
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(
+            os.path.join(
+                pdf_samples, "signature", "sample_template_with_signature_overlap.pdf"
+            )
+        )
+        obj.widgets["signature"].preserve_aspect_ratio = False
+        obj.fill({"signature": os.path.join(image_samples, "sample_signature.png")})
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        if os.name != "nt":
+            assert len(obj.read()) == len(expected)
+            assert obj.read() == expected
+
+
+def test_fill_small_icon(pdf_samples, image_samples, request):
+    expected_path = os.path.join(pdf_samples, "signature", "test_fill_small_icon.pdf")
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(
+            os.path.join(
+                pdf_samples, "signature", "sample_template_with_signature_overlap.pdf"
+            )
+        )
+        obj.fill({"signature": os.path.join(image_samples, "small_icon.png")})
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        if os.name != "nt":
+            assert len(obj.read()) == len(expected)
+            assert obj.read() == expected
+
+
+def test_fill_small_icon_not_preserve_aspect_ratio(pdf_samples, image_samples, request):
+    expected_path = os.path.join(
+        pdf_samples, "signature", "test_fill_small_icon_not_preserve_aspect_ratio.pdf"
+    )
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(
+            os.path.join(
+                pdf_samples, "signature", "sample_template_with_signature_overlap.pdf"
+            )
+        )
+        obj.widgets["signature"].preserve_aspect_ratio = False
+        obj.fill({"signature": os.path.join(image_samples, "small_icon.png")})
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        if os.name != "nt":
+            assert len(obj.read()) == len(expected)
+            assert obj.read() == expected
+
+
+def test_fill_vertical_image(pdf_samples, image_samples, request):
+    expected_path = os.path.join(
+        pdf_samples, "signature", "test_fill_vertical_image.pdf"
+    )
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(
+            os.path.join(
+                pdf_samples, "signature", "sample_template_with_signature_overlap.pdf"
+            )
+        )
+        obj.fill({"signature": os.path.join(image_samples, "vertical_image.jpg")})
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        if os.name != "nt":
+            assert len(obj.read()) == len(expected)
+            assert obj.read() == expected
+
+
+def test_fill_vertical_image_not_preserve_aspect_ratio(
+    pdf_samples, image_samples, request
+):
+    expected_path = os.path.join(
+        pdf_samples,
+        "signature",
+        "test_fill_vertical_image_not_preserve_aspect_ratio.pdf",
+    )
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(
+            os.path.join(
+                pdf_samples, "signature", "sample_template_with_signature_overlap.pdf"
+            )
+        )
+        obj.widgets["signature"].preserve_aspect_ratio = False
+        obj.fill({"signature": os.path.join(image_samples, "vertical_image.jpg")})
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        if os.name != "nt":
+            assert len(obj.read()) == len(expected)
+            assert obj.read() == expected

pypdfform-1.5.2/tests/test_signature.py

@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-
-from PyPDFForm import PdfWrapper
-
-
-def test_fill_signature(pdf_samples, image_samples, request):
-    expected_path = os.path.join(pdf_samples, "signature", "test_fill_signature.pdf")
-    with open(expected_path, "rb+") as f:
-        obj = PdfWrapper(
-            os.path.join(pdf_samples, "signature", "sample_template_with_signature.pdf")
-        ).fill({"signature": os.path.join(image_samples, "sample_signature.png")})
-
-        request.config.results["expected_path"] = expected_path
-        request.config.results["stream"] = obj.read()
-
-        expected = f.read()
-
-        if os.name != "nt":
-            assert len(obj.read()) == len(expected)
-            assert obj.read() == expected
-
-
-def test_signature_schema(pdf_samples):
-    obj = PdfWrapper(
-        os.path.join(pdf_samples, "signature", "sample_template_with_signature.pdf")
-    )
-
-    assert obj.widgets["signature"].schema_definition == {"type": "string"}
-
-
-def test_signature_sample_value(pdf_samples):
-    obj = PdfWrapper(
-        os.path.join(pdf_samples, "signature", "sample_template_with_signature.pdf")
-    )
-
-    assert obj.widgets["signature"].sample_value == os.path.expanduser(
-        "~/Downloads/sample_image.jpg"
-    )
-
-
-def test_fill_signature_overlap(pdf_samples, image_samples, request):
-    expected_path = os.path.join(
-        pdf_samples, "signature", "test_fill_signature_overlap.pdf"
-    )
-    with open(expected_path, "rb+") as f:
-        obj = PdfWrapper(
-            os.path.join(
-                pdf_samples, "signature", "sample_template_with_signature_overlap.pdf"
-            )
-        ).fill({"signature": os.path.join(image_samples, "sample_signature.png")})
-
-        request.config.results["expected_path"] = expected_path
-        request.config.results["stream"] = obj.read()
-
-        expected = f.read()
-
-        if os.name != "nt":
-            assert len(obj.read()) == len(expected)
-            assert obj.read() == expected