X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/a79b7c9e4f8038db3795b482c78b2c6d7f64bebb..3c26965045e8881acd4d5de8c195e4aa61b95ed1:/models/pages.py?ds=sidebyside

diff --git a/models/pages.py b/models/pages.py
index ef68b5f..86db88f 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -5,16 +5,70 @@ from django.contrib.contenttypes import generic
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.http import HttpResponse
-from django.template import TemplateDoesNotExist, Context, RequestContext, Template as DjangoTemplate, add_to_builtins as register_templatetags
+from django.template import TemplateDoesNotExist, Context, RequestContext, Template as DjangoTemplate, add_to_builtins as register_templatetags, TextNode, VariableNode
+from django.template.loader_tags import BlockNode, ExtendsNode, BlockContext
+from django.utils.datastructures import SortedDict
 from philo.models.base import TreeModel, register_value_model
 from philo.models.fields import TemplateField
 from philo.models.nodes import View
 from philo.templatetags.containers import ContainerNode
-from philo.utils import fattr, nodelist_crawl
+from philo.utils import fattr
 from philo.validators import LOADED_TEMPLATE_ATTR
 from philo.signals import page_about_to_render_to_string, page_finished_rendering_to_string
 
 
+class LazyContainerFinder(object):
+	def __init__(self, nodes, extends=False):
+		self.nodes = nodes
+		self.initialized = False
+		self.contentlet_specs = set()
+		self.contentreference_specs = SortedDict()
+		self.blocks = {}
+		self.block_super = False
+		self.extends = extends
+	
+	def process(self, nodelist):
+		for node in nodelist:
+			if self.extends:
+				if isinstance(node, BlockNode):
+					self.blocks[node.name] = block = LazyContainerFinder(node.nodelist)
+					block.initialize()
+					self.blocks.update(block.blocks)
+				continue
+			
+			if isinstance(node, ContainerNode):
+				if not node.references:
+					self.contentlet_specs.add(node.name)
+				else:
+					if node.name not in self.contentreference_specs.keys():
+						self.contentreference_specs[node.name] = node.references
+				continue
+			
+			if isinstance(node, VariableNode):
+				if node.filter_expression.var.lookups == (u'block', u'super'):
+					self.block_super = True
+			
+			if hasattr(node, 'child_nodelists'):
+				for nodelist_name in node.child_nodelists:
+					if hasattr(node, nodelist_name):
+						nodelist = getattr(node, nodelist_name)
+						self.process(nodelist)
+			
+			# 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 and declares it on any native nodes.
+			if hasattr(node, LOADED_TEMPLATE_ATTR):
+				loaded_template = getattr(node, LOADED_TEMPLATE_ATTR)
+				if loaded_template:
+					nodelist = loaded_template.nodelist
+					self.process(nodelist)
+	
+	def initialize(self):
+		if not self.initialized:
+			self.process(self.nodes)
+			self.initialized = True
+
+
 class Template(TreeModel):
 	name = models.CharField(max_length=255)
 	documentation = models.TextField(null=True, blank=True)
@@ -29,22 +83,54 @@ class Template(TreeModel):
 		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 process_node(node, nodes):
-			if isinstance(node, ContainerNode):
-				nodes.append(node)
+		template = DjangoTemplate(self.code)
 		
-		all_nodes = nodelist_crawl(DjangoTemplate(self.code).nodelist, process_node)
-		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 build_extension_tree(nodelist):
+			nodelists = []
+			extends = None
+			for node in nodelist:
+				if not isinstance(node, TextNode):
+					if isinstance(node, ExtendsNode):
+						extends = node
+					break
+			
+			if extends:
+				if extends.nodelist:
+					nodelists.append(LazyContainerFinder(extends.nodelist, extends=True))
+				loaded_template = getattr(extends, LOADED_TEMPLATE_ATTR)
+				nodelists.extend(build_extension_tree(loaded_template.nodelist))
+			else:
+				# Base case: root.
+				nodelists.append(LazyContainerFinder(nodelist))
+			return nodelists
+		
+		# Build a tree of the templates we're using, placing the root template first.
+		levels = build_extension_tree(template.nodelist)[::-1]
+		
+		contentlet_specs = set()
+		contentreference_specs = SortedDict()
+		blocks = {}
+		
+		for level in levels:
+			level.initialize()
+			contentlet_specs |= level.contentlet_specs
+			contentreference_specs.update(level.contentreference_specs)
+			for name, block in level.blocks.items():
+				if block.block_super:
+					blocks.setdefault(name, []).append(block)
+				else:
+					blocks[name] = [block]
+		
+		for block_list in blocks.values():
+			for block in block_list:
+				block.initialize()
+				contentlet_specs |= block.contentlet_specs
+				contentreference_specs.update(block.contentreference_specs)
+		
+		return contentlet_specs, contentreference_specs
 	
 	def __unicode__(self):
-		return self.get_path(pathsep=u' › ', field='name')
+		return self.name
 	
 	class Meta:
 		app_label = 'philo'