X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/72fac53a4cd42e6c9f56a581a85f8b47ba61b2ac..0fe338c484fdfd43a3cdc919c26a2de1307b141e:/models.py?ds=sidebyside diff --git a/models.py b/models.py index 4eb50f7..265df32 100644 --- a/models.py +++ b/models.py @@ -5,30 +5,29 @@ from django.contrib.contenttypes import generic from django.contrib.contenttypes.models import ContentType from django.db import models from django.contrib.sites.models import Site -from utils import fattr +from philo.utils import fattr from django.template import add_to_builtins as register_templatetags from django.template import Template as DjangoTemplate from django.template import TemplateDoesNotExist from django.template import Context, RequestContext from django.core.exceptions import ObjectDoesNotExist -try: - import json -except ImportError: - import simplejson as json +from django.utils import simplejson as json from UserDict import DictMixin -from templatetags.containers import ContainerNode +from philo.templatetags.containers import ContainerNode from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode from django.template.loader import get_template -from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect +from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect from django.core.servers.basehttp import FileWrapper +from django.conf import settings +from philo.validators import URLRedirectValidator -def _ct_model_name(model): - opts = model._meta - while opts.proxy: - model = opts.proxy_for_model - opts = model._meta - return opts.object_name.lower() +def register_value_model(model): + pass + + +def unregister_value_model(model): + pass class Attribute(models.Model): @@ -38,40 +37,27 @@ class Attribute(models.Model): key = models.CharField(max_length=255) json_value = models.TextField(verbose_name='Value (JSON)', help_text='This value must be valid JSON.') - @property - def value(self): + def get_value(self): return json.loads(self.json_value) + def set_value(self, value): + self.json_value = json.dumps(value) + + def delete_value(self): + self.json_value = json.dumps(None) + + value = property(get_value, set_value, delete_value) + def __unicode__(self): return u'"%s": %s' % (self.key, self.value) class Relationship(models.Model): - _value_models = [] - - @staticmethod - def register_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name not in Relationship._value_models: - Relationship._value_models.append(model_name) - else: - raise TypeError('Relationship.register_value_model only accepts subclasses of django.db.models.Model') - - @staticmethod - def unregister_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name in Relationship._value_models: - Relationship._value_models.remove(model_name) - else: - raise TypeError('Relationship.unregister_value_model only accepts subclasses of django.db.models.Model') - entity_content_type = models.ForeignKey(ContentType, related_name='relationship_entity_set', verbose_name='Entity type') entity_object_id = models.PositiveIntegerField(verbose_name='Entity ID') entity = generic.GenericForeignKey('entity_content_type', 'entity_object_id') key = models.CharField(max_length=255) - value_content_type = models.ForeignKey(ContentType, related_name='relationship_value_set', limit_choices_to={'model__in':_value_models}, verbose_name='Value type') + value_content_type = models.ForeignKey(ContentType, related_name='relationship_value_set', verbose_name='Value type') value_object_id = models.PositiveIntegerField(verbose_name='Value ID') value = generic.GenericForeignKey('value_content_type', 'value_object_id') @@ -116,44 +102,32 @@ class Entity(models.Model): class Collection(models.Model): name = models.CharField(max_length=255) description = models.TextField(blank=True, null=True) + + @fattr(short_description='Members') + def get_count(self): + return self.members.count() + + def __unicode__(self): + return self.name + + +class CollectionMemberManager(models.Manager): + use_for_related_fields = True + + def with_model(self, model): + return model._default_manager.filter(pk__in=self.filter(member_content_type=ContentType.objects.get_for_model(model)).values_list('member_object_id', flat=True)) class CollectionMember(models.Model): - _value_models = [] - - @staticmethod - def register_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name not in CollectionMember._value_models: - CollectionMember._value_models.append(model_name) - else: - raise TypeError('CollectionMember.register_value_model only accepts subclasses of django.db.models.Model') - - @staticmethod - def unregister_value_model(model): - if issubclass(model, models.Model): - model_name = _ct_model_name(model) - if model_name in CollectionMember._value_models: - CollectionMember._value_models.remove(model_name) - else: - raise TypeError('CollectionMember.unregister_value_model only accepts subclasses of django.db.models.Model') - + objects = CollectionMemberManager() collection = models.ForeignKey(Collection, related_name='members') index = models.PositiveIntegerField(verbose_name='Index', help_text='This will determine the ordering of the item within the collection. (Optional)', null=True, blank=True) - member_content_type = models.ForeignKey(ContentType, limit_choices_to={'model__in':_value_models}, verbose_name='Member type') + member_content_type = models.ForeignKey(ContentType, verbose_name='Member type') member_object_id = models.PositiveIntegerField(verbose_name='Member ID') member = generic.GenericForeignKey('member_content_type', 'member_object_id') - - -def register_value_model(model): - Relationship.register_value_model(model) - CollectionMember.register_value_model(model) - - -def unregister_value_model(model): - Relationship.unregister_value_model(model) - CollectionMember.unregister_value_model(model) + + def __unicode__(self): + return u'%s - %s' % (self.collection, self.member) class TreeManager(models.Manager): @@ -162,18 +136,33 @@ class TreeManager(models.Manager): def roots(self): return self.filter(parent__isnull=True) - def get_with_path(self, path, root=None, pathsep='/'): + def get_with_path(self, path, root=None, absolute_result=True, pathsep='/'): + """ + Returns the object with the path, or None if there is no object with that path, + unless absolute_result is set to False, in which case it returns a tuple containing + the deepest object found along the path, and the remainder of the path after that + object as a string (or None in the case that there is no remaining path). + """ slugs = path.split(pathsep) obj = root + remaining_slugs = list(slugs) + remainder = None for slug in slugs: + remaining_slugs.remove(slug) if slug: # ignore blank slugs, handles for multiple consecutive pathseps try: obj = self.get(slug__exact=slug, parent__exact=obj) except self.model.DoesNotExist: - obj = None + if absolute_result: + obj = None + remaining_slugs.insert(0, slug) + remainder = pathsep.join(remaining_slugs) break if obj: - return obj + if absolute_result: + return obj + else: + return (obj, remainder) raise self.model.DoesNotExist('%s matching query does not exist.' % self.model._meta.object_name) @@ -183,10 +172,10 @@ class TreeModel(models.Model): slug = models.SlugField() def get_path(self, pathsep='/', field='slug'): - path = getattr(self, field) + path = getattr(self, field, '?') parent = self.parent while parent: - path = getattr(parent, field) + pathsep + path + path = getattr(parent, field, '?') + pathsep + path parent = parent.parent return path path = property(get_path) @@ -215,22 +204,71 @@ class TreeEntity(TreeModel, Entity): abstract = True -class Node(TreeEntity): +class InheritableTreeEntity(TreeEntity): instance_type = models.ForeignKey(ContentType, editable=False) def save(self, force_insert=False, force_update=False): if not hasattr(self, 'instance_type_ptr'): self.instance_type = ContentType.objects.get_for_model(self.__class__) - super(Node, self).save(force_insert, force_update) + super(InheritableTreeEntity, self).save(force_insert, force_update) @property def instance(self): - return self.instance_type.get_object_for_this_type(id=self.id) + try: + return self.instance_type.get_object_for_this_type(id=self.id) + except: + return None + def get_path(self, pathsep='/', field='slug'): + path = getattr(self.instance, field, '?') + parent = self.parent + while parent: + path = getattr(parent.instance, field, '?') + pathsep + path + parent = parent.parent + return path + path = property(get_path) + + @property + def attributes(self): + if self.parent: + return QuerySetMapper(self.instance.attribute_set, passthrough=self.parent.instance.attributes) + return QuerySetMapper(self.instance.attribute_set) + + @property + def relationships(self): + if self.parent: + return QuerySetMapper(self.instance.relationship_set, passthrough=self.parent.instance.relationships) + return QuerySetMapper(self.instance.relationship_set) + + class Meta: + abstract = True + + +class Node(InheritableTreeEntity): accepts_subpath = False def render_to_response(self, request, path=None, subpath=None): return HttpResponseServerError() + + class Meta: + unique_together = (('parent', 'slug'),) + + +class MultiNode(Node): + accepts_subpath = True + + urlpatterns = [] + + def render_to_response(self, request, path=None, subpath=None): + if not subpath: + subpath = "" + subpath = "/" + subpath + from django.core.urlresolvers import resolve + view, args, kwargs = resolve(subpath, urlconf=self) + return view(request, *args, **kwargs) + + class Meta: + abstract = True class Redirect(Node): @@ -238,8 +276,8 @@ class Redirect(Node): (302, 'Temporary'), (301, 'Permanent'), ) - target = models.URLField() - status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name="redirect type") + target = models.CharField(max_length=200,validators=[URLRedirectValidator()]) + status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type') def render_to_response(self, request, path=None, subpath=None): response = HttpResponseRedirect(self.target) @@ -262,8 +300,8 @@ class File(Node): class Template(TreeModel): name = models.CharField(max_length=255) documentation = models.TextField(null=True, blank=True) - mimetype = models.CharField(max_length=255, null=True, blank=True) - code = models.TextField() + mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE) + code = models.TextField(verbose_name='django template code') @property def origin(self): @@ -276,37 +314,46 @@ class Template(TreeModel): @property def containers(self): """ - Returns a list of names of contentlets referenced by containers. + Returns a tuple where the first item is a list of names of contentlets referenced by containers, + and the second item is a list of tuples of names and contenttypes of contentreferences referenced by containers. This will break if there is a recursive extends or includes in the template code. Due to the use of an empty Context, any extends or include tags with dynamic arguments probably won't work. """ - def container_node_names(template): - def nodelist_container_node_names(nodelist): - names = [] + def container_nodes(template): + def nodelist_container_nodes(nodelist): + nodes = [] for node in nodelist: try: - for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false'): + for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'): if hasattr(node, nodelist_name): - names.extend(nodelist_container_node_names(getattr(node, nodelist_name))) + nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name))) if isinstance(node, ContainerNode): - names.append(node.name) + nodes.append(node) elif isinstance(node, ExtendsNode): extended_template = node.get_parent(Context()) if extended_template: - names.extend(container_node_names(extended_template)) + nodes.extend(container_nodes(extended_template)) elif isinstance(node, ConstantIncludeNode): included_template = node.template if included_template: - names.extend(container_node_names(included_template)) + nodes.extend(container_nodes(included_template)) elif isinstance(node, IncludeNode): included_template = get_template(node.template_name.resolve(Context())) if included_template: - names.extend(container_node_names(included_template)) + nodes.extend(container_nodes(included_template)) except: pass # fail for this node - return names - return nodelist_container_node_names(template.nodelist) - return set(container_node_names(self.django_template)) + return nodes + return nodelist_container_nodes(template.nodelist) + all_nodes = container_nodes(self.django_template) + contentlet_node_names = set([node.name for node in all_nodes if not node.references]) + contentreference_node_names = [] + contentreference_node_specs = [] + for node in all_nodes: + if node.references and node.name not in contentreference_node_names: + contentreference_node_specs.append((node.name, node.references)) + contentreference_node_names.append(node.name) + return contentlet_node_names, contentreference_node_specs def __unicode__(self): return self.get_path(u' › ', 'name') @@ -322,6 +369,9 @@ class Template(TreeModel): class Page(Node): + """ + Represents a page - something which is rendered according to a template. The page will have a number of related Contentlets depending on the template selected - but these will appear only after the page has been saved with that template. + """ template = models.ForeignKey(Template, related_name='pages') title = models.CharField(max_length=255) @@ -341,6 +391,20 @@ class Contentlet(models.Model): name = models.CharField(max_length=255) content = models.TextField() dynamic = models.BooleanField(default=False) + + def __unicode__(self): + return self.name + + +class ContentReference(models.Model): + page = models.ForeignKey(Page, related_name='contentreferences') + name = models.CharField(max_length=255) + content_type = models.ForeignKey(ContentType, verbose_name='Content type') + content_id = models.PositiveIntegerField(verbose_name='Content ID', blank=True, null=True) + content = generic.GenericForeignKey('content_type', 'content_id') + + def __unicode__(self): + return self.name register_templatetags('philo.templatetags.containers')