merge recent changes from upstream branch

Author: direbearform

.travis.yml

@@ -0,0 +1,18 @@
+language: python            # this works for Linux but is an error on macOS or Windows
+matrix:
+  include:
+    - name: "Python 3.7.1 on Xenial Linux"
+      python: 3.7           # this works for Linux but is ignored on macOS or Windows
+      dist: xenial          # required for Python >= 3.7
+      script: bash run_tests.sh
+    - name: "Python 3.7.3 on Windows "
+      os: windows           # Windows 10.0.17134 N/A Build 17134
+      language: shell       # 'language: python' is an error on Travis CI Windows
+      before_install:
+        - choco install python3
+        - pip install virtualenv
+        - virtualenv $HOME/venv
+        - source $HOME/venv/Scripts/activate
+        - pip install -r requirements.txt
+      env: PATH=/c/Python37:/c/Python37/Scripts:$PATH
+      script: nose2 tests --plugin nose2.plugins.junitxml --config myconfig.cfg

CHANGES.txt

@@ -1,3 +1,6 @@
+1.0.7 - 2019/06/19
+* Fix type name inside mapper dict to avoid collision, thanks [@renanvieira](https://github.com/renanvieira)
+
 1.0.6 - 2018/10/28
 * Added ability to specify excluded fields, thanks [@uralov](https://github.com/uralov)
 

README.md

@@ -15,19 +15,24 @@ marazt
 The MIT License (MIT)
 
 **Last updated**
-10 June 2019
+13 July 2019
 
 **Package Download**
 https://pypi.python.org/pypi/object-mapper
 
----
+**Build Status**
+[![Build Status](https://travis-ci.com/marazt/object-mapper.svg?branch=master)](https://travis-ci.com/marazt/object-mapper)
 
 ## Versions
 
-**1.1.0 - 2019/06/10**
+**1.1.0 - 2019/07/13**
 
 - Add basic support for nested object, thanks [@direbearform](https://github.com/direbearform)
 
+**1.0.7 - 2019/06/19**
+
+* Fix type name inside mapper dict to avoid collision, thanks [@renanvieira](https://github.com/renanvieira)
+
 **1.0.6 - 2018/10/28**
 
 - Added ability to specify excluded fields, thanks [@uralov](https://github.com/uralov)

README.rst

@@ -1,21 +1,32 @@
 Object Mapper
 =============
 
-**Version** 1.0.6
+**Version** 1.1.0
 
 **Author** marazt
 
 **Copyright** marazt
 
 **License** The MIT License (MIT)
 
-**Last updated** 28 October 2018
+**Last updated** 13 July 2019
+
 
 **Package Download** https://pypi.python.org/pypi/object-mapper ---
 
+---
+
 Versions
 --------
 
+**1.1.0 - 2019/07/13**
+
+- Add basic support for nested object, thanks [@direbearform](https://github.com/direbearform)
+
+**1.0.7 - 2019/06/19**
+
+- Fix type name inside mapper dict to avoid collision, thanks [@renanvieira](https://github.com/renanvieira)
+
 **1.0.6 - 2018/10/28**
 
 - Added ability to specify excluded fields, thanks [@uralov](https://github.com/uralov)

mapper/object_mapper.py

@@ -2,11 +2,13 @@
 """
 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 datetime import date, datetime
 
+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
@@ -108,13 +110,15 @@ def create_map(self, type_from, type_to, mapping=None):
         if (mapping is not None and not isinstance(mapping, dict)):
             raise ObjectMapperException("mapping, if provided, must be a Dict type")
 
-        key_from = "{0}.{1}".format(type_from.__module__, type_from.__name__)
-        key_to = "{0}.{1}".format(type_to.__module__, type_to.__name__)
+        key_from = type_from
+        key_to = type_to
 
         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] = (type_to, mapping)
         else:
@@ -142,33 +146,30 @@ def map(self, from_obj, to_type=type(None), ignore_case=False, allow_none=False,
             # one of the tests is explicitly checking for an attribute error on __dict__ if it's not set
             from_obj.__dict__
 
-        key_from = "{0}.{1}".format(from_obj.__class__.__module__, from_obj.__class__.__name__)
+        key_from = from_obj.__class__
 
         if key_from not in self.mappings:
-            raise ObjectMapperException("No mapping defined for {0}".format(key_from))
+            raise ObjectMapperException("No mapping defined for {0}.{1}"
+                .format(key_from.__module__, key_from.__name__))
 
-        custom_mappings = None
-        key_to_cls = type(None)
-        
         if to_type is None or to_type is type(None):
             # automatically infer to to_type
             # if this is a nested call and we do not currently support more than one to_types
             assert(len(self.mappings[key_from]) > 0)
             if len(self.mappings[key_from]) > 1:
-                raise ObjectMapperException("Ambiguous type mapping exists for {0}, must specifiy to_type explicitly".format(key_from))
-            the_only_key_to = next(iter(self.mappings[key_from]))
-            key_to_cls = self.mappings[key_from][the_only_key_to][0]
-            custom_mappings = self.mappings[key_from][the_only_key_to][1]
+                raise ObjectMapperException("Ambiguous type mapping exists for {0}.{1}, must specifiy to_type explicitly"
+                    .format(key_from.__module__, key_from.__name__))
+            key_to = next(iter(self.mappings[key_from]))
         else:
-            key_to = "{0}.{1}".format(to_type.__module__, to_type.__name__)
-            if key_to not in self.mappings[key_from]:
-                raise ObjectMapperException("No mapping defined for {0} to {1}".format(key_from, key_to))
-            key_to_cls = self.mappings[key_from][key_to][0]
-            custom_mappings = self.mappings[key_from][key_to][1]
+            if to_type not in self.mappings[key_from]:
+                raise ObjectMapperException("No mapping defined for {0}.{1} -> {2}.{3}"
+                .format(key_from.__module__, key_from.__name__, to_type.__module__, to_type.__name__))
+            key_to = to_type
+        custom_mappings = self.mappings[key_from][key_to][1]
 
         # Currently, all target class data members need to have default value
         # Object with __init__ that carries required non-default arguments are not supported
-        inst = key_to_cls()
+        inst = key_to()
 
         def not_private(s):
             return not s.startswith('_')
@@ -194,20 +195,20 @@ def is_included(s, mapping):
 
         def map_obj(o, allow_unmapped):
             if o is not None:
-                key_from_child_cls = o.__class__
-                key_from_child = "{0}.{1}".format(key_from_child_cls.__module__, key_from_child_cls.__name__)
+                key_from_child = o.__class__
                 if (key_from_child in self.mappings):
                     # if key_to has a mapping defined, nests the map() call
                     return self.map(o, type(None), ignore_case, allow_none, excluded, included, allow_unmapped)
-                elif (key_from_child_cls in ObjectMapper.primitive_types):
+                elif (key_from_child in ObjectMapper.primitive_types):
                     # allow primitive types without mapping
                     return o
                 else:
                     # fail complex type conversion if mapping was not defined, unless explicitly allowed
                     if allow_unmapped:
                         return o
                     else:
-                        raise ObjectMapperException("No mapping defined for {0}".format(key_from_child))
+                        raise ObjectMapperException("No mapping defined for {0}.{1}"
+                            .format(key_from_child.__module__, key_from_child.__name__))
             else:
                 return None
 

myconfig.cfg

@@ -0,0 +1,3 @@
+[junit-xml]
+always-on = True
+path = TEST-results.xml

requirements.txt

@@ -1,2 +1 @@
-datetime
-nose
+nose2==0.9.1

run_tests.bat

@@ -1,4 +1,4 @@
 REM prerequisites: pip, virtualenv in path
 virtualenv venv
 cd venv/Scripts/
-activate.bat & cd ../.. & pip install -r requirements.txt & nosetests tests --with-xunit --xunit-file=TEST-results.xml
+activate.bat & cd ../.. & pip install -r requirements.txt & nose2 tests --plugin nose2.plugins.junitxml --config myconfig.cfg

run_tests.sh

@@ -1,6 +1,7 @@
 #!bin/bash
 # prerequisites: pip, virtualenv in path
+pip install virtualenv
 virtualenv venv
 source venv/bin/activate
 pip install -r requirements.txt
-nosetests tests --with-xunit --xunit-file=TEST-results.xml
+nose2 tests --plugin nose2.plugins.junitxml --config myconfig.cfg

tests/object_mapper_test.py renamed to tests/test_object_mapper.py

@@ -3,14 +3,19 @@
 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}"
+NO_MAPPING_PAIR_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 = ""
@@ -20,19 +25,15 @@ 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 ToTestClassEmpty(object):
-    """ To Test Class Empty """
     def __init__(self):
         pass
 
@@ -56,6 +57,7 @@ def __init__(self):
 
 class FromTestClass(object):
     """ From Test Class """
+
     def __init__(self):
         self.name = "Igor"
         self.surname = "Hnizdo"
@@ -147,7 +149,8 @@ def test_mapping_creation_duplicate_mapping(self):
 
         # Arrange
         exc = False
-        msg = "Mapping for tests.object_mapper_test.FromTestClass -> tests.object_mapper_test.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)
@@ -231,9 +234,8 @@ def test_mapping_creation_no_mapping_defined(self):
 
         # Arrange
         exc = False
-        msg = "No mapping defined for tests.object_mapper_test.FromTestClass"
         from_class = FromTestClass()
-
+        msg = NO_MAPPING_FOUND_EXCEPTION_MESSAGE.format(from_class.__module__, from_class.__class__.__name__)
         mapper = ObjectMapper()
 
         # Act
@@ -246,6 +248,28 @@ def test_mapping_creation_no_mapping_defined(self):
         # Assert
         self.assertTrue(exc, "Exception must be thrown")
 
+    def test_mapping_creation_no_mapping_pair_defined(self):
+        """ Test mapping creation with no mapping defined for a from -> to pair"""
+
+        # Arrange
+        exc = False
+        from_class = FromTestClass()
+        to_class = ToTestClass()
+        msg = NO_MAPPING_PAIR_FOUND_EXCEPTION_MESSAGE.format(from_class.__module__, from_class.__class__.__name__, 
+                                                             to_class.__module__, to_class.__class__.__name__)
+        mapper = ObjectMapper()
+        mapper.create_map(FromTestClass, ToTestClassTwo, {})
+
+        # Act
+        try:
+            mapper.map(from_class, ToTestClass)
+        except ObjectMapperException as ex:
+            self.assertEqual(str(ex), msg, "Exception message must be correct")
+            exc = True
+
+        # Assert
+        self.assertTrue(exc, "Exception must be thrown")
+
     def test_mapping_creation_with_mapping_suppression(self):
         """ Test mapping creation with mapping suppression """
 
@@ -270,11 +294,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"
 
@@ -283,7 +309,7 @@ def __init__(self):
         mapper.create_map(FromTestClass2, ToTestClass2)
 
         # Act
-        result = mapper.map(FromTestClass2(), ignore_case=True)
+        result = mapper.map(FromTestClass2(), ToTestClass2, ignore_case=True)
 
         # Assert
         self.assertEqual(result.name, from_class.Name, "Name mapping must be equal")
@@ -312,6 +338,7 @@ def test_mapping_creation_with_custom_dir(self):
 
         # Arrange
         _propNames = ['name', 'date']
+
         class ToCustomDirClass(object):
             def __dir__(self):
                 props = list(self.__dict__.keys())
@@ -349,16 +376,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
         result = mapper.map(FromTestClass(), 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")