Merge 107d9a3 into 23b8f41

touilleMan · Jun 16, 2016 · 6a2c1dd · 6a2c1dd
2 parents 23b8f41 + 107d9a3
commit 6a2c1dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/marshmallow_mongoengine/fields.py b/marshmallow_mongoengine/fields.py
@@ -28,7 +28,7 @@ def _deserialize(self, value, attr, data):
         try:
             return dict(
                 type='Point',
-                coordinates=[value['x'], value['y']]
+                coordinates=[float(value['x']), float(value['y'])]
             )
         except:
             raise ValidationError('invalid Point `%s`' % value)

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -289,4 +289,13 @@ class Meta:
         dump = DocSchema().dump(doc)
         assert not dump.errors
         assert dump.data['point'] == { 'x': 10, 'y': 20 }
+        load = DocSchema().load(dump.data)
+        assert not load.errors
+        assert load.data.point == { 'type': 'Point', 'coordinates': [10, 20] }
+        # Deserialize Point with coordinates passed as string
+        data = {'point': { 'x': '10', 'y': '20' }}
+        load = DocSchema().load(data)
+        assert not load.errors
+        assert load.data.point == { 'type': 'Point', 'coordinates': [10, 20] }
+