Added get_item_queryset method to BlogView and NewsletterView so that subclasses...

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

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 6550f8a..6b6b1f7 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -1,14 +1,15 @@
-from django.db import models

 from django.conf import settings
 from django.conf import settings

-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.conf.urls.defaults import url, patterns, include

+from django.db import models

 from django.http import Http404
 from django.http import Http404

-from datetime import date, datetime
-from philo.utils import paginate
-from philo.contrib.penfield.validators import validate_pagination_count
+from django.template import loader, Context

 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed

+from datetime import date, datetime

 from philo.contrib.penfield.utils import FeedMultiViewMixin
 from philo.contrib.penfield.utils import FeedMultiViewMixin

+from philo.contrib.penfield.validators import validate_pagination_count
+from philo.exceptions import ViewCanNotProvideSubpath
+from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model, TemplateField
+from philo.utils import paginate

 
 
 class Blog(Entity, Titled):
 
 
 class Blog(Entity, Titled):


@@ -29,14 +30,20 @@ register_value_model(Blog)
 class BlogEntry(Entity, Titled):
        blog = models.ForeignKey(Blog, related_name='entries', blank=True, null=True)
        author = models.ForeignKey(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='blogentries')
 class BlogEntry(Entity, Titled):
        blog = models.ForeignKey(Blog, related_name='entries', blank=True, null=True)
        author = models.ForeignKey(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='blogentries')

-       date = models.DateTimeField(default=datetime.now)
+       date = models.DateTimeField(default=None)

        content = models.TextField()
        excerpt = models.TextField(blank=True, null=True)
        tags = models.ManyToManyField(Tag, related_name='blogentries', blank=True, null=True)
        
        content = models.TextField()
        excerpt = models.TextField(blank=True, null=True)
        tags = models.ManyToManyField(Tag, related_name='blogentries', blank=True, null=True)
        

+       def save(self, *args, **kwargs):
+               if self.date is None:
+                       self.date = datetime.now()
+               super(BlogEntry, self).save(*args, **kwargs)
+       

        class Meta:
                ordering = ['-date']
                verbose_name_plural = "blog entries"
        class Meta:
                ordering = ['-date']
                verbose_name_plural = "blog entries"

+               get_latest_by = "date"

 
 
 register_value_model(BlogEntry)
 
 
 register_value_model(BlogEntry)


@@ -97,19 +104,21 @@ class BlogView(MultiView, FeedMultiViewMixin):
                        return 'entries_by_day', [], kwargs
                raise ViewCanNotProvideSubpath
        
                        return 'entries_by_day', [], kwargs
                raise ViewCanNotProvideSubpath
        

-       def get_context(self):
-               return {'blog': self.blog}
-       

        @property
        def urlpatterns(self):
                urlpatterns = patterns('',
                        url(r'^', include(self.feed_patterns(self.get_all_entries, self.index_page, 'index'))),
        @property
        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]*)/%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'),
+               )
+               if self.feeds_enabled:
+                       urlpatterns += patterns('',
+                               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'),
+                       )
+               urlpatterns += patterns('',

                        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('',
                        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('',

-                               url((r'^(?:%s)/?$' % self.tag_permalink_base), self.tag_archive_view)
+                               url((r'^(?:%s)/?$' % self.tag_permalink_base), self.basic_view('tag_archive_page'))

                        )
                
                if self.entry_archive_page:
                        )
                
                if self.entry_archive_page:


@@ -148,13 +157,19 @@ class BlogView(MultiView, FeedMultiViewMixin):
                        )
                return urlpatterns
        
                        )
                return urlpatterns
        

+       def get_context(self):
+               return {'blog': self.blog}
+       
+       def get_item_queryset(self):
+               return self.blog.entries.all()
+       

        def get_all_entries(self, request, extra_context=None):
        def get_all_entries(self, request, extra_context=None):

-               return self.blog.entries.all(), extra_context
+               return self.get_item_queryset(), extra_context

        
        def get_entries_by_ymd(self, request, year=None, month=None, day=None, extra_context=None):
                if not self.entry_archive_page:
                        raise Http404
        
        def get_entries_by_ymd(self, request, year=None, month=None, day=None, extra_context=None):
                if not self.entry_archive_page:
                        raise Http404

-               entries = self.blog.entries.all()
+               entries = self.get_item_queryset()

                if year:
                        entries = entries.filter(date__year=year)
                if month:
                if year:
                        entries = entries.filter(date__year=year)
                if month:


