Added AttributeMapper caching to entity.attributes, since anyone who really needs...

[philo.git] / philo / models / nodes.py

diff --git a/philo/models/nodes.py b/philo/models/nodes.py
index 87ccb40..5de7338 100644 (file)
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@ -11,7 +11,7 @@ from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedir
 from django.utils.encoding import smart_str
 
 from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED, ViewCanNotProvideSubpath, ViewDoesNotProvideSubpaths
 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.base import SlugTreeEntity, Entity, register_value_model

 from philo.models.fields import JSONField
 from philo.utils import ContentTypeSubclassLimiter
 from philo.utils.entities import LazyPassthroughAttributeMapper
 from philo.models.fields import JSONField
 from philo.utils import ContentTypeSubclassLimiter
 from philo.utils.entities import LazyPassthroughAttributeMapper


@@ -24,7 +24,7 @@ __all__ = ('Node', 'View', 'MultiView', 'Redirect', 'File')
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)
 
 
 _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.
        
        """
        :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.
        


@@ -104,7 +104,7 @@ class Node(TreeEntity):
                
                return '%s%s%s%s' % (domain, root_url, path, subpath)
        
                
                return '%s%s%s%s' % (domain, root_url, path, subpath)
        

-       class Meta:
+       class Meta(SlugTreeEntity.Meta):

                app_label = 'philo'
 
 
                app_label = 'philo'
 
 


@@ -235,7 +235,7 @@ class MultiView(View):
                
                """
                clear_url_caches()
                
                """
                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):
                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):