Fixing issue 25

Author: anikolaienko

automapper/utils.py

@@ -1,3 +1,4 @@
+import collections
 from enum import Enum
 from typing import Any
 
@@ -6,7 +7,7 @@
 
 def is_sequence(obj: Any) -> bool:
     """Check if object implements `__iter__` method"""
-    return hasattr(obj, "__iter__")
+    return isinstance(obj, collections.Sequence)
 
 
 def is_subscriptable(obj: Any) -> bool:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "py-automapper"
-version = "2.0.0"
+version = "2.1.0"
 description = "Library for automatically mapping one object to another"
 authors = [
   {name = "Andrii Nikolaienko", email = "[email protected]"}

tests/test_issue_25.py

@@ -0,0 +1,39 @@
+from typing import Optional
+
+from automapper import mapper
+from pydantic import BaseModel
+
+
+class Address(BaseModel):
+    street: Optional[str]
+    number: Optional[int]
+    zip_code: Optional[int]
+    city: Optional[str]
+
+
+class PersonInfo(BaseModel):
+    name: Optional[str] = None
+    age: Optional[int] = None
+    address: Optional[Address] = None
+
+
+class PublicPersonInfo(BaseModel):
+    name: Optional[str] = None
+    address: Optional[Address] = None
+
+
+def test_map__without_deepcopy_mapped_objects_should_be_the_same():
+    address = Address(street="Main Street", number=1, zip_code=100001, city="Test City")
+    info = PersonInfo(name="John Doe", age=35, address=address)
+
+    # default deepcopy behavior
+    public_info = mapper.to(PublicPersonInfo).map(info)
+    assert (
+        public_info.address is not address
+    ), "Address mapped object is same as origin."
+
+    # disable deepcopy
+    public_info = mapper.to(PublicPersonInfo).map(info, use_deepcopy=False)
+    assert (
+        public_info.address is info.address
+    ), "Address mapped object is not same as origin."

tests/test_try_get_field_values.py

@@ -0,0 +1,40 @@
+from dataclasses import dataclass
+
+from automapper.mapper import _try_get_field_value
+
+
+@dataclass
+class TestClass:
+    map_field: str
+
+
+def test_try_get_field_value__if_in_custom_mapping():
+    is_found, mapped_value = _try_get_field_value("field1", None, {"field1": 123})
+
+    assert is_found
+    assert mapped_value == 123
+
+
+def test_try_get_field_value__if_origin_has_same_field_attr():
+    is_found, mapped_value = _try_get_field_value(
+        "map_field", TestClass("Hello world"), None
+    )
+
+    assert is_found
+    assert mapped_value == "Hello world"
+
+
+def test_try_get_field_value__if_origin_contains_same_field_as_item():
+    is_found, mapped_value = _try_get_field_value(
+        "map_field", {"map_field": "Hello world. Again"}, None
+    )
+
+    assert is_found
+    assert mapped_value == "Hello world. Again"
+
+
+def test_try_get_field_value__if_field_not_found():
+    is_found, mapped_value = _try_get_field_value("field1", None, None)
+
+    assert not is_found
+    assert mapped_value is None