Fold ...appcontent_parameters into ...extra_context, remove extra_path attr

matthiask · matthiask · commit 6e940b202a10 · 2011-03-03T10:11:38.000+01:00
diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt
@@ -45,3 +45,14 @@ Changes and highlights
 * ``feincms_site`` is not available in the context anymore. It was undocumented,
   mostly unused and badly named anyway. If you still need this functionality you
   should use ``django.contrib.sites`` directly yourself.
+
+* The ``_feincms_appcontent_parameters`` has been folded into the
+  ``_feincms_extra_context`` attribute on the current request. The
+  ``appcontent_parameters`` template tag is not necessary anymore
+  (the content of ``_feincms_extra_context`` is guaranteed to be available in
+  the template context) and has been removed.
+
+* As part of the effort to reduce variables attached to the request object
+  (acting as a replacement for global variables), ``request.extra_path``
+  has been removed. The same information can be accessed via
+  ``request._feincms_extra_context['extra_path']``.
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -284,7 +284,7 @@ def process(self, request):
                 appcontent_parameters=self.parameters
             )
         else:
-            path = re.sub('^' + re.escape(page_url[:-1]), '', request.path)
+            path = request._feincms_extra_context['extra_path']
 
         # Resolve the module holding the application urls.
         urlconf_path = self.app_config.get('urls', self.urlconf_path)
@@ -301,7 +301,7 @@ def process(self, request):
         #: Variables from the ApplicationContent parameters are added to request
         #  so we can expose them to our templates via the appcontent_parameters
         #  context_processor
-        request._feincms_appcontent_parameters.update(self.parameters)
+        request._feincms_extra_context.update(self.parameters)
 
         view_wrapper = self.app_config.get("view_wrapper", None)
         if view_wrapper:
diff --git a/feincms/content/comments/models.py b/feincms/content/comments/models.py
@@ -60,7 +60,7 @@ def render(self, **kwargs):
             # just the comments for right now, but if we just post to the current path
             # and handle it this way .. at least it works for now.
 
-            #extra = request._feincms_appcontent_parameters.get('page_extra_path', ())
+            #extra = request._feincms_extra_context.get('page_extra_path', ())
             #if len(extra) > 0 and extra[0] == u"post-comment":
 
             from django.contrib.comments.views.comments import post_comment
diff --git a/feincms/context_processors.py b/feincms/context_processors.py
@@ -14,13 +14,3 @@ def add_page_if_missing(request):
             }
     except Page.DoesNotExist:
         return {}
-
-
-def appcontent_parameters(request):
-    """Add ApplicationContent parameters from the request
-
-    ApplicationContent adds the parameters to the request object before
-    processing the view so we can expose them to templates here
-    """
-
-    return getattr(request, '_feincms_appcontent_parameters', {})
diff --git a/feincms/module/page/models.py b/feincms/module/page/models.py
@@ -418,7 +418,6 @@ def setup_request(self, request):
         """
         request._feincms_page = self
         request._feincms_extra_context = {}
-        request.extra_path = ""
 
         for fn in self.request_processors:
             r = fn(self, request)
diff --git a/feincms/module/page/templatetags/feincms_page_tags.py b/feincms/module/page/templatetags/feincms_page_tags.py
@@ -143,13 +143,14 @@ def what(self, page, args):
         only_existing = args.get('existing', False)
         exclude_current = args.get('excludecurrent', False)
 
-        # Preserve the trailing path when switching languages if
-        # we are inside an ApplicationContent
+        # Preserve the trailing path when switching languages if extra_path
+        # exists (this is mostly the case when we are working inside an
+        # ApplicationContent-managed page subtree)
         trailing_path = u''
         request = args.get('request', None)
-        if hasattr(request, '_feincms_appcontent_parameters'):
-            if request._feincms_appcontent_parameters.get('in_appcontent_subpage'):
-                trailing_path = request.path[len(page.get_absolute_url()):]
+        if request:
+            # Trailing path without first slash
+            trailing_path = request._feincms_extra_context.get('extra_path', '')[1:]
 
         translations = dict((t.language, t) for t in page.available_translations())
         translations[page.language] = page
diff --git a/feincms/views/applicationcontent.py b/feincms/views/applicationcontent.py
@@ -2,6 +2,7 @@
 # coding=utf-8
 # ------------------------------------------------------------------------
 
+import re
 try:
     from email.utils import parsedate
 except ImportError: # py 2.4 compat
@@ -16,8 +17,7 @@
 
 
 def applicationcontent_request_processor(page, request):
-    if not hasattr(request, '_feincms_appcontent_parameters'):
-        request._feincms_appcontent_parameters = dict(in_appcontent_subpage=False)
+    request._feincms_extra_context['in_appcontent_subpage'] = False
 
     if request.path != page.get_absolute_url():
         # The best_match logic kicked in. See if we have at least one
@@ -26,22 +26,16 @@ def applicationcontent_request_processor(page, request):
             if not settings.FEINCMS_ALLOW_EXTRA_PATH:
                 raise Http404
         else:
-            request._feincms_appcontent_parameters['in_appcontent_subpage'] = True
+            request._feincms_extra_context['in_appcontent_subpage'] = True
 
-        extra_path = request.path[len(page.get_absolute_url()):]
-        extra = extra_path.strip('/').split('/')
-        request._feincms_appcontent_parameters['page_extra_path'] = extra
-        request.extra_path = extra_path
-    else:
-        request.extra_path = ""
+        request._feincms_extra_context['extra_path'] = re.sub(
+            '^' + re.escape(page.get_absolute_url()[:-1]), '', request.path)
 
 Page.register_request_processors(applicationcontent_request_processor)
 
 
 class ApplicationContentHandler(Handler):
     def __call__(self, request, path=None):
-        request._feincms_appcontent_parameters = {}
-
         return self.build_response(request,
             Page.objects.best_match_for_path(path or request.path, raise404=True))
 
