Minor bugfix: moved ConstantEmbedNode DoesNotExist reraising so that it actually...

[philo.git] / contrib / penfield / models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 940f7e7..c9c024c 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.conf import settings
-from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model
+from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model, TemplateField
 from philo.exceptions import ViewCanNotProvideSubpath
 from django.conf.urls.defaults import url, patterns, include
 from django.core.urlresolvers import reverse
@@ -75,10 +75,6 @@ class BlogView(MultiView, FeedMultiViewMixin):
        def per_page(self):
                return self.entries_per_page
        
-       @property
-       def feed_title(self):
-               return self.blog.title
-       
        def get_subpath(self, obj):
                if isinstance(obj, BlogEntry):
                        if obj.blog == self.blog:
@@ -117,7 +113,8 @@ class BlogView(MultiView, FeedMultiViewMixin):
        def urlpatterns(self):
                urlpatterns = patterns('',
                        url(r'^', include(self.feed_patterns(self.get_all_entries, self.index_page, 'index'))),
-                       url((r'^(?:%s)/(?P<tag_slugs>[-\w]+[-+/\w]*)/' % self.tag_permalink_base), include(self.feed_patterns(self.get_entries_by_tag, self.tag_page, 'entries_by_tag')))
+                       url(r'^%s/(?P<tag_slugs>[-\w]+[-+/\w]*)/%s/' % (self.tag_permalink_base, self.feed_suffix), self.feed_view(self.get_entries_by_tag, 'entries_by_tag_feed'), name='entries_by_tag_feed'),
+                       url(r'^%s/(?P<tag_slugs>[-\w]+[-+/\w]*)/' % self.tag_permalink_base, self.page_view(self.get_entries_by_tag, self.tag_page), name='entries_by_tag')
                )
                if self.tag_archive_page:
                        urlpatterns += patterns('',
@@ -178,7 +175,7 @@ class BlogView(MultiView, FeedMultiViewMixin):
                context.update({'year': year, 'month': month, 'day': day})
                return entries, context
        
-       def get_entries_by_tag(self, request, node=None, extra_context=None):
+       def get_entries_by_tag(self, request, tag_slugs, node=None, extra_context=None):
                tags = []
                for tag_slug in tag_slugs.replace('+', '/').split('/'):
                        if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /)
@@ -193,13 +190,35 @@ class BlogView(MultiView, FeedMultiViewMixin):
                entries = self.blog.entries.all()
                for tag in tags:
                        entries = entries.filter(tags=tag)
-               if entries.count() <= 0:
-                       raise Http404
                
-               return entries, extra_context
+               context = self.get_context()
+               context.update(extra_context or {})
+               context.update({'tags': tags})
+               
+               return entries, context
        
-       def get_obj_description(self, obj):
-               return obj.excerpt
+       def add_item(self, feed, obj, kwargs=None):
+               defaults = {
+                       'title': obj.title,
+                       'description': obj.excerpt or obj.content,
+                       'author_name': obj.author.get_full_name(),
+                       'pubdate': obj.date
+               }
+               defaults.update(kwargs or {})
+               super(BlogView, self).add_item(feed, obj, defaults)
+       
+       def get_feed(self, feed_type, extra_context, kwargs=None):
+               tags = (extra_context or {}).get('tags', None)
+               title = self.blog.title
+               
+               if tags is not None:
+                       title += " - %s" % ', '.join([tag.name for tag in tags])
+               
+               defaults = {
+                       'title': title
+               }
+               defaults.update(kwargs or {})
+               return super(BlogView, self).get_feed(feed_type, extra_context, defaults)
        
        def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None):
                entries = self.blog.entries.all()
@@ -238,8 +257,8 @@ class NewsletterArticle(Entity, Titled):
        newsletter = models.ForeignKey(Newsletter, related_name='articles')
        authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsletterarticles')
        date = models.DateTimeField(default=datetime.now)
-       lede = models.TextField(null=True, blank=True)
-       full_text = models.TextField()
+       lede = TemplateField(null=True, blank=True, verbose_name='Summary')
+       full_text = TemplateField()
        tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)
        
        class Meta:
@@ -291,10 +310,6 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
        def __unicode__(self):
                return self.newsletter.__unicode__()
        
-       @property
-       def feed_title(self):
-               return self.newsletter.title
-       
        def get_subpath(self, obj):
                if isinstance(obj, NewsletterArticle):
                        if obj.newsletter == self.newsletter:
@@ -405,5 +420,22 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                context.update({'newsletter': self.newsletter})
                return self.issue_archive_page.render_to_response(node, request, extra_context=context)
        
-       def get_obj_description(self, obj):
-               return obj.lede or obj.full_text
\ No newline at end of file
+       def add_item(self, feed, obj, kwargs=None):
+               defaults = {
+                       'title': obj.title,
+                       'author_name': ', '.join(obj.authors),
+                       'pubdate': obj.date,
+                       'description': obj.lede or obj.full_text,
+                       'categories': [tag.name for tag in obj.tags.all()]
+               }
+               defaults.update(kwargs or {})
+               super(NewsletterView, self).add_item(feed, obj, defaults)
+       
+       def get_feed(self, feed_type, extra_context, kwargs=None):
+               title = self.newsletter.title
+               
+               defaults = {
+                       'title': title
+               }
+               defaults.update(kwargs or {})
+               return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults)
\ No newline at end of file