Merge pull request #19 from graphql-python/feat-map-field

Feature: Support MapField

Author: abawchen

graphene_mongo/tests/fixtures.py

@@ -3,11 +3,24 @@
 
 def setup_fixtures():
     Editor.drop_collection()
-    editor1 = Editor(id='1', first_name='Penny', last_name='Hardaway')
+    editor1 = Editor(
+        id='1',
+        first_name='Penny',
+        last_name='Hardaway',
+        metadata={'age': '20', 'nickname': '$1'}
+    )
     editor1.save()
-    editor2 = Editor(id='2', first_name='Grant', last_name='Hill')
+    editor2 = Editor(
+        id='2',
+        first_name='Grant',
+        last_name='Hill'
+    )
     editor2.save()
-    editor3 = Editor(id='3', first_name='Dennis', last_name='Rodman')
+    editor3 = Editor(
+        id='3',
+        first_name='Dennis',
+        last_name='Rodman'
+    )
     editor3.save()
 
     Article.drop_collection()
@@ -17,8 +30,13 @@ def setup_fixtures():
     article2.save()
 
     Reporter.drop_collection()
-    reporter1 = Reporter(id='1', first_name='Allen', last_name='Iverson',
-                        email='[email protected]',  awards=['2010-mvp'])
+    reporter1 = Reporter(
+        id='1',
+        first_name='Allen',
+        last_name='Iverson',
+        email='[email protected]',
+        awards=['2010-mvp']
+    )
     reporter1.articles = [article1, article2]
     embedded_article1 = EmbeddedArticle(
         headline='Real',
@@ -33,11 +51,22 @@ def setup_fixtures():
     reporter1.save()
 
     Player.drop_collection()
-    player1 = Player(first_name='Michael', last_name='Jordan')
+    player1 = Player(
+        first_name='Michael',
+        last_name='Jordan'
+    )
     player1.save()
-    player2 = Player(first_name='Magic', last_name='Johnson', opponent=player1)
+    player2 = Player(
+        first_name='Magic',
+        last_name='Johnson',
+        opponent=player1
+    )
     player2.save()
-    player3 = Player(first_name='Larry', last_name='Bird', players=[player1, player2])
+    player3 = Player(
+        first_name='Larry',
+        last_name='Bird',
+        players=[player1, player2]
+    )
     player3.save()
 
     player1.players = [player2]

graphene_mongo/tests/models.py

@@ -17,7 +17,7 @@ class Editor(Document):
     id = StringField(primary_key=True)
     first_name = StringField(required=True)
     last_name = StringField(required=True)
-
+    metadata = MapField(field=StringField())
 
 class Pet(Document):
 
@@ -54,8 +54,6 @@ class Reporter(Document):
     articles = ListField(ReferenceField(Article))
     embedded_articles = ListField(EmbeddedDocumentField(EmbeddedArticle))
     embedded_list_articles = EmbeddedDocumentListField(EmbeddedArticle)
-    # FIXME
-    # custom_map = MapField(field=StringField())
     awards = ListField(StringField())
 
 

graphene_mongo/tests/test_converter.py

@@ -66,9 +66,9 @@ def test_should_date_convert_string():
 def test_should_dict_convert_json():
     assert_conversion(mongoengine.DictField, graphene.JSONString)
 
-# FIXME
-# def test_should_convert_map_to_json():
-#     assert_conversion(mongoengine.MapField, graphene.JSONString)
+
+def test_should_convert_map_to_json():
+    assert_conversion(mongoengine.MapField, graphene.JSONString, field=mongoengine.StringField())
 
 
 def test_should_field_convert_list():

graphene_mongo/tests/test_query.py

@@ -28,7 +28,8 @@ def resolve_editors(self, *args, **kwargs):
     query = '''
         query EditorQuery {
             editor {
-                firstName
+                firstName,
+                metadata
             }
             editors {
                 firstName,
@@ -38,7 +39,8 @@ def resolve_editors(self, *args, **kwargs):
     '''
     expected = {
         'editor': {
-            'firstName': 'Penny'
+            'firstName': 'Penny',
+            'metadata': '{"age": "20", "nickname": "$1"}'
         },
         'editors': [{
             'firstName': 'Penny',
@@ -55,6 +57,9 @@ def resolve_editors(self, *args, **kwargs):
     schema = graphene.Schema(query=Query)
     result = schema.execute(query)
     assert not result.errors
+    metadata = result.data['editor'].pop('metadata')
+    expected_metadata = expected['editor'].pop('metadata')
+    assert(json.loads(metadata)) == dict(json.loads(expected_metadata))
     assert dict(result.data['editor']) == expected['editor']
     assert all(item in result.data['editors'] for item in expected['editors'])