WIP: schemas

.travis.yml

@@ -20,11 +20,14 @@ install:
   - conda update conda
 
   # Install dependencies
-  - conda install python
+  - conda create -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

docs/collections/abstracts.rst

@@ -16,7 +16,7 @@ The following lists key names mapped to its type and meaning for each entry.
 :institution: str, name of the inistitution
 :references: str, HTML string of reference for the abstract itself, optional
 :text: str, HTML string of the abstract.
-:timestamp: The time when the abstract was submitted.
+:timestamp: float, The time when the abstract was submitted.
 
 
 YAML Example

docs/collections/grants.rst

@@ -21,7 +21,7 @@ The following lists key names mapped to its type and meaning for each entry.
 :begin_day: int,  start day of the grant, optional
 :end_year: int, end year of the grant
 :end_month": str, end month of the grant
-:end_day: str, end day of teh grant, optional
+:end_day: str, end day of the grant, optional
 :team: list of dicts, information about the team members participating in the grant.
     These dicts have the following form:
 
@@ -30,7 +30,7 @@ The following lists key names mapped to its type and meaning for each entry.
         [{"name": str, # should match a person's name  or AKA
           "position": str,   # PI, Co-PI, Co-I, Researcher, etc.
           "institution": str, # The institution of this investigator
-          "subaward_amount", int or float,  # optional
+          "subaward_amount": int or float,  # optional
           "cv": str,  # optional, URL of document
           },
           ...

docs/collections/people.rst

@@ -54,7 +54,7 @@ The following lists key names mapped to its type and meaning for each entry.
           ]
 
 :funding: list of dicts, Funding and scholarship that the group member has
-    individually obtained in the past (optional). **WARNING:** this is not to be confused
+    individually obtained in the past, optional. **WARNING:** this is not to be confused
     with the **grants** collection, that may refee back to group members.
     These dicts have the following form:
 
@@ -70,7 +70,7 @@ The following lists key names mapped to its type and meaning for each entry.
           ...
           ]
 
-:service: list of dicts, Service that this group member has provided (optional).
+:service: list of dicts, Service that this group member has provided, optional.
     These dicts have the following form:
 
     .. code-block:: python
@@ -84,7 +84,7 @@ The following lists key names mapped to its type and meaning for each entry.
           ...
           ]
 
-:honors: list of dicts, Honors that have been awarded to this group member (optional).
+:honors: list of dicts, Honors that have been awarded to this group member, optional.
     These dicts have the following form:
 
     .. code-block:: python
@@ -97,7 +97,7 @@ The following lists key names mapped to its type and meaning for each entry.
           ...
           ]
 
-:teaching: list of dicts, Courses that this group member has taught, if any (optional).
+:teaching: list of dicts, Courses that this group member has taught, if any, optional.
     These dicts have the following form:
 
     .. code-block:: python
@@ -118,7 +118,7 @@ The following lists key names mapped to its type and meaning for each entry.
           ...
           ]
 
-:membership: list of dicts, Profesional organizations this member is a part of (optional).
+:membership: list of dicts, Profesional organizations this member is a part of, optional.
     These dicts have the following form:
 
     .. code-block:: python
@@ -135,7 +135,7 @@ The following lists key names mapped to its type and meaning for each entry.
           ...
           ]
 
-:skills: list of dicts, Skill the group member has (optional)
+:skills: list of dicts, Skill the group member has, optional
     These dicts have the following form:
 
     .. code-block:: python

regolith/app.py

@@ -6,6 +6,8 @@
 
 from flask import Flask, abort, request, render_template, redirect, url_for
 
+from regolith.validators import validate
+
 app = Flask('regolith')
 
 
@@ -59,6 +61,17 @@ def collection_page(dbname, collname):
                     f.write(form['body'])
                 traceback.print_exc()
                 raise
+            tv, errors = validate(dbname, body)
+            if not tv:
+                td = tempfile.TemporaryDirectory()
+                n = os.path.join(td.name, 'regolith.txt')
+                print(errors)
+                print('Writing text file to {}. '
+                      'Please try again.'.format(n))
+                with open(n) as f:
+                    f.write(form['body'])
+                raise ValueError('Error while validating the record')
+
             rc.client.update_one(dbname, collname, {'_id': body['_id']}, body)
             status = 'saved ✓'
             status_id = str(body['_id'])
@@ -75,6 +88,16 @@ def collection_page(dbname, collname):
                     f.write(form['body'])
                 traceback.print_exc()
                 raise
+            tv, errors = validate(dbname, body)
+            if not tv:
+                td = tempfile.TemporaryDirectory()
+                n = os.path.join(td.name, 'regolith.txt')
+                print(errors)
+                print('Writing text file to {}. '
+                      'Please try again.'.format(n))
+                with open(n) as f:
+                    f.write(form['body'])
+                raise ValueError('Error while validating the record')
             try:
                 added = rc.client.insert_one(dbname, collname, body)
             except Exception: