Merge pull request #1130 from rafalp/refactor-core-middleware

Refactor core middleware package into module

devproject/settings.py

@@ -213,7 +213,7 @@ MIDDLEWARE = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',
 
     'misago.users.middleware.RealIPMiddleware',
-    'misago.core.middleware.frontendcontext.FrontendContextMiddleware',
+    'misago.core.middleware.FrontendContextMiddleware',
 
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -224,11 +224,11 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
     'misago.users.middleware.UserMiddleware',
-    'misago.core.middleware.exceptionhandler.ExceptionHandlerMiddleware',
+    'misago.core.middleware.ExceptionHandlerMiddleware',
     'misago.users.middleware.OnlineTrackerMiddleware',
     'misago.admin.middleware.AdminAuthMiddleware',
     'misago.threads.middleware.UnreadThreadsCountMiddleware',
-    'misago.core.middleware.threadstore.ThreadStoreMiddleware',
+    'misago.core.middleware.ThreadStoreMiddleware',
 ]
 
 ROOT_URLCONF = 'devproject.urls'

misago/core/middleware/exceptionhandler.py → misago/core/middleware.py

@@ -1,6 +1,6 @@
 from django.utils.deprecation import MiddlewareMixin
 
-from misago.core import exceptionhandler
+from misago.core import exceptionhandler, threadstore
 from misago.core.utils import is_request_to_misago
 
 
@@ -13,3 +13,15 @@ class ExceptionHandlerMiddleware(MiddlewareMixin):
             return exceptionhandler.handle_misago_exception(request, exception)
         else:
             return None
+
+
+class FrontendContextMiddleware(MiddlewareMixin):
+    def process_request(self, request):
+        request.include_frontend_context = True
+        request.frontend_context = {}
+
+
+class ThreadStoreMiddleware(MiddlewareMixin):
+    def process_response(self, request, response):
+        threadstore.clear()
+        return response

misago/core/middleware/frontendcontext.py

@@ -1,7 +0,0 @@
-from django.utils.deprecation import MiddlewareMixin
-
-
-class FrontendContextMiddleware(MiddlewareMixin):
-    def process_request(self, request):
-        request.include_frontend_context = True
-        request.frontend_context = {}

misago/core/middleware/threadstore.py

@@ -1,9 +0,0 @@
-from django.utils.deprecation import MiddlewareMixin
-
-from misago.core import threadstore
-
-
-class ThreadStoreMiddleware(MiddlewareMixin):
-    def process_response(self, request, response):
-        threadstore.clear()
-        return response

misago/core/tests/test_exceptionhandler_middleware.py

@@ -3,7 +3,7 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 from django.urls import reverse
 
-from misago.core.middleware.exceptionhandler import ExceptionHandlerMiddleware
+from misago.core.middleware import ExceptionHandlerMiddleware
 from misago.users.models import AnonymousUser
 
 

misago/core/tests/test_frontendcontext_middleware.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from misago.core.middleware.frontendcontext import FrontendContextMiddleware
+from misago.core.middleware import FrontendContextMiddleware
 
 
 class MockRequest(object):

misago/core/tests/test_threadstore.py

@@ -3,7 +3,7 @@ from django.test.client import RequestFactory
 from django.urls import reverse
 
 from misago.core import threadstore
-from misago.core.middleware.threadstore import ThreadStoreMiddleware
+from misago.core.middleware import ThreadStoreMiddleware
 
 
 class ThreadStoreTests(TestCase):