Merge pull request #18 from dexteradeus/feature/choices_fix

Allow choice fields with human readable key tuples

Author: mmellison

eve_mongoengine/schema.py

@@ -138,7 +138,13 @@ def process_field(cls, field, lowercase):
             if field.unique:
                 fdict['unique'] = True
             if field.choices:
-                fdict['allowed'] = field.choices
+                allowed = []
+                for choice in field.choices:
+                    if isinstance(choice, (list, tuple)):
+                        allowed.append(choice[0])
+                    else:
+                        allowed.append(choice)
+                fdict['allowed'] = tuple(allowed)
             if getattr(field, 'max_length', None) is not None:
                 fdict['maxlength'] = field.max_length
             if getattr(field, 'min_length', None) is not None:

tests/__init__.py

@@ -76,6 +76,10 @@ class LimitedDoc(Document):
     d = StringField(max_length=10)
     e = StringField(min_length=10)
     f = IntField(min_value=5, max_value=10)
+    g = StringField(choices=[
+                    ['val1', 'test value 1'],
+                    ('val2', 'test value 2'),
+                    ['val3', 'test value 3']])
 
 class WrongDoc(Document):
     updated = IntField() # this is bad name

tests/test_post.py

@@ -49,14 +49,14 @@ def test_post_invalid_schema_type(self):
     def test_post_invalid_schema_limits(self):
         # break min_length
         response = self.client.post('/limiteddoc/',
-                                    data='{"a": "hi", "b": "ho", "c": "x", "d": "<10 chars", "e": "<10 chars"}',
+                                    data='{"a": "hi", "b": "ho", "c": "x", "d": "<10 chars", "e": "<10 chars", "g": "val1"}',
                                     content_type='application/json')
         self.assertEqual(response.status_code, POST_VALIDATION_ERROR_CODE)
         json_data = response.get_json()
         self.assertDictEqual(json_data[config.ISSUES], {'e': "min length is 10"})
         # break max_length
         response = self.client.post('/limiteddoc/',
-                                    data='{"a": "hi", "b": "ho", "c": "x", "d": "string > 10 chars", "e": "some very long text"}',
+                                    data='{"a": "hi", "b": "ho", "c": "x", "d": "string > 10 chars", "e": "some very long text", "g": "val2"}',
                                     content_type='application/json')
         self.assertEqual(response.status_code, POST_VALIDATION_ERROR_CODE)
         json_data = response.get_json()
@@ -71,6 +71,25 @@ def test_post_invalid_schema_required(self):
         json_data = response.get_json()
         self.assertDictEqual(json_data[config.ISSUES], {'a': "required field"})
 
+    def test_post_invalid_schema_choice(self):
+        response = self.client.post('/limiteddoc/',
+                                    data='{"a": "hi", "b": "ho", "c": "a"}',
+                                    content_type='application/json')
+        self.assertEqual(response.status_code, POST_VALIDATION_ERROR_CODE)
+        json_data = response.get_json()
+        self.assertDictEqual(json_data[config.ISSUES], {'c': 'unallowed value a'})
+        response = self.client.post('/limiteddoc/',
+                                    data='{"a": "hi", "b": "ho", "g": "val4"}',
+                                    content_type='application/json')
+        self.assertEqual(response.status_code, POST_VALIDATION_ERROR_CODE)
+        json_data = response.get_json()
+        self.assertDictEqual(json_data[config.ISSUES], {'g': 'unallowed value val4'})
+        response = self.client.post('/limiteddoc/',
+                                    data='{"a": "hi", "b": "ho", "g": "test value 1"}',
+                                    content_type='application/json')
+        self.assertEqual(response.status_code, POST_VALIDATION_ERROR_CODE)
+        json_data = response.get_json()
+        self.assertDictEqual(json_data[config.ISSUES], {'g': 'unallowed value test value 1'})
 
     def test_post_invalid_schema_unique(self):
         response = self.client.post('/limiteddoc/',