Merge pull request #17 from renanvieira/fix/dict_classes_names

Fix type name inside mapper dict to avoid collision

Author: marazt

mapper/object_mapper.py

@@ -2,10 +2,12 @@
 """
 Copyright (C) 2015, marazt. All rights reserved.
 """
-from mapper.object_mapper_exception import ObjectMapperException
-from mapper.casedict import CaseDict
 from inspect import getmembers, isroutine
 
+from mapper.casedict import CaseDict
+from mapper.object_mapper_exception import ObjectMapperException
+
+
 class ObjectMapper(object):
     """
     Base class for mapping class attributes from one class to another one
@@ -91,16 +93,18 @@ def create_map(self, type_from, type_to, mapping=None):
 
         :return: None
         """
-        key_from = type_from.__name__
-        key_to = type_to.__name__
+        key_from = type_from
+        key_to = type_to
 
         if mapping is None:
             mapping = {}
 
         if key_from in self.mappings:
             inner_map = self.mappings[key_from]
             if key_to in inner_map:
-                raise ObjectMapperException("Mapping for {0} -> {1} already exists".format(key_from, key_to))
+                raise ObjectMapperException(
+                    "Mapping for {0}.{1} -> {2}.{3} already exists".format(key_from.__module__, key_from.__name__,
+                                                                   key_to.__module__, key_to.__name__))
             else:
                 inner_map[key_to] = mapping
         else:
@@ -125,8 +129,8 @@ def map(self, from_obj, to_type, ignore_case=False, allow_none=False, excluded=N
             from_obj.__dict__
 
         inst = to_type()
-        key_from = from_obj.__class__.__name__
-        key_to = to_type.__name__
+        key_from = from_obj.__class__
+        key_to = to_type
 
         def not_private(s):
             return not s.startswith('_')
@@ -169,6 +173,8 @@ def not_excluded(s):
                         setattr(inst, prop, from_props[prop])
                         # case when target attribute is not mapped (can be extended)
             else:
-                raise ObjectMapperException("No mapping defined for {0} -> {1}".format(key_from, key_to))
+                raise ObjectMapperException(
+                    "No mapping defined for {0}.{1} -> {2}.{3}".format(key_from.__module__, key_from.__name__,
+                                                                       key_to.__module__, key_to.__name__))
 
         return inst

tests/object_mapper_test.py

@@ -3,14 +3,18 @@
 Copyright (C) 2015, marazt. All rights reserved.
 """
 import unittest
-
 from datetime import datetime
+
 from mapper.object_mapper import ObjectMapper
 from mapper.object_mapper_exception import ObjectMapperException
 
+NO_MAPPING_FOUND_EXCEPTION_MESSAGE = "No mapping defined for {0}.{1} -> {2}.{3}"
+MAPPING_ALREADY_EXISTS_EXCEPTION_MESSAGE = "Mapping for {0}.{1} -> {2}.{3} already exists"
+
 
 class ToTestClass(object):
     """ To Test Class """
+
     def __init__(self):
         self.name = ""
         self.date = ""
@@ -19,19 +23,22 @@ def __init__(self):
 
 class ToTestClassTwo(object):
     """ To Test Class Two """
+
     def __init__(self):
         self.all = ""
         pass
 
 
 class ToTestClassEmpty(object):
     """ To Test Class Empty """
+
     def __init__(self):
         pass
 
 
 class FromTestClass(object):
     """ From Test Class """
+
     def __init__(self):
         self.name = "Igor"
         self.surname = "Hnizdo"
@@ -102,7 +109,8 @@ def test_mapping_creation_duplicate_mapping(self):
 
         # Arrange
         exc = False
-        msg = "Mapping for FromTestClass -> ToTestClass already exists"
+        msg = MAPPING_ALREADY_EXISTS_EXCEPTION_MESSAGE.format(FromTestClass.__module__, FromTestClass.__name__,
+                                                              ToTestClass.__module__, ToTestClass.__name__)
         mapper = ObjectMapper()
 
         mapper.create_map(FromTestClass, ToTestClass)
@@ -186,9 +194,9 @@ def test_mapping_creation_no_mapping_defined(self):
 
         # Arrange
         exc = False
-        msg = "No mapping defined for FromTestClass -> ToTestClass"
         from_class = FromTestClass()
-
+        msg = NO_MAPPING_FOUND_EXCEPTION_MESSAGE.format(from_class.__module__, from_class.__class__.__name__,
+                                                        ToTestClass.__module__, ToTestClass.__name__)
         mapper = ObjectMapper()
 
         # Act
@@ -225,11 +233,13 @@ def test_mapping_with_case_insensitivity(self):
         # Arrange
         class ToTestClass2(object):
             """ To Test Class 2 """
+
             def __init__(self):
                 self.name = ""
 
         class FromTestClass2(object):
             """ From Test Class 2 """
+
             def __init__(self):
                 self.Name = "Name"
 
@@ -267,6 +277,7 @@ def test_mapping_creation_with_custom_dir(self):
 
         # Arrange
         _propNames = ['name', 'date']
+
         class ToCustomDirClass(object):
             def __dir__(self):
                 props = list(self.__dict__.keys())
@@ -304,16 +315,16 @@ def __setattr__(self, name, value):
 
     def test_mapping_excluded_field(self):
         """Test mapping with excluded fields"""
-        #Arrange
+        # Arrange
         from_class = FromTestClass()
         mapper = ObjectMapper()
         mapper.create_map(FromTestClass, ToTestClass)
 
-        #Act
+        # Act
         result = mapper.map(FromTestClass(), ToTestClass, excluded=['date'])
 
-        #Assert
-        print(result)      
+        # Assert
+        print(result)
         self.assertTrue(isinstance(result, ToTestClass), "Type must be ToTestClass")
         self.assertEqual(result.name, from_class.name, "Name mapping must be equal")
         self.assertEqual(result.date, '', "Date mapping must be equal")