@@ -167,31 +182,33 @@ class BlogView(MultiView, FeedMultiViewMixin):
                return entries, context
        
        def get_entries_by_tag(self, request, tag_slugs, extra_context=None):
                return entries, context
        
        def get_entries_by_tag(self, request, tag_slugs, extra_context=None):

-               tags = []
-               for tag_slug in tag_slugs.replace('+', '/').split('/'):
-                       if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /)
-                               try:
-                                       tag = self.blog.entry_tags.get(slug=tag_slug)
-                               except:
-                                       raise Http404
-                               tags.append(tag)
-               if len(tags) <= 0:
+               tag_slugs = tag_slugs.replace('+', '/').split('/')
+               tags = self.blog.entry_tags.filter(slug__in=tag_slugs)
+               
+               if not tags:

                        raise Http404
                        raise Http404

+               
+               # Raise a 404 on an incorrect slug.
+               found_slugs = [tag.slug for tag in tags]
+               for slug in tag_slugs:
+                       if slug and slug not in found_slugs:
+                               raise Http404

 
 

-               entries = self.blog.entries.all()
+               entries = self.get_item_queryset()

                for tag in tags:
                        entries = entries.filter(tags=tag)
                
                for tag in tags:
                        entries = entries.filter(tags=tag)
                

-               context = self.get_context()
-               context.update(extra_context or {})
+               context = extra_context or {}

                context.update({'tags': tags})
                
                return entries, context
        
        def add_item(self, feed, obj, kwargs=None):
                context.update({'tags': tags})
                
                return entries, context
        
        def add_item(self, feed, obj, kwargs=None):

+               title = loader.get_template("penfield/feeds/blog_entry/title.html")
+               description = loader.get_template("penfield/feeds/blog_entry/description.html")

                defaults = {
                defaults = {

-                       'title': obj.title,
-                       'description': obj.excerpt or obj.content,
+                       'title': title.render(Context({'entry': obj})),
+                       'description': description.render(Context({'entry': obj})),

                        'author_name': obj.author.get_full_name(),
                        'pubdate': obj.date
                }
                        'author_name': obj.author.get_full_name(),
                        'pubdate': obj.date
                }


@@ -212,7 +229,7 @@ class BlogView(MultiView, FeedMultiViewMixin):
                return super(BlogView, self).get_feed(feed_type, extra_context, defaults)
        
        def entry_view(self, request, slug, year=None, month=None, day=None, extra_context=None):
                return super(BlogView, self).get_feed(feed_type, extra_context, defaults)
        
        def entry_view(self, request, slug, year=None, month=None, day=None, extra_context=None):

-               entries = self.blog.entries.all()
+               entries = self.get_item_queryset()

                if year:
                        entries = entries.filter(date__year=year)
                if month:
                if year:
                        entries = entries.filter(date__year=year)
                if month:


@@ -227,14 +244,6 @@ class BlogView(MultiView, FeedMultiViewMixin):
                context.update(extra_context or {})
                context.update({'entry': entry})
                return self.entry_page.render_to_response(request, extra_context=context)
                context.update(extra_context or {})
                context.update({'entry': entry})
                return self.entry_page.render_to_response(request, extra_context=context)

-       
-       def tag_archive_view(self, request, extra_context=None):
-               if not self.tag_archive_page:
-                       raise Http404
-               context = {}
-               context.update(extra_context or {})
-               context.update({'blog': self.blog})
-               return self.tag_archive_page.render_to_response(request, extra_context=context)

 
 
 class Newsletter(Entity, Titled):
 
 
 class Newsletter(Entity, Titled):


@@ -247,11 +256,16 @@ register_value_model(Newsletter)
 class NewsletterArticle(Entity, Titled):
        newsletter = models.ForeignKey(Newsletter, related_name='articles')
        authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsletterarticles')
 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)
+       date = models.DateTimeField(default=None)

        lede = TemplateField(null=True, blank=True, verbose_name='Summary')
        full_text = TemplateField(db_index=True)
        tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)
        
        lede = TemplateField(null=True, blank=True, verbose_name='Summary')
        full_text = TemplateField(db_index=True)
        tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)
        

+       def save(self, *args, **kwargs):
+               if self.date is None:
+                       self.date = datetime.now()
+               super(NewsletterArticle, self).save(*args, **kwargs)
+       

        class Meta:
                get_latest_by = 'date'
                ordering = ['-date']
        class Meta:
                get_latest_by = 'date'
                ordering = ['-date']


