Changeset 1127 for branches/0.8(django)/PyLucid/middlewares/additional_content.py

Timestamp:

06/29/07 16:05:08 (17 months ago)

Author:

JensDiemer

Message:

* new additional Stylesheet/JavaScript handling. A middleware puts the collected data into the page.
* middleware "pagestats" renamed to "additional_content".
* some code cleanup

Files:

• branches/0.8(django)/PyLucid/middlewares/additional_content.py (moved) (moved from branches/0.8(django)/PyLucid/middlewares/pagestats.py) (5 diffs)

branches/0.8(django)/PyLucid/middlewares/additional_content.py

@@ -3 +3 @@
 
 """
-    PyLucid page statistics
-    ~~~~~~~~~~~~~~~~~~~~~~~
+    PyLucid additional page content
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+    Replace some Tags after the cms page is completly created:
+
+    ADD_DATA_TAG
+    ~~~~~~~~~~~~
+    The Stylesheet and JavaScript data from the internal pages are stored in
+    a list: context["js_data"] and context["css_data"]
+    The page_style Plugin insert the ADD_DATA_TAG into the response content.
+    Here we replace the tag with the collected CSS/JS contents.
+
+
+    PAGE_STAT_TAG
+    ~~~~~~~~~~~~~
     A small page statistic middleware.
-    -replace the >TAG< with some stats. But only in HTML pages.
+    -replace the >PAGE_STAT_TAG< with some stats. But only in HTML pages.
 
     Based on http://code.djangoproject.com/wiki/PageStatsMiddleware
+
 
     Last commit info:
@@ -25 +38 @@
 from django.db import connection
 
+from PyLucid.db.internal_pages import get_internal_page
+from PyLucid.tools.content_processors import render_string_template
+
 start_overall = time()
 
-TAG = "<!-- script_duration -->"
+PAGE_STAT_TAG = "<!-- script_duration -->"
+ADD_DATA_TAG = "<!-- additional_data -->"
 
 FMT = (
@@ -35 +52 @@
 )
 
-class PageStatsMiddleware(object):
+class AdditionalContentMiddleware(object):
     def process_view(self, request, view_func, view_args, view_kwargs):
         start_time = time()
@@ -50 +67 @@
             return response
 
+        content = response.content
+
+        content = self._add_data(content, request)
+        content = self._page_stat(content, start_time, old_queries)
+
+        response.content = content
+
+        return response
+
+
+    def _add_data(self, content, request):
+        """
+        Replace the ADD_DATA_TAG
+        add CSS/JS data from the Plugins into the page.
+        Note: The ADD_DATA_TAG puts the page_style plugin into the content!
+        """
+        try:
+            context = request.CONTEXT
+        except AttributeError:
+            # In the _install section, we need no add_data... There is no
+            # CONTEXT object in the request object. -> Do nothing
+            return content
+
+        try:
+            internal_page = get_internal_page("page_style", "add_data")
+            internal_page_content = internal_page.content_html
+
+            context = {
+                "js_data": context["js_data"],
+                "css_data": context["css_data"],
+            }
+            html = render_string_template(internal_page_content, context)
+        except Exception, msg:
+            html = "<!-- Replace the ADD_DATA_TAG error: %s -->" % msg
+
+        content = content.replace(ADD_DATA_TAG, html)
+
+        return content
+
+
+    def _page_stat(self, content, start_time, old_queries):
+        """
+        Replace the PAGE_STAT_TAG
+        """
         # compute the db time for the queries just run
         queries = len(connection.queries) - old_queries
@@ -60 +121 @@
         }
 
-        response.content = response.content.replace(TAG, stat_info)
+        content = content.replace(PAGE_STAT_TAG, stat_info)
 
-        return response
+        return content