From ee75a75f7e379b492af927b261726bc5d40fdb50 Mon Sep 17 00:00:00 2001
From: Simon Willison
Date: Sat, 20 Sep 2008 23:31:45 +0100
Subject: Show 1 SQL query v.s. 3 SQL queries

---
 debug_toolbar/panels/sql.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 4b059ac..81834b4 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -39,7 +39,11 @@ class SQLDebugPanel(DebugPanel):
 
     def title(self):
         self._sql_time = sum(map(lambda q: float(q['time']) * 1000, connection.queries))
-        return '%d SQL Queries (%.2fms)' % (len(connection.queries), self._sql_time)
+        return '%d SQL %s (%.2fms)' % (
+            len(connection.queries), 
+            (len(connection.queries) == 1) and 'query' or 'queries',
+            self._sql_time
+        )
 
     def url(self):
         return ''
-- 
cgit v1.2.3


From ee810109f7dfb8c70278b5c447b4604bccc987a0 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Sun, 21 Sep 2008 22:35:15 -0700
Subject: Refactoring middleware and panels so panels have more explicit
 middleware-like methods to be more clear when panel processing happens.

---
 debug_toolbar/panels/__init__.py     | 20 +++++++++++++++-----
 debug_toolbar/panels/cache.py        |  3 +--
 debug_toolbar/panels/headers.py      |  7 ++++++-
 debug_toolbar/panels/request_vars.py |  3 +++
 debug_toolbar/panels/sql.py          |  6 +++---
 debug_toolbar/panels/template.py     |  6 ++----
 debug_toolbar/panels/timer.py        | 10 ++++++----
 7 files changed, 36 insertions(+), 19 deletions(-)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index 29cec02..54b3318 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -6,9 +6,10 @@ class DebugPanel(object):
     """
     # name = Base
     has_content = False # If content returns something, set to true in subclass
-    
-    def __init__(self, request):
-        self.request = request
+
+    # Panel methods
+    def __init__(self):
+        pass
 
     def dom_id(self):
         return 'djDebug%sPanel' % (self.name.replace(' ', ''))
@@ -20,6 +21,15 @@ class DebugPanel(object):
         raise NotImplementedError
 
     def content(self):
-        # TODO: This is a bit flaky in that panel.content() returns a string 
-        # that gets inserted into the toolbar HTML template.
         raise NotImplementedError
+
+    # Standard middleware methods
+    def process_request(self, request):
+        pass
+
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        pass
+
+    def process_response(self, request, response):
+        pass
+
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index 263b62b..613d4d9 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -78,7 +78,7 @@ class CacheDebugPanel(DebugPanel):
     name = 'Cache'
     has_content = True
 
-    def __init__(self, request):
+    def __init__(self):
         # This is hackish but to prevent threading issues is somewhat needed
         if isinstance(cache.cache, CacheStatTracker):
             cache.cache.reset()
@@ -86,7 +86,6 @@ class CacheDebugPanel(DebugPanel):
         else:
             self.cache = CacheStatTracker(cache.cache)
             cache.cache = self.cache
-        super(CacheDebugPanel, self).__init__(request)
 
     def title(self):
         return 'Cache: %.2fms' % self.cache.total_time
diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py
index 3ab4a95..213198a 100644
--- a/debug_toolbar/panels/headers.py
+++ b/debug_toolbar/panels/headers.py
@@ -37,8 +37,13 @@ class HeaderDebugPanel(DebugPanel):
     def url(self):
         return ''
 
+    def process_request(self, request):
+        self.headers = dict(
+            [(k, request.META[k]) for k in self.header_filter if k in request.META]
+        )
+
     def content(self):
         context = {
-            'headers': dict([(k, self.request.META[k]) for k in self.header_filter if k in self.request.META]),
+            'headers': self.headers
         }
         return render_to_string('debug_toolbar/panels/headers.html', context)
\ No newline at end of file
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index a137393..88a7204 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -14,6 +14,9 @@ class RequestVarsDebugPanel(DebugPanel):
     def url(self):
         return ''
 
+    def process_request(self, request):
+        self.request = request
+
     def content(self):
         context = {
             'get': [(k, self.request.GET.getlist(k)) for k in self.request.GET.iterkeys()],
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 81834b4..b99709f 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -27,13 +27,13 @@ util.CursorDebugWrapper = DatabaseStatTracker
 
 class SQLDebugPanel(DebugPanel):
     """
-    Panel that displays information about the SQL queries run while processing the request.
+    Panel that displays information about the SQL queries run while processing
+    the request.
     """
     name = 'SQL'
     has_content = True
     
-    def __init__(self, request):
-        super(SQLDebugPanel, self).__init__(request)
+    def __init__(self):
         self._offset = len(connection.queries)
         self._sql_time = 0
 
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index e08f220..eb20079 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -1,3 +1,4 @@
+from pprint import pformat
 from django.conf import settings
 from django.core.signals import request_started
 from django.dispatch import Signal
@@ -5,8 +6,6 @@ from django.template.loader import render_to_string
 from django.test.signals import template_rendered
 from debug_toolbar.panels import DebugPanel
 
-from pprint import pformat
-
 # Code taken and adapted from Simon Willison and Django Snippets:
 # http://www.djangosnippets.org/snippets/766/
 
@@ -32,8 +31,7 @@ class TemplateDebugPanel(DebugPanel):
     name = 'Template'
     has_content = True
 
-    def __init__(self, request):
-        super(TemplateDebugPanel, self).__init__(request)
+    def __init__(self):
         self.templates = []
         template_rendered.connect(self._storeTemplateInfo)
 
diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index d520191..ea8ed4a 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -3,16 +3,18 @@ from debug_toolbar.panels import DebugPanel
 
 class TimerDebugPanel(DebugPanel):
     """
