X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3f3b465af13e523065ca264f4ef63a82d1647046..dbb5ab771be406d90ac522e0ecd644e5ddb21e6f:/contrib/penfield/models.py?ds=sidebyside diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py index 33eecb0..27e5b5d 100644 --- a/contrib/penfield/models.py +++ b/contrib/penfield/models.py @@ -1,15 +1,15 @@ -from django.db import models from django.conf import settings -from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model -from philo.exceptions import ViewCanNotProvideSubpath from django.conf.urls.defaults import url, patterns, include -from django.core.urlresolvers import reverse +from django.db import models from django.http import Http404 -from datetime import 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 datetime import date, datetime 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): @@ -30,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') - 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) + 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" + get_latest_by = "date" register_value_model(BlogEntry) @@ -75,11 +81,7 @@ 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): + def get_reverse_params(self, obj): if isinstance(obj, BlogEntry): if obj.blog == self.blog: kwargs = {'slug': obj.slug} @@ -89,84 +91,88 @@ class BlogView(MultiView, FeedMultiViewMixin): kwargs.update({'month': str(obj.date.month).zfill(2)}) if self.entry_permalink_style == 'D': kwargs.update({'day': str(obj.date.day).zfill(2)}) - return reverse(self.entry_view, urlconf=self, kwargs=kwargs) + return self.entry_view, [], kwargs elif isinstance(obj, Tag): - if obj in self.blog.entry_tags: - return reverse('entries_by_tag', urlconf=self, kwargs={'tag_slugs': obj.slug}) - elif isinstance(obj, (str, unicode)): - split_obj = obj.split(':') - if len(split_obj) > 1: - kwargs = {} - try: - kwargs.update({'year': str(int(split_obj[1])).zfill(4)}) - if len(split_obj) > 2: - kwargs.update({'month': str(int(split_obj[2])).zfill(2)}) - if len(split_obj) > 3: - kwargs.update({'day': str(int(split_obj[3])).zfill(2)}) - return reverse('entries_by_day', urlconf=self, kwargs=kwargs) - return reverse('entries_by_month', urlconf=self, kwargs=kwargs) - return reverse('entries_by_year', urlconf=self, kwargs=kwargs) - except: - pass + if obj in self.get_tag_queryset(): + return 'entries_by_tag', [], {'tag_slugs': obj.slug} + elif isinstance(obj, (date, datetime)): + kwargs = { + 'year': str(obj.year).zfill(4), + 'month': str(obj.month).zfill(2), + 'day': str(obj.day).zfill(2) + } + 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'))), - url((r'^(?:%s)/(?P[-\w]+[-+/\w]*)/' % self.tag_permalink_base), include(self.feed_patterns(self.get_entries_by_tag, self.tag_page, 'entries_by_tag'))) + ) + if self.feeds_enabled: + urlpatterns += patterns('', + url(r'^%s/(?P[-\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[-\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.tag_archive_view, name='tag_archive') ) if self.entry_archive_page: if self.entry_permalink_style in 'DMY': urlpatterns += patterns('', - url(r'^(?P\d{4})/', include(self.feed_patterns(self.get_entries_by_ymd, self.entry_archive_page, 'entries_by_year'))) + url(r'^(?P\d{4})', include(self.feed_patterns(self.get_entries_by_ymd, self.entry_archive_page, 'entries_by_year'))) ) if self.entry_permalink_style in 'DM': urlpatterns += patterns('', - url(r'^(?P\d{4})/(?P\d{2})/?$', include(self.feed_patterns(self.get_entries_by_ymd, self.entry_archive_page, 'entries_by_month'))), + url(r'^(?P\d{4})/(?P\d{2})$', include(self.feed_patterns(self.get_entries_by_ymd, self.entry_archive_page, 'entries_by_month'))), ) if self.entry_permalink_style == 'D': urlpatterns += patterns('', - url(r'^(?P\d{4})/(?P\d{2})/(?P\d{2})/?$', include(self.feed_patterns(self.get_entries_by_ymd, self.entry_archive_page, 'entries_by_day'))) + url(r'^(?P\d{4})/(?P\d{2})/(?P\d{2})$', include(self.feed_patterns(self.get_entries_by_ymd, self.entry_archive_page, 'entries_by_day'))) ) if self.entry_permalink_style == 'D': urlpatterns += patterns('', - url(r'^(?P\d{4})/(?P\d{2})/(?P\d{2})/(?P[-\w]+)/?$', self.entry_view) + url(r'^(?P\d{4})/(?P\d{2})/(?P\d{2})/(?P[-\w]+)$', self.entry_view) ) elif self.entry_permalink_style == 'M': urlpatterns += patterns('', - url(r'^(?P\d{4})/(?P\d{2})/(?P[-\w]+)/?$', self.entry_view) + url(r'^(?P\d{4})/(?P\d{2})/(?P[-\w]+)$', self.entry_view) ) elif self.entry_permalink_style == 'Y': urlpatterns += patterns('', - url(r'^(?P\d{4})/(?P[-\w]+)/?$', self.entry_view) + url(r'^(?P\d{4})/(?P[-\w]+)$', self.entry_view) ) elif self.entry_permalink_style == 'B': urlpatterns += patterns('', - url((r'^(?:%s)/(?P[-\w]+)/?$' % self.entry_permalink_base), self.entry_view) + url((r'^%s/(?P[-\w]+)$' % self.entry_permalink_base), self.entry_view) ) else: urlpatterns = patterns('', - url(r'^(?P[-\w]+)/?$', self.entry_view) + url(r'^(?P[-\w]+)$', self.entry_view) ) return urlpatterns - def get_all_entries(self, request, node=None, extra_context=None): - return self.blog.entries.all(), extra_context + def get_context(self): + return {'blog': self.blog} + + def get_entry_queryset(self): + return self.blog.entries.all() + + def get_tag_queryset(self): + return self.blog.entry_tags - def get_entries_by_ymd(self, request, year=None, month=None, day=None, node=None, extra_context=None): + def get_all_entries(self, request, extra_context=None): + return self.get_entry_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 - entries = self.blog.entries.all() + entries = self.get_entry_queryset() if year: entries = entries.filter(date__year=year) if month: @@ -178,31 +184,30 @@ 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): - 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: + def get_entries_by_tag(self, request, tag_slugs, extra_context=None): + tag_slugs = tag_slugs.replace('+', '/').split('/') + tags = self.get_tag_queryset().filter(slug__in=tag_slugs) + + if not tags: 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_entry_queryset() for tag in tags: entries = entries.filter(tags=tag) - if entries.count() <= 0: - raise Http404 - return entries, extra_context - - def get_obj_description(self, obj): - return obj.excerpt + context = extra_context or {} + context.update({'tags': tags}) + + return entries, context - def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): - entries = self.blog.entries.all() + def entry_view(self, request, slug, year=None, month=None, day=None, extra_context=None): + entries = self.get_entry_queryset() if year: entries = entries.filter(date__year=year) if month: @@ -216,15 +221,42 @@ class BlogView(MultiView, FeedMultiViewMixin): context = self.get_context() context.update(extra_context or {}) context.update({'entry': entry}) - return self.entry_page.render_to_response(node, request, extra_context=context) + return self.entry_page.render_to_response(request, extra_context=context) - def tag_archive_view(self, request, node=None, extra_context=None): + def tag_archive_view(self, request, extra_context=None): if not self.tag_archive_page: raise Http404 - context = {} + context = self.get_context() context.update(extra_context or {}) - context.update({'blog': self.blog}) - return self.tag_archive_page.render_to_response(node, request, extra_context=context) + context.update({ + 'tags': self.get_tag_queryset() + }) + return self.tag_archive_page.render_to_response(request, extra_context=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 = { + 'title': title.render(Context({'entry': obj})), + 'description': description.render(Context({'entry': obj})), + '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) class Newsletter(Entity, Titled): @@ -237,11 +269,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') - date = models.DateTimeField(default=datetime.now) - lede = models.TextField(null=True, blank=True) - full_text = models.TextField() + 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) + 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'] @@ -253,12 +290,12 @@ register_value_model(NewsletterArticle) class NewsletterIssue(Entity, Titled): newsletter = models.ForeignKey(Newsletter, related_name='issues') - number = models.PositiveIntegerField() + numbering = models.CharField(max_length=50, help_text='For example, 04.02 for volume 4, issue 2.') articles = models.ManyToManyField(NewsletterArticle, related_name='issues') class Meta: - ordering = ['-number'] - unique_together = (('newsletter', 'number'),) + ordering = ['-numbering'] + unique_together = (('newsletter', 'numbering'),) register_value_model(NewsletterIssue) @@ -288,11 +325,10 @@ class NewsletterView(MultiView, FeedMultiViewMixin): feeds_enabled = models.BooleanField() list_var = 'articles' - @property - def feed_title(self): - return self.newsletter.title + def __unicode__(self): + return self.newsletter.__unicode__() - def get_subpath(self, obj): + def get_reverse_params(self, obj): if isinstance(obj, NewsletterArticle): if obj.newsletter == self.newsletter: kwargs = {'slug': obj.slug} @@ -302,54 +338,61 @@ class NewsletterView(MultiView, FeedMultiViewMixin): kwargs.update({'month': str(obj.date.month).zfill(2)}) if self.article_permalink_style == 'D': kwargs.update({'day': str(obj.date.day).zfill(2)}) - return reverse(self.article_view, urlconf=self, kwargs=kwargs) + return self.article_view, [], kwargs elif isinstance(obj, NewsletterIssue): if obj.newsletter == self.newsletter: - return reverse('issue', urlconf=self, kwargs={'number': str(obj.number)}) + return 'issue', [], {'numbering': obj.numbering} + elif isinstance(obj, (date, datetime)): + kwargs = { + 'year': str(obj.year).zfill(4), + 'month': str(obj.month).zfill(2), + 'day': str(obj.day).zfill(2) + } + return 'articles_by_day', [], kwargs raise ViewCanNotProvideSubpath @property def urlpatterns(self): urlpatterns = patterns('', url(r'^', include(self.feed_patterns(self.get_all_articles, self.index_page, 'index'))), - url(r'^(?:%s)/(?P\d+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue'))) + url(r'^%s/(?P.+)' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue'))) ) 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.issue_archive_view, 'issue_archive') ) if self.article_archive_page: urlpatterns += patterns('', - url(r'^(?:%s)/' % self.article_permalink_base, include(self.feed_patterns(self.get_all_articles, self.article_archive_page, 'articles'))) + url(r'^%s' % self.article_permalink_base, include(self.feed_patterns(self.get_all_articles, self.article_archive_page, 'articles'))) ) if self.article_permalink_style in 'DMY': urlpatterns += patterns('', - url(r'^(?:%s)/(?P\d{4})/' % self.article_permalink_base, include(self.feed_patterns(self.get_articles_by_ymd, self.article_archive_page, 'articles_by_year'))) + url(r'^%s/(?P\d{4})' % self.article_permalink_base, include(self.feed_patterns(self.get_articles_by_ymd, self.article_archive_page, 'articles_by_year'))) ) if self.article_permalink_style in 'DM': urlpatterns += patterns('', - url(r'^(?:%s)/(?P\d{4})/(?P\d{2})/' % self.article_permalink_base, include(self.feed_patterns(self.get_articles_by_ymd, self.article_archive_page, 'articles_by_month'))) + url(r'^%s/(?P\d{4})/(?P\d{2})' % self.article_permalink_base, include(self.feed_patterns(self.get_articles_by_ymd, self.article_archive_page, 'articles_by_month'))) ) if self.article_permalink_style == 'D': urlpatterns += patterns('', - url(r'^(?:%s)/(?P\d{4})/(?P\d{2})/(?P\d{2})/' % self.article_permalink_base, include(self.feed_patterns(self.get_articles_by_ymd, self.article_archive_page, 'articles_by_day'))) + url(r'^%s/(?P\d{4})/(?P\d{2})/(?P\d{2})' % self.article_permalink_base, include(self.feed_patterns(self.get_articles_by_ymd, self.article_archive_page, 'articles_by_day'))) ) if self.article_permalink_style == 'Y': urlpatterns += patterns('', - url(r'^(?:%s)/(?P\d{4})/(?P[\w-]+)/$' % self.article_permalink_base, self.article_view) + url(r'^%s/(?P\d{4})/(?P[\w-]+)$' % self.article_permalink_base, self.article_view) ) elif self.article_permalink_style == 'M': urlpatterns += patterns('', - url(r'^(?:%s)/(?P\d{4})/(?P\d{2})/(?P[\w-]+)/$' % self.article_permalink_base, self.article_view) + url(r'^%s/(?P\d{4})/(?P\d{2})/(?P[\w-]+)$' % self.article_permalink_base, self.article_view) ) elif self.article_permalink_style == 'D': urlpatterns += patterns('', - url(r'^(?:%s)/(?P\d{4})/(?P\d{2})/(?P\d{2})/(?P[\w-]+)/$' % self.article_permalink_base, self.article_view) + url(r'^%s/(?P\d{4})/(?P\d{2})/(?P\d{2})/(?P[\w-]+)$' % self.article_permalink_base, self.article_view) ) else: urlpatterns += patterns('', - url(r'^(?:%s)/(?P[-\w]+)/?$' % self.article_permalink_base, self.article_view) + url(r'^%s/(?P[-\w]+)$' % self.article_permalink_base, self.article_view) ) return urlpatterns @@ -357,28 +400,34 @@ class NewsletterView(MultiView, FeedMultiViewMixin): def get_context(self): return {'newsletter': self.newsletter} - def get_all_articles(self, request, node, extra_context=None): - return self.newsletter.articles.all(), extra_context + def get_article_queryset(self): + return self.newsletter.articles.all() + + def get_issue_queryset(self): + return self.newsletter.issues.all() + + def get_all_articles(self, request, extra_context=None): + return self.get_article_queryset(), extra_context - def get_articles_by_ymd(self, request, year, month=None, day=None, node=None, extra_context=None): - articles = self.newsletter.articles.filter(dat__year=year) + def get_articles_by_ymd(self, request, year, month=None, day=None, extra_context=None): + articles = self.get_article_queryset().filter(date__year=year) 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, number, node=None, extra_context=None): + def get_articles_by_issue(self, request, numbering, extra_context=None): try: - issue = self.newsletter.issues.get(number=number) - except: + issue = self.get_issue_queryset().get(numbering=numbering) + except NewsletterIssue.DoesNotExist: raise Http404 context = extra_context or {} context.update({'issue': issue}) - return issue.articles.all(), context + return self.get_article_queryset().filter(issues=issue), context - def article_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): - articles = self.newsletter.articles.all() + def article_view(self, request, slug, year=None, month=None, day=None, extra_context=None): + articles = self.get_article_queryset() if year: articles = articles.filter(date__year=year) if month: @@ -387,20 +436,41 @@ class NewsletterView(MultiView, FeedMultiViewMixin): 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(node, request, extra_context=context) + return self.article_page.render_to_response(request, extra_context=context) - def issue_archive_view(self, request, node=None, extra_context=None): + def issue_archive_view(self, request, extra_context): if not self.issue_archive_page: raise Http404 - context = {} + context = self.get_context() context.update(extra_context or {}) - 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 + context.update({ + 'issues': self.get_issue_queryset() + }) + return self.issue_archive_page.render_to_response(request, extra_context=context) + + 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 = { + 'title': title.render(Context({'article': obj})), + 'author_name': ', '.join([author.get_full_name() for author in obj.authors.all()]), + 'pubdate': obj.date, + 'description': description.render(Context({'article': obj})), + '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)