Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Conflicts:
	mediagoblin/db/mongo/models.py

diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py
index 906d284934e0c68c10091b08616209e11c771608..d9b5a57039f69479877979154ddf7b59a08c6241 100644 (file)
--- a/mediagoblin/db/mongo/models.py
+++ b/mediagoblin/db/mongo/models.py
@@ -226,6 +226,27 @@ class MediaEntry(Document, MediaEntryMixin):
         if duplicate:
             self.slug = "%s-%s" % (self._id, self.slug)
 
+    def url_for_self(self, urlgen, **extra_args):
+        """
+        Generate an appropriate url for ourselves
+
+        Use a slug if we have one, else use our '_id'.
+        """
+        uploader = self.get_uploader
+
+        if self.get('slug'):
+            return urlgen(
+                'mediagoblin.user_pages.media_home',
+                user=uploader.username,
+                media=self.slug,
+                **extra_args)
+        else:
+            return urlgen(
+                'mediagoblin.user_pages.media_home',
+                user=uploader.username,
+                media=unicode(self._id),
+                **extra_args)
+
     def url_to_prev(self, urlgen):
         """
         Provide a url to the previous entry from this user, if there is one

diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index 3ecf06f404809b6bce53f1b4619fb30a188996c9..ca8e8229788908746657359dd4f2f563f027984e 100644 (file)
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -77,17 +77,33 @@ def tag_atom_feed(request):
     cursor = cursor.sort('created', DESCENDING)
     cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
 
+    """
+    ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI)
+    """
     feed = AtomFeed(
         "MediaGoblin: Feed for tag '%s'" % tag_slug,
         feed_url=request.url,
-        url=request.host_url)
-
+        id='tag:'+request.host+',2011:gallery.tag-%s' % tag_slug,
+        links=[{'href': request.urlgen(
+                 'mediagoblin.listings.tags_listing',
+                 qualified=True, tag=tag_slug ),
+            'rel': 'alternate',
+            'type': 'text/html'}])
     for entry in cursor:
         feed.add(entry.get('title'),
             entry.get('description_html'),
+            id=entry.url_for_self(request.urlgen,qualified=True),
             content_type='html',
-            author=entry.get_uploader.username,
+            author={'name': entry.get_uploader.username,
+                'uri': request.urlgen(
+                    'mediagoblin.user_pages.user_home',
+                    qualified=True, user=entry.get_uploader.username)},
             updated=entry.get('created'),
-            url=entry.url_for_self(request.urlgen))
+            links=[{
+                'href':entry.url_for_self(
+                   request.urlgen,
+                   qualified=True),
+                'rel': 'alternate',
+                'type': 'text/html'}])
 
     return feed.get_response()

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index f721f012bce01e68c345a673f458618828341e21..a234722fcf0253c6d59fb0c33f03f3c03ea6a2db 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -225,17 +225,37 @@ def atom_feed(request):
                  .sort('created', DESCENDING) \
                  .limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
 
-    feed = AtomFeed(request.matchdict['user'],
+    """
+    ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI)
+    """
+    feed = AtomFeed(
+               "MediaGoblin: Feed for user '%s'" % request.matchdict['user'],
                feed_url=request.url,
-               url=request.host_url)
+               id='tag:'+request.host+',2011:gallery.user-'+request.matchdict['user'],
+               links=[{
+                   'href': request.urlgen(
+                       'mediagoblin.user_pages.user_home',
+                       qualified=True,user=request.matchdict['user']),
+                   'rel': 'alternate',
+                   'type': 'text/html'}])
 
     for entry in cursor:
         feed.add(entry.get('title'),
             entry.get('description_html'),
+            id=entry.url_for_self(request.urlgen,qualified=True),
             content_type='html',
-            author=request.matchdict['user'],
+            author={
+                'name': entry.get_uploader.username,
+                'uri': request.urlgen(
+                    'mediagoblin.user_pages.user_home',
+                    qualified=True, user=entry.get_uploader.username)},
             updated=entry.get('created'),
-            url=entry.url_for_self(request.urlgen))
+            links=[{
+                'href': entry.url_for_self(
+                    request.urlgen,
+                    qualified=True),
+                'rel': 'alternate',
+                'type': 'text/html'}])
 
     return feed.get_response()