Changeset 1374:9dd8173575da

Timestamp:

05/16/10 21:51:10 (2 years ago)

Author:

Mike Crute <mcrute@…>

Branch:

default

Message:

MBH Ticket 7 and MBH Ticket 8: Adding support for RSS and Wordpress style Urls

Location:

zine

Files:

• feeds.py (added)
• urls.py (modified) (3 diffs)
• views/__init__.py (modified) (1 diff)
• views/blog.py (modified) (4 diffs)

zine/urls.py

@@ -17 +17 @@
         Rule('/', defaults={'page': 1}, endpoint='blog/index'),
         Rule('/feed.atom', endpoint='blog/atom_feed'),
+        Submount('/feed', [
+            Rule('/', endpoint='blog/rss_feed'),
+            Rule('/rss', endpoint='blog/rss_feed'),
+            Rule('/rss2', endpoint='blog/rss_feed'),
+            Rule('/atom', endpoint='blog/atom_feed'),
+        ]),
         Rule('/page/<int:page>', endpoint='blog/index'),
         Rule('/archive', endpoint='blog/archive'),
@@ -24 +30 @@
             Rule('/<string:username>/page/<int:page>', endpoint='blog/show_author'),
             Rule('/<string:author>/feed.atom', endpoint='blog/atom_feed'),
+            Submount('/<string:author>/feed', [
+                Rule('/', endpoint='blog/rss_feed'),
+                Rule('/rss', endpoint='blog/rss_feed'),
+                Rule('/rss2', endpoint='blog/rss_feed'),
+                Rule('/atom', endpoint='blog/atom_feed'),
+            ]),
         ]),
         Submount(app.cfg['category_url_prefix'], [
             Rule('/<string:slug>', defaults={'page': 1}, endpoint='blog/show_category'),
             Rule('/<string:slug>/page/<int:page>', endpoint='blog/show_category'),
-            Rule('/<string:category>/feed.atom', endpoint='blog/atom_feed')
+            Rule('/<string:category>/feed.atom', endpoint='blog/atom_feed'),
+            Submount('/<string:category>/feed', [
+                Rule('/', endpoint='blog/rss_feed'),
+                Rule('/rss', endpoint='blog/rss_feed'),
+                Rule('/rss2', endpoint='blog/rss_feed'),
+                Rule('/atom', endpoint='blog/atom_feed'),
+            ]),
         ]),
         Submount(app.cfg['tags_url_prefix'], [
@@ -34 +52 @@
             Rule('/<string:slug>', defaults={'page': 1}, endpoint='blog/show_tag'),
             Rule('/<string:slug>/page/<int:page>', endpoint='blog/show_tag'),
-            Rule('/<string:tag>/feed.atom', endpoint='blog/atom_feed')
+            Rule('/<string:tag>/feed.atom', endpoint='blog/atom_feed'),
+            Submount('/<string:tag>/feed', [
+                Rule('/', endpoint='blog/rss_feed'),
+                Rule('/rss', endpoint='blog/rss_feed'),
+                Rule('/rss2', endpoint='blog/rss_feed'),
+                Rule('/atom', endpoint='blog/atom_feed'),
+            ]),
         ]),
         Submount(app.cfg['account_url_prefix'], [

zine/views/__init__.py

@@ -29 +29 @@
     'blog/xml_service':         blog.xml_service,
     'blog/atom_feed':           blog.atom_feed,
+    'blog/rss_feed':            blog.rss_feed,
     'blog/serve_translations':  i18n.serve_javascript,
 

zine/views/blog.py

@@ -19 +19 @@
 from zine.utils import dump_json, log
 from zine.utils.text import build_tag_uri
-from zine.utils.xml import generate_rsd, dump_xml, AtomFeed
+from zine.utils.xml import generate_rsd, dump_xml
 from zine.utils.http import redirect_to, redirect
 from zine.utils.redirects import lookup_redirect
 from zine.forms import NewCommentForm
+from zine.feeds import Rss201rev2Feed as RssFeed, Atom1Feed
 from werkzeug.exceptions import NotFound, Forbidden
 
@@ -336 +337 @@
 def atom_feed(req, author=None, year=None, month=None, day=None,
               category=None, tag=None, post=None):
+    feed = Atom1Feed(req.app.cfg['blog_title'], req.app.cfg['blog_url'],
+                    "", # Description not supported
+                    subtitle=req.app.cfg['blog_tagline'], feed_url=req.url)
+
+    results = populate_feed(req, feed, author, year, month, day, category,
+                         tag, post)
+
+    return Response(results, mimetype="application/atom+xml")
+
+
+@cache.response(vary=('user',))
+def rss_feed(req, author=None, year=None, month=None, day=None,
+              category=None, tag=None, post=None):
+    feed = RssFeed(req.app.cfg['blog_title'], req.app.cfg['blog_url'],
+                    "", # Description not supported
+                    subtitle=req.app.cfg['blog_tagline'], feed_url=req.url)
+
+    results = populate_feed(req, feed, author, year, month, day, category,
+                         tag, post)
+
+    return Response(results, mimetype="application/rss+xml")
+
+
+def populate_feed(req, feed, author=None, year=None, month=None, day=None,
+              category=None, tag=None, post=None):
     """Renders an atom feed requested.
 
     :URL endpoint: ``blog/atom_feed``
     """
-    feed = AtomFeed(req.app.cfg['blog_title'], feed_url=req.url,
-                    url=req.app.cfg['blog_url'],
-                    subtitle=req.app.cfg['blog_tagline'])
-
     # the feed only contains published items
     query = Post.query.lightweight(lazy=('comments',)).published()
@@ -372 +394 @@
         for post in query.for_index().order_by(Post.pub_date.desc()) \
                          .limit(15).all():
-            links = [link.as_dict() for link in post.links]
-            feed.add(post.title or '%s @ %s' % (post.author.display_name,
-                     post.pub_date), unicode(post.body), content_type='html',
-                     author=post.author.display_name, links=links,
-                     url=url_for(post, _external=True), id=post.uid,
-                     updated=post.last_update, published=post.pub_date)
+            alt_title = '%s @ %s' % (post.author.display_name, post.pub_date)
+            feed.add_item(post.title or alt_title,
+                          url_for(post, _external=True), unicode(post.body),
+                          author_name=post.author.display_name,
+                          pubdate=post.pub_date, unique_id=post.uid)
 
     # otherwise we create a feed for all the comments of a post.
@@ -395 +416 @@
             if comment.www:
                 author['uri'] = comment.www
-            feed.add(title, unicode(comment.body), content_type='html',
-                     author=author, url=url_for(comment, _external=True),
-                     id=uid, updated=comment.pub_date)
+            feed.add_item(title, url_for(comment, _external=True),
+                          unicode(comment.body), author_name=author,
+                          pubdate=comment.pub_date, unique_id=uid)
             comment_num += 1
 
-    return feed.get_response()
+    return feed.writeString('utf-8')