Moved a few more miscellaneous things into master from embed that did not belong...

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index b9e481b..daeb621 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -8,19 +8,38 @@ from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist
 from django.template import Context, RequestContext
 from django.template.loader import get_template
 from django.template import TemplateDoesNotExist
 from django.template import Context, RequestContext
 from django.template.loader import get_template

-from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
+from django.template.loader_tags import ExtendsNode, ConstantIncludeNode

 from django.http import HttpResponse
 from philo.models.base import TreeModel, register_value_model
 from django.http import HttpResponse
 from philo.models.base import TreeModel, register_value_model

+from philo.models.fields import TemplateField

 from philo.models.nodes import View
 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode
 from philo.models.nodes import View
 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode

+from philo.validators import LOADED_TEMPLATE_ATTR
+from philo.signals import page_about_to_render_to_string, page_finished_rendering_to_string
+
+
+BLANK_CONTEXT = Context()
+
+
+def get_extended(self):
+       return self.get_parent(BLANK_CONTEXT)
+
+
+def get_included(self):
+       return self.template
+
+
+# We ignore the IncludeNode because it will never work in a blank context.
+setattr(ExtendsNode, LOADED_TEMPLATE_ATTR, property(get_extended))
+setattr(ConstantIncludeNode, LOADED_TEMPLATE_ATTR, property(get_included))

 
 
 class Template(TreeModel):
        name = models.CharField(max_length=255)
        documentation = models.TextField(null=True, blank=True)
 
 
 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, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
-       code = models.TextField(verbose_name='django template code')
+       mimetype = models.CharField(max_length=255, default=getattr(settings, 'DEFAULT_CONTENT_TYPE', 'text/html'))
+       code = TemplateField(secure=False, verbose_name='django template code')

        
        @property
        def origin(self):
        
        @property
        def origin(self):


@@ -43,23 +62,21 @@ class Template(TreeModel):
                                nodes = []
                                for node in nodelist:
                                        try:
                                nodes = []
                                for node in nodelist:
                                        try:

-                                               for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'):
-                                                       if hasattr(node, nodelist_name):
-                                                               nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
+                                               if hasattr(node, 'child_nodelists'):
+                                                       for nodelist_name in node.child_nodelists:
+                                                               if hasattr(node, nodelist_name):
+                                                                       nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
+                                               
+                                               # LOADED_TEMPLATE_ATTR contains the name of an attribute philo uses to declare a
+                                               # node as rendering an additional template. Philo monkeypatches the attribute onto
+                                               # the relevant default nodes.
+                                               if hasattr(node, LOADED_TEMPLATE_ATTR):
+                                                       loaded_template = getattr(node, LOADED_TEMPLATE_ATTR)
+                                                       if loaded_template:
+                                                               nodes.extend(container_nodes(loaded_template))
+                                               

                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)
                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)

-                                               elif isinstance(node, ExtendsNode):
-                                                       extended_template = node.get_parent(Context())
-                                                       if extended_template:
-                                                               nodes.extend(container_nodes(extended_template))
-                                               elif isinstance(node, ConstantIncludeNode):
-                                                       included_template = node.template
-                                                       if included_template:
-                                                               nodes.extend(container_nodes(included_template))
-                                               elif isinstance(node, IncludeNode):
-                                                       included_template = get_template(node.template_name.resolve(Context()))
-                                                       if included_template:
-                                                               nodes.extend(container_nodes(included_template))

                                        except:
                                                raise # fail for this node
                                return nodes
                                        except:
                                                raise # fail for this node
                                return nodes


@@ -75,7 +92,7 @@ class Template(TreeModel):
                return contentlet_node_names, contentreference_node_specs
        
        def __unicode__(self):
                return contentlet_node_names, contentreference_node_specs
        
        def __unicode__(self):

-               return self.get_path(u' › ', 'name')
+               return self.get_path(pathsep=u' › ', field='name')

        
        @staticmethod
        @fattr(is_usable=True)
        
        @staticmethod
        @fattr(is_usable=True)


@@ -97,8 +114,28 @@ class Page(View):
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        

-       def render_to_response(self, node, request, path=None, subpath=None):
-               return HttpResponse(self.template.django_template.render(RequestContext(request, {'page': self})), mimetype=self.template.mimetype)
+       def get_containers(self):
+               if not hasattr(self, '_containers'):
+                       self._containers = self.template.containers
+               return self._containers
+       containers = property(get_containers)
+       
+       def render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None):
+               context = {}
+               context.update(extra_context or {})
+               context.update({'page': self, 'attributes': self.attributes, 'relationships': self.relationships})
+               if node and request:
+                       context.update({'node': node, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
+                       page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context)
+                       string = self.template.django_template.render(RequestContext(request, context))
+               else:
+                       page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context)
+                       string = self.template.django_template.render(Context(context))
+               page_finished_rendering_to_string.send(sender=self, string=string)
+               return string
+       
+       def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+               return HttpResponse(self.render_to_string(node, request, path, subpath, extra_context), mimetype=self.template.mimetype)

        
        def __unicode__(self):
                return self.title
        
        def __unicode__(self):
                return self.title


@@ -110,8 +147,7 @@ class Page(View):
 class Contentlet(models.Model):
        page = models.ForeignKey(Page, related_name='contentlets')
        name = models.CharField(max_length=255)
 class Contentlet(models.Model):
        page = models.ForeignKey(Page, related_name='contentlets')
        name = models.CharField(max_length=255)

-       content = models.TextField()
-       dynamic = models.BooleanField(default=False)
+       content = TemplateField()

        
        def __unicode__(self):
                return self.name
        
        def __unicode__(self):
                return self.name