Port idtracker feeds to new schema, move them to doc/, clean up

idtracker/ - only templatetags/ietf_filters and proxy code is left
 - Legacy-Id: 5643

Author: OleLaursen

ietf/doc/feeds.py

@@ -0,0 +1,86 @@
+# Copyright The IETF Trust 2007, All Rights Reserved
+
+import datetime, re
+
+from django.conf import settings
+from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.utils.feedgenerator import Atom1Feed
+from django.core.urlresolvers import reverse as urlreverse
+from django.template.defaultfilters import truncatewords_html, date as datefilter, linebreaks
+from django.utils.html import strip_tags
+from django.utils.text import truncate_words
+
+from ietf.doc.models import *
+from ietf.doc.utils import augment_events_with_revision
+from ietf.idtracker.templatetags.ietf_filters import format_textarea
+
+class DocumentChanges(Feed):
+    feed_type = Atom1Feed
+
+    def get_object(self, bits):
+	if len(bits) != 1:
+	    raise Document.DoesNotExist
+
+        return Document.objects.get(docalias__name=bits[0])
+
+    def title(self, obj):
+        return "Changes for %s" % obj.display_name()
+
+    def link(self, obj):
+	if obj is None:
+	    raise FeedDoesNotExist
+        if not hasattr(self, "cached_link"):
+            self.cached_link = urlreverse("doc_history", kwargs=dict(name=obj.canonical_name()))
+	return self.cached_link
+
+    def subtitle(self, obj):
+        return "History of change entries for %s." % obj.display_name()
+
+    def items(self, obj):
+        events = obj.docevent_set.all().order_by("-time","-id")
+        augment_events_with_revision(obj, events)
+	return events
+
+    def item_title(self, item):
+        return u"[%s] %s [rev. %s]" % (item.by, truncate_words(strip_tags(item.desc), 15), item.rev)
+
+    def item_description(self, item):
+        return truncatewords_html(format_textarea(item.desc), 20)
+
+    def item_pubdate(self, item):
+	return item.time
+
+    def item_author_name(self, item):
+	return unicode(item.by)
+
+    def item_link(self, item):
+        return self.cached_link + "#history-%s" % item.pk
+
+class InLastCall(Feed):
+    title = "Documents in Last Call"
+    subtitle = "Announcements for documents in last call."
+    feed_type = Atom1Feed
+    author_name = 'IESG Secretary'
+    link = "/doc/iesg/last-call/"
+
+    def items(self):
+        docs = list(Document.objects.filter(type="draft", states=State.objects.get(type="draft-iesg", slug="lc")))
+        for d in docs:
+            d.lc_event = d.latest_event(LastCallDocEvent, type="sent_last_call")
+
+        docs = [d for d in docs if d.lc_event]
+	docs.sort(key=lambda d: d.lc_event.expires)
+
+	return docs
+
+    def item_title(self, item):
+        return u"%s (%s - %s)" % (item.name,
+                                datefilter(item.lc_event.time, "F j"),
+                                datefilter(item.lc_event.expires, "F j, Y"))
+
+    def item_description(self, item):
+        return linebreaks(item.lc_event.desc)
+
+    def item_pubdate(self, item):
+        return item.lc_event.time
+

ietf/idrfc/views_search.py

@@ -403,8 +403,6 @@ def drafts_in_iesg_process(request, last_call_only=None):
 
             grouped_docs.append((s, docs))
 
-    #drafts.sort(key=lambda d: (d.cur_state_id, d.status_date or datetime.date.min, d.b_sent_date or datetime.date.min))
-
     return render_to_response('doc/drafts_in_iesg_process.html', {
             "grouped_docs": grouped_docs,
             "title": title,

ietf/idtracker/feeds.py

@@ -1,42 +1,10 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 #
-import doctest
+import doctest, unittest
+
 from ietf.idtracker.templatetags import ietf_filters
-import unittest
-from ietf.utils.test_utils import SimpleUrlTestCase, canonicalize_feed, canonicalize_sitemap
-import django.test
 
 class TemplateTagTest(unittest.TestCase):
-    def testTemplateTags(self):
-        print "     Testing ietf_filters"
-        #doctest.testmod(ietf_filters,verbose=True)
-        (failures, tests) = doctest.testmod(ietf_filters)
+    def test_template_tags(self):
+        failures, tests = doctest.testmod(ietf_filters)
         self.assertEqual(failures, 0)
-        print "OK   (ietf_filters)"
-
-class IdTrackerUrlTestCase(SimpleUrlTestCase):
-    def testUrls(self):
-        self.doTestUrls(__file__)
-    def doCanonicalize(self, url, content):
-        if url.startswith("/feed/"):
-            return canonicalize_feed(content)
-        elif url.startswith("/sitemap"):
-            return canonicalize_sitemap(content)
-        else:
-            return content
-
-# class WGRoleTest(django.test.TestCase):
-#     fixtures = ['wgtest']
-# 
-#     def setUp(self):
-#         from ietf.idtracker.models import IETFWG
-# 	self.xmas = IETFWG.objects.get(group_acronym__acronym='xmas')
-# 	self.snow = IETFWG.objects.get(group_acronym__acronym='snow')
-# 
-#     def test_roles(self):
-#         print "     Testing WG roles"
-#     	self.assertEquals(self.xmas.wgchair_set.all()[0].role(), 'xmas WG Chair')
-# 	self.assertEquals(self.snow.wgchair_set.all()[0].role(), 'snow BOF Chair')
-# 	self.assertEquals(self.xmas.wgsecretary_set.all()[0].role(), 'xmas WG Secretary')
-# 	self.assertEquals(self.xmas.wgtechadvisor_set.all()[0].role(), 'xmas Technical Advisor')
-#         print "OK"

ietf/idtracker/tests.py

@@ -227,7 +227,7 @@
   | <a href="{% url ipr_search %}?option=document_search&amp;id={{ doc.name }}" rel="nofollow">IPR Disclosures</a>
   | <a href="http://www.fenron.net/~fenner/ietf/deps/index.cgi?dep={{ name }}" rel="nofollow">Dependencies to this document</a>
   | <a href="http://tools.ietf.org/idnits?url=http://tools.ietf.org/id/{{ doc.filename_with_rev }}" rel="nofollow" target="_blank">Check nits</a>
-  | <a href="/feed/comments/{{ name }}/">History feed</a>
+  | <a href="/feed/document-changes/{{ name }}/">History feed</a>
   | <a href="http://www.google.com/search?as_q={{ doc.name }}&as_sitesearch={{ search_archive }}" rel="nofollow" target="_blank">Search Mailing Lists</a>
   {% if user|has_role:"Area Director" %}
   | <a href="https://www.iesg.org/bin/c5i?mid=6&rid=77&target={{ doc.name }}" rel="nofollow" target="_blank">Search Mailing Lists (ARO)</a>

ietf/idtracker/views.py

@@ -6,7 +6,7 @@
 
 {% block pagehead %}
 <link rel="stylesheet" type="text/css" href="/css/doc.css"></link>
-<link rel="alternate" type="application/atom+xml" href="/feed/comments/{{ doc.canonical_name }}/" />
+<link rel="alternate" type="application/atom+xml" href="/feed/document-changes/{{ doc.canonical_name }}/" />
 {% endblock %}
 
 {% block content %}