X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/9cbb247dfb4faa47617438770bb6135155fade16..4fcb99e48c980dfa220d219a093745e58fdf5371:/philo/models/nodes.py?ds=sidebyside

diff --git a/philo/models/nodes.py b/philo/models/nodes.py
index 44a4d31..58adb6e 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, register_value_model
 from philo.models.fields import JSONField
-from philo.utils import ContentTypeSubclassLimiter, LazyPassthroughAttributeMapper
-from philo.validators import RedirectValidator
+from philo.utils import ContentTypeSubclassLimiter
+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)
 
 
@@ -133,17 +135,14 @@ class View(Entity):
 		
 		If ``obj`` is provided, :meth:`get_reverse_params` will be called and the results will be combined with any ``view_name``, ``args``, and ``kwargs`` that may have been passed in.
 		
-		This method will raise the following exceptions:
-		
-		- :class:`~philo.exceptions.ViewDoesNotProvideSubpaths` if :attr:`accepts_subpath` is False.
-		- :class:`~philo.exceptions.ViewCanNotProvideSubpath` if a reversal is not possible.
-		
 		:param view_name: The name of the view to be reversed.
 		:param args: Extra args for reversing the view.
 		:param kwargs: A dictionary of arguments for reversing the view.
 		:param node: The node whose subpath this is.
 		:param obj: An object to be passed to :meth:`get_reverse_params` to generate a view_name, args, and kwargs for reversal.
 		:returns: A subpath beyond the node that reverses the view, or an absolute url that reverses the view if a node was passed in.
+		:except philo.exceptions.ViewDoesNotProvideSubpaths: if :attr:`accepts_subpath` is False
+		:except philo.exceptions.ViewCanNotProvideSubpath: if a reversal is not possible.
 		
 		"""
 		if not self.accepts_subpath:
@@ -174,12 +173,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 dictionary-like object which can be used to directly retrieve the values of :class:`Attribute`\ s related to the :class:`View`, falling back on similar object which retrieves the values of the passed-in node and its ancestors.
+		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 LazyPassthroughAttributeMapper((self, node))
+		return mapper((self, node))
 	
 	def render_to_response(self, request, extra_context=None):
 		"""
@@ -294,8 +293,8 @@ 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.
 	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.")
 	
@@ -390,5 +389,4 @@ class File(View):
 		return self.file.name
 
 
-register_templatetags('philo.templatetags.nodes')
 register_value_model(Node)
\ No newline at end of file