TST: add test for validator

.travis.yml

@@ -20,11 +20,14 @@ install:
   - conda update conda
 
   # Install dependencies
-  - conda install python
+  - conda install -n test --file requirements/run.txt
+  - source activate test
   - python setup.py install
 
 script:
   - set -e
+  - conda install --file requirements/test.txt
+  - pytest -vvs .
   - # Command to build your docs
   - pip install doctr
   - conda install --file requirements/doc.txt

regolith/schemas/schemas.py

@@ -14,7 +14,8 @@
         'description': 'optional, URL to the call for proposals',
         'type': str},
     'currency': {'description': "typically '$' or 'USD'", 'type': str},
-    'end_day': {'description': 'end day of teh grant, optional', 'type': str},
+    'end_day': {'description': 'end day of teh grant, optional',
+                'type': (str, int)},
     'end_month"': {'description': 'end month of the grant', 'type': str},
     'end_year': {'description': 'end year of the grant', 'type': int},
     'funder': {'description': 'the agency funding the work', 'type': str},

regolith/tests/test_validators.py

@@ -0,0 +1,31 @@
+from regolith.validators import validate_schema
+from regolith.schemas.schemas import schemas
+import json
+from io import StringIO
+
+
+def test_grant_validation():
+    raw_json = """{"_id": "SymPy-1.1",
+     "amount": 3000.0,
+     "begin_day": 1,
+     "begin_month": "May",
+     "begin_year": 2017,
+     "call_for_proposals": "https://groups.google.com/d/msg/numfocus/wPjhdm8NJiA/S8JL1_NZDQAJ",
+     "end_day": 31,
+     "end_month": "December",
+     "end_year": 2017,
+     "funder": "NumFOCUS",
+     "narrative": "https://docs.google.com/document/d/1nZxqoL-Ucni_aXLWmXtRDd3IWqW0mZBO65CEvDrsXZM/edit?usp=sharing",
+     "program": "Small Development Grants",
+     "team": [{"institution": "University of South Carolina",
+               "name": "Anthony Scopatz",
+               "position": "PI"},
+              {"institution": "University of South Carolina",
+               "name": "Aaron Meurer",
+               "position": "researcher"}
+            ],
+     "title": "SymPy 1.1 Release Support"}"""
+    record = json.loads(raw_json)
+    validate_schema(record, schemas['grants'])
+
+

regolith/validators.py

@@ -116,36 +116,29 @@ def ensure_email(email):
 }
 
 
-def validate_schema(record, schema):
+def validate_schema(record, schema, key=None):
     if isinstance(record, dict):
-        total_keys = set(record.keys())
-        total_keys.update(set(schema.keys()))
+        total_keys = set(schema.keys())
+        remove_keys = ['required', 'type', 'description']
+        for k in remove_keys:
+            if k in total_keys:
+                total_keys.remove(k)
+        total_keys.update(set(record.keys()))
+
         for k in total_keys:
             if k not in schema:
                 pass
             if k not in record and schema[k].get('required', False):
                 raise ValueError('{} is required'.format(k))
             elif k in record and k in schema:
-                print(k)
-                validate_schema(record[k], schema[k])
+                validate_schema(record[k], schema[k], k)
     elif isinstance(record, collections.Iterable) and not isinstance(record,
                                                                      str):
         for r in record:
-            validate_schema(r, schema)
+            validate_schema(r, schema, key)
     else:
         if not isinstance(record, schema['type']):
             raise ValueError('Schema expected type: {}, '
-                             'got type: {}'.format(type(record),
-                                                   schema['type']))
-
-
-dict_schema = {'key':
-                   {'type': str, 'required': True}
-               }
-dict_schema2 = {'key':
-                    {'key1': {'type': str, 'required': True, 'description':
-                              'key one schema'},
-                     'key2': {'type': [int, float], 'required': False},
-                     'key3': [{'type': [int, float], 'required': False}]
-                     }
-                }
+                             'got type: {} in '
+                             '{{{}:{}}}'.format(type(record),
+                                                schema['type'], key, record))

requirements/run.txt

@@ -1 +1,2 @@
+python
 ruamel.yaml

requirements/test.txt

@@ -1 +1,2 @@
-ruamel.yaml
+ruamel.yaml
+pytest