X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/344bace6dc955286a59480e8bf538ab524a7ee9f..85eb51c030b89dba1c940a8508f1ae1ced1178d4:/philo/models/nodes.py

diff --git a/philo/models/nodes.py b/philo/models/nodes.py
index 899303f..6eeb965 100644
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@ -8,17 +8,19 @@ from django.core.servers.basehttp import FileWrapper
 from django.core.urlresolvers import resolve, clear_url_caches, reverse, NoReverseMatch
 from django.db import models
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect, Http404
-from django.template import add_to_builtins as register_templatetags
 from django.utils.encoding import smart_str
 
 from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED, ViewCanNotProvideSubpath, ViewDoesNotProvideSubpaths
-from philo.models.base import TreeEntity, Entity, QuerySetMapper, register_value_model
+from philo.models.base import TreeEntity, Entity, register_value_model
 from philo.models.fields import JSONField
 from philo.utils import ContentTypeSubclassLimiter
-from philo.validators import RedirectValidator
+from philo.utils.entities import LazyPassthroughAttributeMapper
 from philo.signals import view_about_to_render, view_finished_rendering
 
 
+__all__ = ('Node', 'View', 'MultiView', 'Redirect', 'File')
+
+
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)
 
 
@@ -27,8 +29,8 @@ class Node(TreeEntity):
 	:class:`Node`\ s are the basic building blocks of a website using Philo. They define the URL hierarchy and connect each URL to a :class:`View` subclass instance which is used to generate an HttpResponse.
 	
 	"""
-	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter)
-	view_object_id = models.PositiveIntegerField()
+	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter, blank=True, null=True)
+	view_object_id = models.PositiveIntegerField(blank=True, null=True)
 	#: :class:`GenericForeignKey` to a non-abstract subclass of :class:`View`
 	view = generic.GenericForeignKey('view_content_type', 'view_object_id')
 	
@@ -40,11 +42,15 @@ class Node(TreeEntity):
 		return False
 	
 	def handles_subpath(self, subpath):
-		return self.view.handles_subpath(subpath)
+		if self.view:
+			return self.view.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`"""
-		return self.view.render_to_response(request, extra_context)
+		if self.view:
+			return self.view.render_to_response(request, extra_context)
+		raise Http404
 	
 	def get_absolute_url(self, request=None, with_domain=False, secure=False):
 		"""
@@ -171,12 +177,12 @@ class View(Entity):
 		"""
 		raise NotImplementedError("View subclasses must implement get_reverse_params to support subpaths.")
 	
-	def attributes_with_node(self, node):
+	def attributes_with_node(self, node, mapper=LazyPassthroughAttributeMapper):
 		"""
-		Returns a :class:`~philo.models.base.QuerySetMapper` using the :class:`Node`'s attributes as a passthrough.
+		Returns a :class:`LazyPassthroughAttributeMapper` which can be used to directly retrieve the values of :class:`Attribute`\ s related to the :class:`View`, falling back on the :class:`Attribute`\ s of the passed-in :class:`Node` and its ancestors.
 		
 		"""
-		return QuerySetMapper(self.attribute_set, passthrough=node.attributes)
+		return mapper((self, node))
 	
 	def render_to_response(self, request, extra_context=None):
 		"""
@@ -289,10 +295,10 @@ class MultiView(View):
 
 class TargetURLModel(models.Model):
 	"""An abstract parent class for models which deal in targeting a url."""
-	#: An optional :class:`ForeignKey` to a :class:`Node`. If provided, that node will be used as the basis for the redirect.
+	#: An optional :class:`ForeignKey` to a :class:`.Node`. If provided, that node will be used as the basis for the redirect.
 	target_node = models.ForeignKey(Node, blank=True, null=True, related_name="%(app_label)s_%(class)s_related")
-	#: A :class:`CharField` which may contain an absolute or relative URL. This will be validated with :class:`philo.validators.RedirectValidator`.
-	url_or_subpath = models.CharField(max_length=200, validators=[RedirectValidator()], blank=True, help_text="Point to this url or, if a node is defined and accepts subpaths, this subpath of the node.")
+	#: A :class:`CharField` which may contain an absolute or relative URL, or the name of a node's subpath.
+	url_or_subpath = models.CharField(max_length=200, blank=True, help_text="Point to this url or, if a node is defined and accepts subpaths, this subpath of the node.")
 	#: A :class:`~philo.models.fields.JSONField` instance. If the value of :attr:`reversing_parameters` is not None, the :attr:`url_or_subpath` will be treated as the name of a view to be reversed. The value of :attr:`reversing_parameters` will be passed into the reversal as args if it is a list or as kwargs if it is a dictionary. Otherwise it will be ignored.
 	reversing_parameters = JSONField(blank=True, help_text="If reversing parameters are defined, url_or_subpath will instead be interpreted as the view name to be reversed.")
 	
@@ -387,5 +393,4 @@ class File(View):
 		return self.file.name
 
 
-register_templatetags('philo.templatetags.nodes')
 register_value_model(Node)
\ No newline at end of file