Merge lp:~camptocamp/openerp-connector/7.0-modifier-shadow-name-1322645 into lp:~openerp-connector-core-editors/openerp-connector/7.0

[Guewen Baconnier @ Camptocamp]

extract the attribute name from the closure when a modifier is used in a 'direct' mapping

Fixes: lp:1322645

=== modified file 'connector/tests/test_mapper.py'
--- connector/tests/test_mapper.py	2013-11-12 09:02:25 +0000
+++ connector/tests/test_mapper.py	2014-05-23 14:41:23 +0000
@@ -558,3 +558,19 @@
                                           'test': .5})]
                     }
         self.assertEqual(map_record.values(for_create=True), expected)
+
+    def test_modifier_filter_field(self):
+        """ A direct mapping with a modifier must still be considered from the list of fields """
+        class MyMapper(ImportMapper):
+            direct = [('field', 'field2'),
+                      ('no_field', 'no_field2'),
+                      (convert('name', int), 'out_name')]
+
+        env = mock.MagicMock()
+        record = {'name': '300', 'field': 'value', 'no_field': 'no_value'}
+        mapper = MyMapper(env)
+        map_record = mapper.map_record(record)
+        expected = {'out_name': 300, 'field2': 'value'}
+        self.assertEqual(map_record.values(fields=['field', 'name']), expected)
+        self.assertEqual(map_record.values(for_create=True,
+                                           fields=['field', 'name']), expected)

=== modified file 'connector/unit/mapper.py'
--- connector/unit/mapper.py	2014-03-19 09:41:36 +0000
+++ connector/unit/mapper.py	2014-05-23 14:41:23 +0000
@@ -659,7 +659,14 @@
         for_create = self.options.for_create
         result = {}
         for from_attr, to_attr in self.direct:
-            if (not fields or from_attr in fields):
+            if callable(from_attr):  # in a modifier
+                # the name of the attribute is the first arg of the
+                # closure
+                attr_name = from_attr.__closure__[0].cell_contents
+            else:
+                attr_name = from_attr
+
+            if (not fields or attr_name in fields):
                 value = self._map_direct(map_record.source,
                                          from_attr,
                                          to_attr)