X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/e3ad0b4b28aca417a136f5ed1fa9a90ee9d78a54..90165f452ceac2666255cb6112cca56e7554b007:/philo/contrib/penfield/models.py diff --git a/philo/contrib/penfield/models.py b/philo/contrib/penfield/models.py index e31de9f..c2edd8d 100644 --- a/philo/contrib/penfield/models.py +++ b/philo/contrib/penfield/models.py @@ -5,7 +5,7 @@ from django.conf.urls.defaults import url, patterns, include from django.db import models from django.http import Http404, HttpResponse -from philo.contrib.syndication.models import FeedView +from philo.contrib.winer.models import FeedView from philo.exceptions import ViewCanNotProvideSubpath from philo.models import Tag, Entity, Page, register_value_model from philo.models.fields import TemplateField @@ -83,7 +83,7 @@ register_value_model(BlogEntry) class BlogView(FeedView): """ - A subclass of :class:`FeedView` which handles patterns and feeds for a :class:`Blog` and its related :class:`entries `. + A subclass of :class:`.FeedView` which handles patterns and feeds for a :class:`Blog` and its related :class:`entries `. """ ENTRY_PERMALINK_STYLE_CHOICES = ( @@ -159,7 +159,7 @@ class BlogView(FeedView): @property def urlpatterns(self): urlpatterns = self.feed_patterns(r'^', 'get_all_entries', 'index_page', 'index') +\ - self.feed_patterns(r'^%s/(?P[-\w]+[-+/\w]*)$' % self.tag_permalink_base, 'get_entries_by_tag', 'tag_page', 'entries_by_tag') + self.feed_patterns(r'^%s/(?P[-\w]+[-+/\w]*)' % self.tag_permalink_base, 'get_entries_by_tag', 'tag_page', 'entries_by_tag') if self.tag_archive_page: urlpatterns += patterns('', @@ -200,19 +200,19 @@ class BlogView(FeedView): return {'blog': self.blog} def get_entry_queryset(self): - """Returns the default :class:`QuerySet` of :class:`BlogEntry` instances for the :class:`BlogView`.""" - return self.blog.entries.all() + """Returns the default :class:`QuerySet` of :class:`BlogEntry` instances for the :class:`BlogView` - all entries that are considered posted in the past. This allows for scheduled posting of entries.""" + return self.blog.entries.filter(date__lte=datetime.now()) def get_tag_queryset(self): """Returns the default :class:`QuerySet` of :class:`.Tag`\ s for the :class:`BlogView`'s :meth:`get_entries_by_tag` and :meth:`tag_archive_view`.""" return self.blog.entry_tags def get_all_entries(self, request, extra_context=None): - """Used to generate :meth:`~FeedView.feed_patterns` for all entries.""" + """Used to generate :meth:`~.FeedView.feed_patterns` for all entries.""" return self.get_entry_queryset(), extra_context def get_entries_by_ymd(self, request, year=None, month=None, day=None, extra_context=None): - """Used to generate :meth:`~FeedView.feed_patterns` for entries with a specific year, month, and day.""" + """Used to generate :meth:`~.FeedView.feed_patterns` for entries with a specific year, month, and day.""" if not self.entry_archive_page: raise Http404 entries = self.get_entry_queryset() @@ -228,7 +228,7 @@ class BlogView(FeedView): return entries, context def get_entries_by_tag(self, request, tag_slugs, extra_context=None): - """Used to generate :meth:`~FeedView.feed_patterns` for entries with all of the given tags.""" + """Used to generate :meth:`~.FeedView.feed_patterns` for entries with all of the given tags.""" tag_slugs = tag_slugs.replace('+', '/').split('/') tags = self.get_tag_queryset().filter(slug__in=tag_slugs) @@ -279,13 +279,13 @@ class BlogView(FeedView): }) return self.tag_archive_page.render_to_response(request, extra_context=context) - def feed_view(self, get_items_attr, reverse_name): - """Overrides :meth:`FeedView.feed_view` to add :class:`.Tag`\ s to the feed as categories.""" + def feed_view(self, get_items_attr, reverse_name, feed_type=None): + """Overrides :meth:`.FeedView.feed_view` to add :class:`.Tag`\ s to the feed as categories.""" get_items = callable(get_items_attr) and get_items_attr or getattr(self, get_items_attr) def inner(request, extra_context=None, *args, **kwargs): obj = self.get_object(request, *args, **kwargs) - feed = self.get_feed(obj, request, reverse_name) + feed = self.get_feed(obj, request, reverse_name, feed_type, *args, **kwargs) items, extra_context = get_items(request, extra_context=extra_context, *args, **kwargs) self.populate_feed(feed, items, request) @@ -304,7 +304,7 @@ class BlogView(FeedView): return inner def process_page_items(self, request, items): - """Overrides :meth:`FeedView.process_page_items` to add pagination.""" + """Overrides :meth:`.FeedView.process_page_items` to add pagination.""" if self.entries_per_page: page_num = request.GET.get('page', 1) paginator, paginated_page, items = paginate(items, self.entries_per_page, page_num) @@ -413,7 +413,7 @@ register_value_model(NewsletterIssue) class NewsletterView(FeedView): - """A subclass of :class:`FeedView` which handles patterns and feeds for a :class:`Newsletter` and its related :class:`articles `.""" + """A subclass of :class:`.FeedView` which handles patterns and feeds for a :class:`Newsletter` and its related :class:`articles `.""" ARTICLE_PERMALINK_STYLE_CHOICES = ( ('D', 'Year, month, and day'), ('M', 'Year and month'), @@ -486,9 +486,7 @@ class NewsletterView(FeedView): url(r'^%s$' % self.issue_permalink_base, self.issue_archive_view, 'issue_archive') ) if self.article_archive_page: - urlpatterns += patterns('', - url(r'^%s' % self.article_permalink_base, include(self.feed_patterns('get_all_articles', 'article_archive_page', 'articles'))) - ) + urlpatterns += self.feed_patterns(r'^%s' % self.article_permalink_base, 'get_all_articles', 'article_archive_page', 'articles') if self.article_permalink_style in 'DMY': urlpatterns += self.feed_patterns(r'^%s/(?P\d{4})' % self.article_permalink_base, 'get_articles_by_ymd', 'article_archive_page', 'articles_by_year') if self.article_permalink_style in 'DM': @@ -519,19 +517,19 @@ class NewsletterView(FeedView): return {'newsletter': self.newsletter} def get_article_queryset(self): - """Returns the default :class:`QuerySet` of :class:`NewsletterArticle` instances for the :class:`NewsletterView`.""" - return self.newsletter.articles.all() + """Returns the default :class:`QuerySet` of :class:`NewsletterArticle` instances for the :class:`NewsletterView` - all articles that are considered posted in the past. This allows for scheduled posting of articles.""" + return self.newsletter.articles.filter(date__lte=datetime.now()) def get_issue_queryset(self): """Returns the default :class:`QuerySet` of :class:`NewsletterIssue` instances for the :class:`NewsletterView`.""" return self.newsletter.issues.all() def get_all_articles(self, request, extra_context=None): - """Used to generate :meth:`FeedView.feed_patterns` for all entries.""" + """Used to generate :meth:`~.FeedView.feed_patterns` for all entries.""" return self.get_article_queryset(), extra_context def get_articles_by_ymd(self, request, year, month=None, day=None, extra_context=None): - """Used to generate :meth:`FeedView.feed_patterns` for a specific year, month, and day.""" + """Used to generate :meth:`~.FeedView.feed_patterns` for a specific year, month, and day.""" articles = self.get_article_queryset().filter(date__year=year) if month: articles = articles.filter(date__month=month) @@ -540,7 +538,7 @@ class NewsletterView(FeedView): return articles, extra_context def get_articles_by_issue(self, request, numbering, extra_context=None): - """Used to generate :meth:`FeedView.feed_patterns` for articles from a certain issue.""" + """Used to generate :meth:`~.FeedView.feed_patterns` for articles from a certain issue.""" try: issue = self.get_issue_queryset().get(numbering=numbering) except NewsletterIssue.DoesNotExist: