Merge branch 'node_middleware'

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

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index e433b84..35646b8 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 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
 from philo.exceptions import ViewCanNotProvideSubpath
 from django.conf.urls.defaults import url, patterns, include
 from django.core.urlresolvers import reverse


@@ -65,7 +65,8 @@ class BlogView(MultiView, FeedMultiViewMixin):
        entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries')
        tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags')
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
        entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries')
        tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags')
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)

-       feeds_enabled = models.BooleanField() 
+       feeds_enabled = models.BooleanField()
+       list_var = 'entries'

        
        def __unicode__(self):
                return u'BlogView for %s' % self.blog.title
        
        def __unicode__(self):
                return u'BlogView for %s' % self.blog.title


@@ -74,10 +75,6 @@ class BlogView(MultiView, FeedMultiViewMixin):
        def per_page(self):
                return self.entries_per_page
        
        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:
        def get_subpath(self, obj):
                if isinstance(obj, BlogEntry):
                        if obj.blog == self.blog:


@@ -116,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'))),
        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('',
                )
                if self.tag_archive_page:
                        urlpatterns += patterns('',


@@ -159,10 +157,10 @@ class BlogView(MultiView, FeedMultiViewMixin):
                        )
                return urlpatterns
        
                        )
                return urlpatterns
        

-       def get_all_entries(self, request, node=None, extra_context=None):
+       def get_all_entries(self, request, extra_context=None):

                return self.blog.entries.all(), extra_context
        
                return self.blog.entries.all(), extra_context
        

-       def get_entries_by_ymd(self, request, year=None, month=None, day=None, node=None, extra_context=None):
+       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()
                if not self.entry_archive_page:
                        raise Http404
                entries = self.blog.entries.all()


@@ -177,7 +175,7 @@ class BlogView(MultiView, FeedMultiViewMixin):
                context.update({'year': year, 'month': month, 'day': day})
                return entries, context
        
                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, extra_context=None):

                tags = []
                for tag_slug in tag_slugs.replace('+', '/').split('/'):
                        if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /)
                tags = []
                for tag_slug in tag_slugs.replace('+', '/').split('/'):
                        if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /)


@@ -192,15 +190,37 @@ class BlogView(MultiView, FeedMultiViewMixin):
                entries = self.blog.entries.all()
                for tag in tags:
                        entries = entries.filter(tags=tag)
                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):
+       def entry_view(self, request, slug, year=None, month=None, day=None, extra_context=None):

                entries = self.blog.entries.all()
                if year:
                        entries = entries.filter(date__year=year)
                entries = self.blog.entries.all()
                if year:
                        entries = entries.filter(date__year=year)


@@ -215,15 +235,15 @@ class BlogView(MultiView, FeedMultiViewMixin):
                context = self.get_context()
                context.update(extra_context or {})
                context.update({'entry': entry})
                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.update(extra_context or {})
                context.update({'blog': self.blog})
                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(node, request, extra_context=context)
+               return self.tag_archive_page.render_to_response(request, extra_context=context)

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


@@ -237,8 +257,9 @@ 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)
        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(db_index=True)
+       tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True)

        
        class Meta:
                get_latest_by = 'date'
        
        class Meta:
                get_latest_by = 'date'


@@ -251,12 +272,12 @@ register_value_model(NewsletterArticle)
 
 class NewsletterIssue(Entity, Titled):
        newsletter = models.ForeignKey(Newsletter, related_name='issues')
 
 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:
        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)
 
 
 register_value_model(NewsletterIssue)


@@ -284,10 +305,10 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
        
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
        feeds_enabled = models.BooleanField()
        
        feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix)
        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):
                if isinstance(obj, NewsletterArticle):
        
        def get_subpath(self, obj):
                if isinstance(obj, NewsletterArticle):


@@ -302,14 +323,14 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                                return reverse(self.article_view, urlconf=self, kwargs=kwargs)
                elif isinstance(obj, NewsletterIssue):
                        if obj.newsletter == self.newsletter:
                                return reverse(self.article_view, urlconf=self, kwargs=kwargs)
                elif isinstance(obj, NewsletterIssue):
                        if obj.newsletter == self.newsletter:

-                               return reverse('issue', urlconf=self, kwargs={'number': str(obj.number)})
+                               return reverse('issue', urlconf=self, kwargs={'numbering': obj.numbering})

                raise ViewCanNotProvideSubpath
        
        @property
        def urlpatterns(self):
                urlpatterns = patterns('',
                        url(r'^', include(self.feed_patterns(self.get_all_articles, self.index_page, 'index'))),
                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<number>\d+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue')))
+                       url(r'^(?:%s)/(?P<numbering>.+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue')))

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


@@ -354,10 +375,10 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
        def get_context(self):
                return {'newsletter': self.newsletter}
        
        def get_context(self):
                return {'newsletter': self.newsletter}
        

-       def get_all_articles(self, request, node, extra_context=None):
+       def get_all_articles(self, request, extra_context=None):

                return self.newsletter.articles.all(), extra_context
        
                return self.newsletter.articles.all(), extra_context
        

-       def get_articles_by_ymd(self, request, year, month=None, day=None, node=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)
                if month:
                        articles = articles.filter(date__month=month)
                articles = self.newsletter.articles.filter(dat__year=year)
                if month:
                        articles = articles.filter(date__month=month)


@@ -365,16 +386,16 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        articles = articles.filter(date__day=day)
                return articles
        
                        articles = articles.filter(date__day=day)
                return articles
        

-       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:
                try:

-                       issue = self.newsletter.issues.get(number=number)
+                       issue = self.newsletter.issues.get(numbering=numbering)

                except:
                        raise Http404
                context = extra_context or {}
                context.update({'issue': issue})
                return issue.articles.all(), context
        
                except:
                        raise Http404
                context = extra_context or {}
                context.update({'issue': issue})
                return issue.articles.all(), context
        

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

                articles = self.newsletter.articles.all()
                if year:
                        articles = articles.filter(date__year=year)
                articles = self.newsletter.articles.all()
                if year:
                        articles = articles.filter(date__year=year)


@@ -386,18 +407,35 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        article = articles.get(slug=slug)
                except:
                        raise Http404
                        article = articles.get(slug=slug)
                except:
                        raise Http404

-               context = {}
+               context = self.get_context()

                context.update(extra_context or {})
                context.update(extra_context or {})

-               context.update({'newsletter': self.newsletter, 'article': article})
-               return self.article_page.render_to_response(node, request, extra_context=context)
+               context.update({'article': article})
+               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=None):

                if not self.issue_archive_page:
                        raise Http404
                context = {}
                context.update(extra_context or {})
                context.update({'newsletter': self.newsletter})
                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(node, request, extra_context=context)
-       
-       def get_obj_description(self, obj):
-               return obj.lede or obj.full_text
\ No newline at end of file
+               return self.issue_archive_page.render_to_response(request, extra_context=context)
+       
+       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