X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/87170ecd588c3472ee2d1ef30b568fb9fb756e70..eeb8a55da97f1b778b78324190f502c4cf7da77c:/philo/models/nodes.py?ds=sidebyside

diff --git a/philo/models/nodes.py b/philo/models/nodes.py
index 5b8b8ed..7371a1d 100644
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@ -2,9 +2,11 @@ from inspect import getargspec
 import mimetypes
 from os.path import basename
 
+from django.conf import settings
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site, RequestSite
+from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.core.servers.basehttp import FileWrapper
 from django.core.urlresolvers import resolve, clear_url_caches, reverse, NoReverseMatch
@@ -24,6 +26,7 @@ __all__ = ('Node', 'View', 'MultiView', 'Redirect', 'File')
 
 
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)
+CACHE_PHILO_ROOT = getattr(settings, "PHILO_CACHE_PHILO_ROOT", True)
 
 
 class Node(SlugTreeEntity):
@@ -39,18 +42,20 @@ class Node(SlugTreeEntity):
 	@property
 	def accepts_subpath(self):
 		"""A property shortcut for :attr:`self.view.accepts_subpath <View.accepts_subpath>`"""
-		if self.view:
-			return self.view.accepts_subpath
+		if self.view_object_id and self.view_content_type_id:
+			return ContentType.objects.get_for_id(self.view_content_type_id).model_class().accepts_subpath
 		return False
 	
 	def handles_subpath(self, subpath):
-		if self.view:
-			return self.view.handles_subpath(subpath)
+		if self.view_object_id and self.view_content_type_id:
+			return ContentType.objects.get_for_id(self.view_content_type_id).model_class().handles_subpath(subpath)
 		return False
 	
 	def render_to_response(self, request, extra_context=None):
 		"""This is a shortcut method for :meth:`View.render_to_response`"""
-		if self.view:
+		if self.view_object_id and self.view_content_type_id:
+			view_model = ContentType.objects.get_for_id(self.view_content_type_id).model_class()
+			self.view = view_model._default_manager.select_related(depth=1).get(pk=self.view_object_id)
 			return self.view.render_to_response(request, extra_context)
 		raise Http404
 	
@@ -69,6 +74,8 @@ class Node(SlugTreeEntity):
 		
 		Node urls will not contain a trailing slash unless a subpath is provided which ends with a trailing slash. Subpaths are expected to begin with a slash, as if returned by :func:`django.core.urlresolvers.reverse`.
 		
+		Because this method will be called frequently and will always try to reverse ``philo-root``, the results of that reversal will be cached by default. This can be disabled by setting :setting:`PHILO_CACHE_PHILO_ROOT` to ``False``.
+		
 		:meth:`construct_url` may raise the following exceptions:
 		
 		- :class:`NoReverseMatch` if "philo-root" is not reversable -- for example, if :mod:`philo.urls` is not included anywhere in your urlpatterns.
@@ -83,7 +90,14 @@ class Node(SlugTreeEntity):
 		
 		"""
 		# Try reversing philo-root first, since we can't do anything if that fails.
-		root_url = reverse('philo-root')
+		if CACHE_PHILO_ROOT:
+			key = "CACHE_PHILO_ROOT__" + settings.ROOT_URLCONF
+			root_url = cache.get(key)
+			if root_url is None:
+				root_url = reverse('philo-root')
+				cache.set(key, root_url)
+		else:
+			root_url = reverse('philo-root')
 		
 		try:
 			current_site = Site.objects.get_current()
@@ -126,12 +140,13 @@ class View(Entity):
 	#: A generic relation back to nodes.
 	nodes = generic.GenericRelation(Node, content_type_field='view_content_type', object_id_field='view_object_id')
 	
-	#: Property or attribute which defines whether this :class:`View` can handle subpaths. Default: ``False``
+	#: An attribute on the class which defines whether this :class:`View` can handle subpaths. Default: ``False``
 	accepts_subpath = False
 	
-	def handles_subpath(self, subpath):
+	@classmethod
+	def handles_subpath(cls, subpath):
 		"""Returns True if the :class:`View` handles the given subpath, and False otherwise."""
-		if not self.accepts_subpath and subpath != "/":
+		if not cls.accepts_subpath and subpath != "/":
 			return False
 		return True
 	
@@ -226,15 +241,6 @@ class MultiView(View):
 		"""Returns urlpatterns that point to views (generally methods on the class). :class:`MultiView`\ s can be thought of as "managing" these subpaths."""
 		raise NotImplementedError("MultiView subclasses must implement urlpatterns.")
 	
-	def handles_subpath(self, subpath):
-		if not super(MultiView, self).handles_subpath(subpath):
-			return False
-		try:
-			resolve(subpath, urlconf=self)
-		except Http404:
-			return False
-		return True
-	
 	def actually_render_to_response(self, request, extra_context=None):
 		"""
 		Resolves the remaining subpath left after finding this :class:`View`'s node using :attr:`self.urlpatterns <urlpatterns>` and renders the view function (or method) found with the appropriate args and kwargs.