X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/344bace6dc955286a59480e8bf538ab524a7ee9f..d9b68c3cf5a53bdce3fbb52e830d875537f69c26:/philo/models/nodes.py diff --git a/philo/models/nodes.py b/philo/models/nodes.py index 899303f..93f772a 100644 --- a/philo/models/nodes.py +++ b/philo/models/nodes.py @@ -1,4 +1,6 @@ from inspect import getargspec +import mimetypes +from os.path import basename from django.contrib.contenttypes import generic from django.contrib.contenttypes.models import ContentType @@ -8,21 +10,23 @@ 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 SlugTreeEntity, 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) -class Node(TreeEntity): +class Node(SlugTreeEntity): """ :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. @@ -102,7 +106,7 @@ class Node(TreeEntity): return '%s%s%s%s' % (domain, root_url, path, subpath) - class Meta: + class Meta(SlugTreeEntity.Meta): app_label = 'philo' @@ -171,12 +175,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): """ @@ -233,7 +237,7 @@ class MultiView(View): """ clear_url_caches() - subpath = request.node.subpath + subpath = request.node._subpath view, args, kwargs = resolve(subpath, urlconf=self) view_args = getargspec(view) if extra_context is not None and ('extra_context' in view_args[0] or view_args[2] is not None): @@ -289,10 +293,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.") @@ -368,24 +372,32 @@ class Redirect(TargetURLModel, View): class File(View): """Stores an arbitrary file.""" - #: Defines the mimetype of the uploaded file. This will not be validated. - mimetype = models.CharField(max_length=255) + #: The name of the uploaded file. This is meant for finding the file again later, not for display. + name = models.CharField(max_length=255) + #: Defines the mimetype of the uploaded file. This will not be validated. If no mimetype is provided, it will be automatically generated based on the filename. + mimetype = models.CharField(max_length=255, blank=True) #: Contains the uploaded file. Files are uploaded to ``philo/files/%Y/%m/%d``. file = models.FileField(upload_to='philo/files/%Y/%m/%d') + def clean(self): + if not self.mimetype: + self.mimetype = mimetypes.guess_type(self.file.name, strict=False)[0] + if self.mimetype is None: + raise ValidationError("Unknown file type.") + def actually_render_to_response(self, request, extra_context=None): wrapper = FileWrapper(self.file) response = HttpResponse(wrapper, content_type=self.mimetype) response['Content-Length'] = self.file.size + response['Content-Disposition'] = "inline; filename=%s" % basename(self.file.name) return response class Meta: app_label = 'philo' def __unicode__(self): - """Returns the path of the uploaded file.""" - return self.file.name + """Returns the value of :attr:`File.name`.""" + return self.name -register_templatetags('philo.templatetags.nodes') register_value_model(Node) \ No newline at end of file