Merge branch 'master' of github.com:hatnote/montage

Author: slaporte

montage/admin_endpoints.py

@@ -13,6 +13,7 @@
                    get_threshold_map,
                    InvalidAction,
                    DoesNotExist,
+                   NotImplementedResponse,
                    js_isoparse)
 
 from rdb import (CoordinatorDAO,
@@ -355,7 +356,7 @@ def import_entries(user_dao, round_id, request_dict):
         entries = coord_dao.add_entries_by_name(round_id, file_names)
         params = {'file_names': file_names}
     else:
-        raise NotImplementedError()
+        raise NotImplementedResponse()
 
     new_entry_stats = coord_dao.add_round_entries(round_id, entries,
                                                   method=import_method,
@@ -537,7 +538,7 @@ def get_round_results_preview(user_dao, round_id):
         data['rankings'] = [r.to_dict() for r in rankings]
 
     else:
-        raise NotImplementedError()
+        raise NotImplementedResponse()
 
     return {'data': data}
 
@@ -562,7 +563,7 @@ def advance_round(user_dao, round_id, request_dict):
     rnd = coord_dao.get_round(round_id)
 
     if rnd.vote_method not in ('rating', 'yesno'):
-        raise NotImplementedError()  # see docstring above
+        raise NotImplementedResponse()  # see docstring above
     threshold = float(request_dict['threshold'])
     _next_round_params = request_dict['next_round']
     nrp = _prepare_round_params(coord_dao, _next_round_params)

montage/mw.py

@@ -10,6 +10,7 @@
 from boltons.tbutils import ExceptionInfo
 
 from rdb import User, UserDAO
+from utils import MontageError
 
 
 def public(endpoint_func):
@@ -31,9 +32,10 @@ class MessageMiddleware(Middleware):
     """
     provides = ('response_dict', 'request_dict')
 
-    def __init__(self, raise_errors=True, use_ashes=False):
+    def __init__(self, raise_errors=True, use_ashes=False, debug_errors=False):
         self.raise_errors = raise_errors
         self.use_ashes = use_ashes
+        self.debug_errors = debug_errors
 
     def request(self, next, request):
         response_dict = {'errors': [], 'status': 'success'}
@@ -55,7 +57,9 @@ def endpoint(self, next, response_dict, request, _route):
         # TODO: autoswitch resp status code
         try:
             ret = next()
-        except Exception:
+        except Exception as e:
+            if self.debug_errors and not isinstance(e, MontageError):
+                import pdb; pdb.post_mortem()
             if self.raise_errors:
                 raise
             ret = None

montage/rdb.py

@@ -298,16 +298,15 @@ class Round(Base):
 
     @property
     def show_stats(self):
-        if self.flags is None:
+        if self.config is None:
             return None
-
-        return self.flags.get('show_stats')
+        return self.config.get('show_stats')
 
     @show_stats.setter
     def show_stats(self, value):
-        if self.flags is None:
-            self.flags = {}
-        self.flags['show_stats'] = value
+        if self.config is None:
+            self.config = {}
+        self.config['show_stats'] = value
 
     def check_closability(self):
         task_count = self._get_task_count()

montage/server.py

@@ -168,11 +168,12 @@ def get_engine():
                  'root_path': root_path,
                  'ashes_renderer': renderer}
 
+    debug_errors = bool(os.getenv('MONTAGE_PDB', False))
     api_app = Application(api_routes, resources,
-                          middlewares=[MessageMiddleware()] + middlewares,
+                          middlewares=[MessageMiddleware(debug_errors=debug_errors)] + middlewares,
                           render_factory=render_basic)
     ui_app = Application(ui_routes, resources,
-                         middlewares=[MessageMiddleware(use_ashes=True)] + middlewares,
+                         middlewares=[MessageMiddleware(debug_errors=debug_errors, use_ashes=True)] + middlewares,
                          render_factory=renderer)
 
     static_app = StaticApplication(STATIC_PATH)

montage/utils.py

@@ -28,19 +28,23 @@
 DEFAULT_ENV_NAME = 'dev'
 
 
-class PermissionDenied(Forbidden):
+class MontageError(Exception):
+    "A base type for expected errors."
+
+
+class PermissionDenied(MontageError, Forbidden):
     "Raised when users perform actions on the wrong resources"
 
 
-class DoesNotExist(NotFound):
+class DoesNotExist(MontageError, NotFound):
     "Raised when users perform actions on nonexistent resources"
 
 
-class InvalidAction(BadRequest):
+class InvalidAction(MontageError, BadRequest):
     "Raised when some user behavior would cause some other assumption to fail"
 
 
-class NotImplementedResponse(BadRequest, NotImplementedError):
+class NotImplementedResponse(MontageError, BadRequest, NotImplementedError):
     "Raised when a feature hasn't yet been implemented"
 
 

run_server_test.py

@@ -403,6 +403,8 @@ def full_run(base_url, remote):
     resp = fetch('juror: get votes stats',
                  '/juror/round/%s/votes-stats' % round_id,
                  as_user='Slaporte')
+    assert 'yes' in resp['stats']
+    assert 'no' in resp['stats']
 
     resp = fetch('maintainer: view audit logs', '/logs/audit')