-    Panel that displays the time a response took.
+    Panel that displays the time a response took in milliseconds.
     """
     name = 'Timer'
 
-    def __init__(self, request):
-        super(TimerDebugPanel, self).__init__(request)
+    def process_request(self, request):
         self._start_time = time.time()
 
+    def process_response(self, request, response):
+        self.total_time = (time.time() - self._start_time) * 1000
+
     def title(self):
-        return 'Time: %0.2fms' % ((time.time() - self._start_time) * 1000)
+        return 'Time: %0.2fms' % (self.total_time)
 
     def url(self):
         return ''
-- 
cgit v1.2.3


From 7ea7e780b775680be3050a8d6eb71f63b5a1fd34 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Tue, 23 Sep 2008 19:55:18 -0700
Subject: Updating pygments styles to better match new toolbar styles.

---
 debug_toolbar/panels/sql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index b99709f..e4e3c02 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -72,7 +72,7 @@ def reformat_sql(sql):
         from pygments import highlight
         from pygments.lexers import SqlLexer
         from pygments.formatters import HtmlFormatter
-        sql = highlight(sql, SqlLexer(), HtmlFormatter(noclasses=True))
+        sql = highlight(sql, SqlLexer(), HtmlFormatter())
     except ImportError:
         pass
     return sql
-- 
cgit v1.2.3


From 159e690ff3d07c8821332942ae722bdf0bdf5208 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Tue, 23 Sep 2008 21:06:39 -0700
Subject: Add catch for non JSON serializable objects and don't show the
 EXPLAIN link for these.

---
 debug_toolbar/panels/sql.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index e4e3c02..9223cb7 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -16,12 +16,17 @@ class DatabaseStatTracker(util.CursorDebugWrapper):
             return self.cursor.execute(sql, params)
         finally:
             stop = time.time()
+            _params = None
+            try:
+                _params = simplejson.dumps(params)
+            except TypeError:
+                pass # object not JSON serializable
             # We keep `sql` to maintain backwards compatibility
             self.db.queries.append({
                 'sql': self.db.ops.last_executed_query(self.cursor, sql, params),
                 'time': stop - start,
                 'raw_sql': sql,
-                'params': simplejson.dumps(params),
+                'params': _params
             })
 util.CursorDebugWrapper = DatabaseStatTracker
 
-- 
cgit v1.2.3


From d74431411b5c390379bcac89a60628a26365d8c9 Mon Sep 17 00:00:00 2001
From: Jannis Leidel
Date: Wed, 24 Sep 2008 12:40:02 +0200
Subject: Added context processors to TemplateDebugPanel

---
 debug_toolbar/panels/template.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index eb20079..9cab618 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -4,6 +4,7 @@ from django.core.signals import request_started
 from django.dispatch import Signal
 from django.template.loader import render_to_string
 from django.test.signals import template_rendered
+from django.template.context import get_standard_processors
 from debug_toolbar.panels import DebugPanel
 
 # Code taken and adapted from Simon Willison and Django Snippets:
@@ -44,6 +45,11 @@ class TemplateDebugPanel(DebugPanel):
     def url(self):
         return ''
 
+    def process_request(self, request):
+        self.context_processors = dict(
+            [("%s.%s" % (k.__module__, k.__name__), pformat(k(request))) for k in get_standard_processors()]
+        )
+
     def content(self):
         template_context = []
         for i, d in enumerate(self.templates):
@@ -65,5 +71,6 @@ class TemplateDebugPanel(DebugPanel):
         context = {
             'templates': template_context,
             'template_dirs': settings.TEMPLATE_DIRS,
+            'context_processors': self.context_processors,
         }
         return render_to_string('debug_toolbar/panels/templates.html', context)
-- 
cgit v1.2.3


From 85d879803c88aa036934d36977a10b5d28b70aaa Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Wed, 24 Sep 2008 16:23:01 -0700
Subject: Adding a SHA-1 hash to the parameters passed to get the EXPLAIN query
 to avoid any sort of tampering of the SQL or parameters.

---
 debug_toolbar/panels/sql.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 9223cb7..22d65a7 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -1,9 +1,11 @@
 import time
 from debug_toolbar.panels import DebugPanel
+from django.conf import settings
 from django.db import connection
 from django.db.backends import util
 from django.template.loader import render_to_string
 from django.utils import simplejson
+from django.utils.hashcompat import sha_constructor
 
 class DatabaseStatTracker(util.CursorDebugWrapper):
     """
@@ -26,7 +28,8 @@ class DatabaseStatTracker(util.CursorDebugWrapper):
                 'sql': self.db.ops.last_executed_query(self.cursor, sql, params),
                 'time': stop - start,
                 'raw_sql': sql,
-                'params': _params
+                'params': _params,
+                'hash': sha_constructor(settings.SECRET_KEY + sql + _params).hexdigest(),
             })
 util.CursorDebugWrapper = DatabaseStatTracker
 
@@ -37,7 +40,7 @@ class SQLDebugPanel(DebugPanel):
     """
     name = 'SQL'
     has_content = True
-    
+
     def __init__(self):
         self._offset = len(connection.queries)
         self._sql_time = 0
-- 
cgit v1.2.3