Merge branch 'master' of git://github.com/melinath/philo

[philo.git] / philo / middleware.py

diff --git a/philo/middleware.py b/philo/middleware.py
index b90067a..037fdc8 100644 (file)
--- a/philo/middleware.py
+++ b/philo/middleware.py
@@ -3,56 +3,47 @@ from django.contrib.sites.models import Site
 from django.http import Http404
 
 from philo.models import Node, View
+from philo.utils.lazycompat import SimpleLazyObject
 
 
-class LazyNode(object):
-       def __get__(self, request, obj_type=None):
-               if not hasattr(request, '_cached_node_path'):
-                       return None
-               
-               if not hasattr(request, '_found_node'):
-                       try:
-                               current_site = Site.objects.get_current()
-                       except Site.DoesNotExist:
-                               current_site = None
-                       
-                       path = request._cached_node_path
-                       trailing_slash = False
-                       if path[-1] == '/':
-                               trailing_slash = True
-                       
-                       try:
-                               node, subpath = Node.objects.get_with_path(path, root=getattr(current_site, 'root_node', None), absolute_result=False)
-                       except Node.DoesNotExist:
-                               node = None
-                       else:
-                               if subpath is None:
-                                       subpath = ""
-                               subpath = "/" + subpath
-                               
-                               if not node.handles_subpath(subpath):
-                                       node = None
-                               else:
-                                       if trailing_slash and subpath[-1] != "/":
-                                               subpath += "/"
-                                       
-                                       node.subpath = subpath
-                       
-                       request._found_node = node
-               
-               return request._found_node
+def get_node(path):
+       """Returns a :class:`Node` instance at ``path`` (relative to the current site) or ``None``."""
+       try:
+               current_site = Site.objects.get_current()
+       except Site.DoesNotExist:
+               current_site = None
+       
+       trailing_slash = False
+       if path[-1] == '/':
+               trailing_slash = True
+       
+       try:
+               node, subpath = Node.objects.get_with_path(path, root=getattr(current_site, 'root_node', None), absolute_result=False)
+       except Node.DoesNotExist:
+               return None
+       
+       if subpath is None:
+               subpath = ""
+       subpath = "/" + subpath
+       
+       if trailing_slash and subpath[-1] != "/":
+               subpath += "/"
+       
+       node._path = path
+       node._subpath = subpath
+       
+       return node
 
 
 class RequestNodeMiddleware(object):
        """Adds a ``node`` attribute, representing the currently-viewed node, to every incoming :class:`HttpRequest` object. This is required by :func:`philo.views.node_view`."""
-       def process_request(self, request):
-               request.__class__.node = LazyNode()
-       
        def process_view(self, request, view_func, view_args, view_kwargs):
                try:
-                       request._cached_node_path = view_kwargs['path']
+                       path = view_kwargs['path']
                except KeyError:
-                       pass
+                       request.node = None
+               else:
+                       request.node = SimpleLazyObject(lambda: get_node(path))
        
        def process_exception(self, request, exception):
                if settings.DEBUG or not hasattr(request, 'node') or not request.node: