Merge pull request #10 from kevinjqiu/refactoring-resources

Refactoring

mailchute/api/app.py

@@ -0,0 +1,33 @@
+import bottle
+from bottle import response
+from mailchute.api import resource
+
+
+def _route(app, uri, methods, handler):
+    app.route(uri, ['OPTIONS'])(lambda *a, **kw: {})
+    app.route(uri, methods)(handler)
+
+
+def create_app():
+    app = bottle.app()
+    _route(app, '/emails', ['GET'], resource.get_emails)
+    _route(
+        app, '/emails/<email_id:int>', ['DELETE'],
+        resource.delete_email)
+    _route(
+        app, '/raw_messages/<raw_message_id>', ['GET'],
+        resource.get_raw_message)
+
+    @app.hook('after_request')
+    def enable_cors():
+        ALLOWED_METHODS = 'PUT, GET, POST, DELETE, OPTIONS'
+        ALLOWED_HEADERS = \
+            'Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token'
+        response.headers['Access-Control-Allow-Origin'] = '*'
+        response.headers['Access-Control-Allow-Methods'] = ALLOWED_METHODS
+        response.headers['Access-Control-Allow-Headers'] = ALLOWED_HEADERS
+
+    return app
+
+
+app = create_app()

mailchute/api/cli.py

@@ -1,10 +1,10 @@
 import bottle
 from mailchute import settings
-from mailchute.api.resource import app
+from mailchute.api.app import app
 
 
-def main(): # pragma: no cover
-    import mailchute.api.resource as _
+def main():  # pragma: no cover
+    # import mailchute.api.resource as _
     bottle.run(
         app,
         host=settings.API['host'],

mailchute/api/resource.py

@@ -9,11 +9,6 @@
     response, IncomingEmailDTO, RawMessageDTO)
 
 
-app = bottle.app()
-
-
-app.route('/emails', ['OPTIONS'])(lambda: {})
-@app.route('/emails', ['GET'])
 @response('emails', IncomingEmailDTO)
 def get_emails():
     inbox = bottle.request.query.get('inbox', None)
@@ -28,8 +23,6 @@ def get_emails():
     return emails
 
 
-app.route('/emails/<email_id:int>', ['OPTIONS'])(lambda *a, **kw: {})
-@app.route('/emails/<email_id:int>', ['DELETE'])
 @response('emails', None)
 def delete_email(email_id):
     if not db.session.query(IncomingEmail).filter_by(id=email_id).count():
@@ -41,8 +34,6 @@ def delete_email(email_id):
     db.session.commit()
 
 
-app.route('/raw_messages/<raw_message_id>', ['OPTIONS'])(lambda *a, **kw: {})
-@app.route('/raw_messages/<raw_message_id>', ['GET'])
 @response('raw_messages', RawMessageDTO)
 def get_raw_message(raw_message_id):
     try:
@@ -53,13 +44,3 @@ def get_raw_message(raw_message_id):
         )
     except sqlalchemy.orm.exc.NoResultFound:
         raise NotFound()
-
-
-@app.hook('after_request')
-def enable_cors():
-    ALLOWED_METHODS = 'PUT, GET, POST, DELETE, OPTIONS'
-    ALLOWED_HEADERS = \
-        'Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token'
-    bottle.response.headers['Access-Control-Allow-Origin'] = '*'
-    bottle.response.headers['Access-Control-Allow-Methods'] = ALLOWED_METHODS
-    bottle.response.headers['Access-Control-Allow-Headers'] = ALLOWED_HEADERS

tests/test_api.py

@@ -4,7 +4,7 @@
 from webtest import TestApp
 from tests.base import BaseTestCase, Fixture
 
-from mailchute.api.resource import app
+from mailchute.api.app import app
 from mailchute.api.cli import main as api_main
 from mailchute.db import session
 from mailchute.model import IncomingEmail

tests/test_cors.py

@@ -1,5 +1,5 @@
 from webtest import TestApp
-from mailchute.api.resource import app
+from mailchute.api.app import app
 
 
 app = TestApp(app)