@@ -332,7 +346,7 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                )
                if self.issue_archive_page:
                        urlpatterns += patterns('',
                )
                if self.issue_archive_page:
                        urlpatterns += patterns('',

-                               url(r'^(?:%s)/$' % self.issue_permalink_base, self.issue_archive_view)
+                               url(r'^(?:%s)/$' % self.issue_permalink_base, self.basic_view('issue_archive_page'))

                        )
                if self.article_archive_page:
                        urlpatterns += patterns('',
                        )
                if self.article_archive_page:
                        urlpatterns += patterns('',


@@ -373,28 +387,31 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
        def get_context(self):
                return {'newsletter': self.newsletter}
        
        def get_context(self):
                return {'newsletter': self.newsletter}
        

+       def get_item_queryset(self):
+               return self.newsletter.articles.all()
+       

        def get_all_articles(self, request, extra_context=None):
        def get_all_articles(self, request, extra_context=None):

-               return self.newsletter.articles.all(), extra_context
+               return self.get_item_queryset(), extra_context

        
        def get_articles_by_ymd(self, request, year, month=None, day=None, extra_context=None):
        
        def get_articles_by_ymd(self, request, year, month=None, day=None, extra_context=None):

-               articles = self.newsletter.articles.filter(dat__year=year)
+               articles = self.get_item_queryset().filter(date__year=year)

                if month:
                        articles = articles.filter(date__month=month)
                if day:
                        articles = articles.filter(date__day=day)
                if month:
                        articles = articles.filter(date__month=month)
                if day:
                        articles = articles.filter(date__day=day)

-               return articles
+               return articles, extra_context

        
        def get_articles_by_issue(self, request, numbering, extra_context=None):
                try:
                        issue = self.newsletter.issues.get(numbering=numbering)
        
        def get_articles_by_issue(self, request, numbering, extra_context=None):
                try:
                        issue = self.newsletter.issues.get(numbering=numbering)

-               except:
+               except NewsletterIssue.DoesNotExist:

                        raise Http404
                context = extra_context or {}
                context.update({'issue': issue})
                        raise Http404
                context = extra_context or {}
                context.update({'issue': issue})

-               return issue.articles.all(), context
+               return self.get_item_queryset().filter(issues=issue), context

        
        def article_view(self, request, slug, year=None, month=None, day=None, extra_context=None):
        
        def article_view(self, request, slug, year=None, month=None, day=None, extra_context=None):

-               articles = self.newsletter.articles.all()
+               articles = self.get_item_queryset()

                if year:
                        articles = articles.filter(date__year=year)
                if month:
                if year:
                        articles = articles.filter(date__year=year)
                if month:


@@ -403,27 +420,21 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        articles = articles.filter(date__day=day)
                try:
                        article = articles.get(slug=slug)
                        articles = articles.filter(date__day=day)
                try:
                        article = articles.get(slug=slug)

-               except:
+               except NewsletterArticle.DoesNotExist:

                        raise Http404
                context = self.get_context()
                context.update(extra_context or {})
                context.update({'article': article})
                return self.article_page.render_to_response(request, extra_context=context)
        
                        raise Http404
                context = self.get_context()
                context.update(extra_context or {})
                context.update({'article': article})
                return self.article_page.render_to_response(request, extra_context=context)
        

-       def issue_archive_view(self, request, extra_context=None):
-               if not self.issue_archive_page:
-                       raise Http404
-               context = {}
-               context.update(extra_context or {})
-               context.update({'newsletter': self.newsletter})
-               return self.issue_archive_page.render_to_response(request, extra_context=context)
-       

        def add_item(self, feed, obj, kwargs=None):
        def add_item(self, feed, obj, kwargs=None):

+               title = loader.get_template("penfield/feeds/newsletter_article/title.html")
+               description = loader.get_template("penfield/feeds/newsletter_article/description.html")

                defaults = {
                defaults = {

-                       'title': obj.title,
+                       'title': title.render(Context({'article': obj})),

                        'author_name': ', '.join([author.get_full_name() for author in obj.authors.all()]),
                        'pubdate': obj.date,
                        'author_name': ', '.join([author.get_full_name() for author in obj.authors.all()]),
                        'pubdate': obj.date,

-                       'description': obj.lede or obj.full_text,
+                       'description': description.render(Context({'article': obj})),

                        'categories': [tag.name for tag in obj.tags.all()]
                }
                defaults.update(kwargs or {})
                        'categories': [tag.name for tag in obj.tags.all()]
                }
                defaults.update(kwargs or {})


@@ -436,4 +447,4 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        'title': title
                }
                defaults.update(kwargs or {})
                        'title': title
                }
                defaults.update(kwargs or {})

-               return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults)
\ No newline at end of file
+               return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults)