Adjusted to match the new master TemplateField changes. Switched the setting of _embe...

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

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 62d8d2a..30480eb 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -10,6 +10,8 @@ from philo.utils import paginate
 from philo.contrib.penfield.validators import validate_pagination_count
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
 from philo.contrib.penfield.utils import FeedMultiViewMixin
+from philo.contrib.penfield.embed import *
+from django.template import add_to_builtins as register_templatetags
 
 
 class Blog(Entity, Titled):
@@ -75,10 +77,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:
@@ -201,8 +199,28 @@ class BlogView(MultiView, FeedMultiViewMixin):
                
                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()
@@ -241,8 +259,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 = EmbedField(null=True, blank=True, verbose_name='Summary')
+       full_text = EmbedField()
        tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)
        
        class Meta:
@@ -294,10 +312,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:
@@ -408,5 +422,25 @@ 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)
+
+
+register_templatetags('philo.contrib.penfield.templatetags.embed')
\ No newline at end of file