Move the app reverse cache key generation into an ApplicationContent class method, similar to closest_match

matthiask · matthiask · commit bbde0126e395 · 2014-09-25T08:55:18.000+02:00
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -70,21 +70,11 @@ def app_reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None,
     appconfig = extra_context.get('app_config', {})
     urlconf = appconfig.get('urlconf_path', urlconf)
 
-    cache_generation = cache.get(APP_REVERSE_CACHE_GENERATION_KEY)
-    if cache_generation is None:
-        # This might never happen. Still, better be safe than sorry.
-        cache_generation = cycle_app_reverse_cache()
-
-    cache_key = 'FEINCMS:%s:APPCONTENT:L%s:U%s:G%s' % (
-        getattr(settings, 'SITE_ID', 0),
-        get_language(),
-        urlconf,
-        cache_generation)
-
+    appcontent_class = ApplicationContent._feincms_content_models[0]
+    cache_key = appcontent_class.app_reverse_cache_key(urlconf)
     url_prefix = cache.get(cache_key)
 
     if url_prefix is None:
-        appcontent_class = ApplicationContent._feincms_content_models[0]
         content = appcontent_class.closest_match(urlconf)
 
         if content is not None:
@@ -379,6 +369,19 @@ def _update_response_headers(self, request, response, headers):
         if len(lm_list) > 0:
             response['Expires'] = http_date(mktime(min(lm_list)))
 
+    @classmethod
+    def app_reverse_cache_key(self, urlconf_path, **kwargs):
+        cache_generation = cache.get(APP_REVERSE_CACHE_GENERATION_KEY)
+        if cache_generation is None:
+            # This might never happen. Still, better be safe than sorry.
+            cache_generation = cycle_app_reverse_cache()
+
+        return 'FEINCMS:%s:APPCONTENT:L%s:U%s:G%s' % (
+            getattr(settings, 'SITE_ID', 0),
+            get_language(),
+            urlconf_path,
+            cache_generation)
+
     @classmethod
     def closest_match(cls, urlconf_path):
         page_class = cls.parent.field.rel.to
