Merge pull request #266 from aio-libs/fix-trafaret-as-dict

Fix as_dict trafaret issue

Author: jettify

aiohttp_admin/backends/mongo_utils.py

@@ -3,7 +3,7 @@
 from trafaret.contrib.object_id import MongoId
 
 from ..exceptions import JsonValidaitonError
-from ..utils import MULTI_FIELD_TEXT_QUERY
+from ..utils import MULTI_FIELD_TEXT_QUERY, as_dict
 
 
 __all__ = ['create_validator', 'create_filter']
@@ -72,7 +72,7 @@ def _check_value(column_traf_map, field_name, value):
     try:
         value = apply_trafaret(trafaret, value)
     except t.DataError as exc:
-        raise JsonValidaitonError(**exc.as_dict())
+        raise JsonValidaitonError(**as_dict(exc))
 
     return value
 

aiohttp_admin/backends/sa_utils.py

@@ -7,7 +7,7 @@
 from trafaret.contrib.rfc_3339 import DateTime
 
 from ..exceptions import JsonValidaitonError
-from ..utils import MULTI_FIELD_TEXT_QUERY
+from ..utils import MULTI_FIELD_TEXT_QUERY, as_dict
 
 
 __all__ = ['table_to_trafaret', 'create_filter']
@@ -149,7 +149,7 @@ def check_value(column, value):
             value = trafaret.check_and_return(value)
 
     except t.DataError as exc:
-        raise JsonValidaitonError(**exc.as_dict())
+        raise JsonValidaitonError(**as_dict(exc))
     return value
 
 

aiohttp_admin/utils.py

@@ -98,7 +98,7 @@ def validate_query_structure(query):
         q = ListQuery(query_dict)
     except t.DataError as exc:
         msg = '_filters query invalid'
-        raise JsonValidaitonError(msg, **exc.as_dict())
+        raise JsonValidaitonError(msg, **as_dict(exc))
 
     return q
 
@@ -113,7 +113,7 @@ def validate_payload(raw_payload, schema):
     try:
         data = schema(parsed)
     except t.DataError as exc:
-        raise JsonValidaitonError(**exc.as_dict())
+        raise JsonValidaitonError(**as_dict(exc))
     return data
 
 
@@ -157,3 +157,10 @@ def calc_pagination(query_dict, default_sort_direction):
     offset = (page - 1) * per_page
     limit = per_page
     return PagingParams(limit, offset, sort_field, sort_dir)
+
+
+def as_dict(exc, value=None):
+    result = exc.as_dict(value)
+    if isinstance(result, str):
+        return {"error": result}
+    return result

tests/test_utils.py

@@ -6,7 +6,7 @@
 
 from aiohttp_admin.exceptions import JsonValidaitonError
 from aiohttp_admin.utils import (validate_query_structure, jsonify,
-                                 validate_payload)
+                                 validate_payload, as_dict)
 
 
 def test_validate_query_empty_defaults():
@@ -102,3 +102,15 @@ def test_validate_payload_not_valid_schema():
 
     error = json.loads(ctx.value.text)
     assert error['error'] == 'Invalid json payload'
+
+
+def test_as_dict():
+    exc = t.DataError()
+    resp = as_dict(exc)
+    assert isinstance(resp, dict)
+
+    exc = t.DataError()
+    assert isinstance(exc.as_dict("boom"), str)
+
+    resp = as_dict(exc, 'boom')
+    assert isinstance(resp, dict)