Merged in a lot of shim-layer removals from olau@iola.dk

(-r5194:5465 from branch/iola/shimfree).  Copying relevant
commit messages here:

  - Removed .related many to many relationship, it's not really useful
    since we always have to restrict on the relationship type anyway,
    instead add two helpers for doing the necessary queries (in both
    directions)

  - Added migration for transforming the .desc on the new_revision events
    into something more akin to what is actually shown in the history page

  - Added migration for blanking IESG notes that just consist of "RFC
    XXXX", these have been superfluous for some time

  - Grant stream chairs access to changing the stream on a draft

  - Hacked the format_history_text filter to be less weird, using the same
    formatting for snippets and full text, also link up legacy ballot set
    events

  - Moved the decoraters + utilities to new ietfauth/utils.py file

  - Added simple helper to Email to identify invalid email addresses (from
    legacy author entries)

  - Used new new_revision .desc format for when drafts are submitted

  - Improved the looks of the button class by adding extra contrast and a
    linear gradient. Currently the gradient is only visible in fairly
    recent browsers.

  - Rewrote draft and RFC tabs in terms of the new schema, porting
    write-up and history tabs as well

  - Fixed two bugs in RFC Editor syncing: make sure documents we don't know
    beforehand get a "draft" type and make sure individually submitted
    drafts get the type="individ" group instead of NULL

  - Made the CSS-styled button feel a bit nicer to use by flattening the
    active state, also introduce some temporary styles until browsers
    catch up with the standard syntax

  - Added migrations for fixing 1) a dummy RFC entry, 2) three stand-alone
    RFCs that didn't get their doc.type set, 3) a big bunch of historic
    stand-alone RFCs that have doc.group=None - set these to the
    individual submission "none" group for the time being so the view code
    doesn't have to deal with a special case.

    In some cases this is wrong since there actually was a WG associated
    but unfortunately fixing them properly requires detective work
    (probably parsing the RFCs) and in at least some cases recreating
    historic WGs. In case someone ends up doing this, the documents to
    check can still be found with

    Document.objects.filter(name__startswith="rfc", group__type="individ")
    since there are almost no new RFCs that didn't went through the I-D
    process.

  - Merged the I-D and RFC views by showing I-D information on RFCs too.
    I-Ds that have been published as RFCs redirect to the RFC URL. Also
    support alias URLs so e.g. /doc/bcpXXXX redirects to /doc/rfcXXXX.

  - Fixed revision augmentation so events after RFC publication gets a "RFC"
    designation

  - Fixed a bug with tabs not using provided name but rather doc.name

  - Displaying draft-iesg state rather than doc.friendly_state as IESG state,
    also show a notice that the IESG state refers to post-RFC processing
    if it does, like the old separate RFC page did

  - Fixed the RFC number doc.note migration to catch combined "RFC XXX; BCP
    XXX" notes too, use the opportunity to remove inserted HTML tags from
    notes and rely on linebreaksbr filter instead (the other thing was a
    left-over from the Perl days), update the various uses of the note to
    reflect that

  - Refactored slightly to make views_doc.py independent of other idrfc code

  - Moveed idrfc/views_doc.py to doc/ with associated templates, replace the
    somewhat fragile simple URL tests for views_doc.py with ordinary unit
    tests. The new tests are still fairly basic but at least test more
    than the URL tests did.

  - Made sure RFC's (and BCP/STD/FYI) are stored as RFC123 instead of
    RFC0123 in the alias table with a new migration and a change to the
    RFC Editor sync, this in turn makes /doc/std1/ do the right thing

  - Now /doc/std1/ works, we can actually do a local link in
    urlize_ietf_docs rather than linking to the tools.ietf.org server

  - Fixed history text formatter: sanitize HTML before adding linebreaks and
    non-breaking spaces, this cuts the time to render a history page with
    long comments in half

  - Added a test crawler that walks through the crawlable part of the site,
    reporting errors and slow pages

  - Got rid of initial "No record" positions when showing old positions,
    it's just noise

  - Added a .select_related() to the document main tab to reduce the number
    of DB queries, unfortunately it seems it doesn't really help with
    Django 1.2.x due to a bug (Document inherits from DocumentInfo which
    makes things a bit more complicated)

  - Introduced a simple cache in doc.get_state so repeated reads don't
    cause a DB query

  - Cleaned up the search code in preparation for removal of the shim-layer;
    use a static button and don't send extraneous GET parameters

  - Removed dead code in several places
 - Legacy-Id: 5830

Author: levkowetz

django/test/testcases.py

@@ -494,6 +494,19 @@ def assertTemplateNotUsed(self, response, template_name, msg_prefix=''):
     def assertQuerysetEqual(self, qs, values, transform=repr):
         return self.assertEqual(map(transform, qs), values)
 
+    # some things from newer (python 2.7) unittests
+    def assertIsNone(self, obj, msg=None):
+        """Same as self.assertTrue(obj is None), with a nicer default message."""
+        if obj is not None:
+            standardMsg = '%s is not None' % (safe_repr(obj),)
+            self.fail(self._formatMessage(msg, standardMsg))
+
+    def assertIsNotNone(self, obj, msg=None):
+        """Included for symmetry with assertIsNone."""
+        if obj is None:
+            standardMsg = 'unexpectedly None'
+            self.fail(self._formatMessage(msg, standardMsg))
+
 def connections_support_transactions():
     """
     Returns True if all connections support transactions.  This is messy

ietf/bin/test-crawl

@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+
+import os, sys, re, datetime, optparse, traceback
+import syslog
+
+# boilerplate
+basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
+sys.path = [ basedir ] + sys.path
+
+from ietf import settings
+from django.core import management
+management.setup_environ(settings)
+
+import django.test
+from django.conf import settings
+
+# prevent memory from leaking when settings.DEBUG=True
+from django.db import connection
+class DontSaveQueries(object):
+    def append(self, x):
+        pass
+connection.queries = DontSaveQueries()
+
+MAX_URL_LENGTH = 500
+SLOW_THRESHOLD = 1.0
+
+def strip_url(url):
+    if url.startswith("http://testserver"):
+        url = url[len("http://testserver"):]
+    return url
+
+def extract_html_urls(content):
+    for m in re.finditer(r'<a.*href="([^"]+)">', content):
+        url = strip_url(m.group(1))
+        if len(url) > MAX_URL_LENGTH:
+            continue # avoid infinite GET parameter appendages
+
+        if not url.startswith("/"):
+            continue
+
+        yield url
+
+
+visited = set()
+blacklist = set()
+urls = set(["/doc/all/"])
+
+client = django.test.Client()
+
+while urls:
+    url = urls.pop()
+
+    visited.add(url)
+
+    try:
+        timestamp = datetime.datetime.now()
+        r = client.get(url)
+        elapsed = datetime.datetime.now() - timestamp
+    except KeyboardInterrupt:
+        print "was fetching", url
+        sys.exit(1)
+    except:
+        print "FAIL", url
+        print "============="
+        traceback.print_exc()
+        print "============="
+    else:
+        tags = []
+
+        if r.status_code in (301, 302):
+            u = strip_url(r["Location"])
+            if u not in visited and u not in urls:
+                urls.add(u)
+
+        elif r.status_code == 200:
+            ctype = r["Content-Type"]
+            if ";" in ctype:
+                ctype = ctype[:ctype.index(";")]
+
+            if ctype == "text/html":
+                for u in extract_html_urls(r.content):
+                    if u not in visited and u not in urls:
+                        urls.add(u)
+        else:
+            tags.append("FAIL")
+
+        if elapsed.total_seconds() > SLOW_THRESHOLD:
+            tags.append("SLOW")
+
+        print r.status_code, "%.3fs" % elapsed.total_seconds(), url, " ".join(tags)
+

ietf/doc/admin.py

@@ -93,7 +93,7 @@ class DocumentAdmin(admin.ModelAdmin):
     list_display = ['name', 'rev', 'group', 'pages', 'intended_std_level', 'author_list', 'time']
     search_fields = ['name']
     list_filter = ['type']
-    raw_id_fields = ['authors', 'related', 'group', 'shepherd', 'ad']
+    raw_id_fields = ['authors', 'group', 'shepherd', 'ad']
     inlines = [DocAliasInline, DocAuthorInline, RelatedDocumentInline, ]
     form = DocumentForm
 

ietf/doc/migrations/0011_cleanup_new_revision_docevents.py

@@ -4,6 +4,7 @@
 from django.core.urlresolvers import reverse as urlreverse
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
+from django.utils.html import mark_safe
 
 from ietf.group.models import *
 from ietf.name.models import *
@@ -99,20 +100,26 @@ def set_state(self, state):
             self.states.remove(*others)
         if state not in already_set:
             self.states.add(state)
+        self.state_cache = None # invalidate cache
 
     def unset_state(self, state_type):
         """Unset state of type so no state of that type is any longer set."""
         self.states.remove(*self.states.filter(type=state_type))
+        self.state_cache = None # invalidate cache
 
     def get_state(self, state_type=None):
-        """Get state of type, or default state for document type if not specified."""
+        """Get state of type, or default state for document type if
+        not specified. Uses a local cache to speed multiple state
+        reads up."""
         if state_type == None:
             state_type = self.type_id
 
-        try:
-            return self.states.get(type=state_type)
-        except State.DoesNotExist:
-            return None
+        if not hasattr(self, "state_cache") or self.state_cache == None:
+            self.state_cache = {}
+            for s in self.states.all().select_related():
+                self.state_cache[s.type_id] = s
+
+        return self.state_cache.get(state_type, None)
 
     def get_state_slug(self, state_type=None):
         """Get state of type, or default if not specified, returning
@@ -137,8 +144,10 @@ def ballot_open(self, ballot_type_slug):
     def active_ballot(self):
         """Returns the most recently created ballot if it isn't closed."""
         ballot = self.latest_event(BallotDocEvent, type="created_ballot")
-        open = self.ballot_open(ballot.ballot_type.slug) if ballot else False
-        return ballot if open else None
+        if ballot and self.ballot_open(ballot.ballot_type.slug):
+            return ballot
+        else:
+            return None
 
     class Meta:
         abstract = True
@@ -167,7 +176,7 @@ class Meta:
 
 class Document(DocumentInfo):
     name = models.CharField(max_length=255, primary_key=True)           # immutable
-    related = models.ManyToManyField('DocAlias', through=RelatedDocument, blank=True, related_name="reversely_related_document_set")
+    #related = models.ManyToManyField('DocAlias', through=RelatedDocument, blank=True, related_name="reversely_related_document_set")
     authors = models.ManyToManyField(Email, through=DocumentAuthor, blank=True)
 
     def __unicode__(self):
@@ -230,6 +239,14 @@ def display_name(self):
             name = name.upper()
         return name
 
+    def related_that(self, relationship):
+        """Return the documents that are source of relationship targeting self."""
+        return Document.objects.filter(relateddocument__target__document=self, relateddocument__relationship=relationship)
+
+    def related_that_doc(self, relationship):
+        """Return the doc aliases that are target of relationship originating from self."""
+        return DocAlias.objects.filter(relateddocument__source=self, relateddocument__relationship=relationship)
+
     #TODO can/should this be a function instead of a property? Currently a view uses it as a property
     @property
     def telechat_date(self):
@@ -284,9 +301,6 @@ def rfc_number(self):
         qs = self.docalias_set.filter(name__startswith='rfc')
         return qs[0].name[3:] if qs else None
 
-    def replaced_by(self):
-        return [ rel.source for alias in self.docalias_set.all() for rel in alias.relateddocument_set.filter(relationship='replaces') ]
-
     def friendly_state(self):
         """ Return a concise text description of the document's current state """
         if self.type_id=='draft':
@@ -305,12 +319,12 @@ def friendly_state(self):
                      iesg_state_summary = iesg_state_summary + "::"+"::".join(tag.name for tag in iesg_substate)
 
             if self.get_state_slug() == "rfc":
-                #return "<a href=\"%s\">RFC %d</a>" % (urlreverse('doc_view', args=['rfc%d' % int(self.rfc_number())]), int(self.rfc_number()))
-                return "RFC %d (%s)" % (int(self.rfc_number()), self.std_level) 
+                n = self.rfc_number()
+                return "<a href=\"%s\">RFC %s</a>" % (urlreverse('doc_view', kwargs=dict(name='rfc%s' % n)), n)
             elif self.get_state_slug() == "repl":
-                rs = self.replaced_by()
+                rs = self.related_that("replaces")
                 if rs:
-                    return "Replaced by "+", ".join("<a href=\"%s\">%s</a>" % (urlreverse('doc_view', args=[name]),name) for name in rs)
+                    return mark_safe("Replaced by " + ", ".join("<a href=\"%s\">%s</a>" % (urlreverse('doc_view', args=[name]), name) for name in rs))
                 else:
                     return "Replaced"
             elif self.get_state_slug() == "active":
@@ -585,7 +599,13 @@ def all_positions(self):
 
                 if e.pos != prev:
                     latest.old_positions.append(e.pos)
-    
+
+        # get rid of trailling "No record" positions, some old ballots
+        # have plenty of these
+        for p in positions:
+            while p.old_positions and p.old_positions[-1].slug == "norecord":
+                p.old_positions.pop()
+
         # add any missing ADs through fake No Record events
         if self.doc.active_ballot() == self:
             norecord = BallotPositionName.objects.get(slug="norecord")

ietf/doc/migrations/0012_cleanup_doc_notes.py

@@ -1,4 +1,144 @@
+import os, shutil, datetime
 
+import django.test
+from django.core.urlresolvers import reverse as urlreverse
+from django.conf import settings
 
+from pyquery import PyQuery
+
+from ietf.utils.mail import outbox
+from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.utils.test_data import make_test_data
+
+from ietf.doc.models import *
+from ietf.name.models import *
+from ietf.group.models import *
+from ietf.person.models import *
+from ietf.meeting.models import Meeting, MeetingTypeName
+from ietf.iesg.models import TelechatDate
+
+# extra tests
 from ietf.doc.tests_conflict_review import *
-from ietf.doc.tests_status_change import *
+
+
+class DocTestCase(django.test.TestCase):
+    fixtures = ['names']
+
+    def test_document_draft(self):
+        draft = make_test_data()
+
+        # these tests aren't testing all attributes yet, feel free to
+        # expand them
+
+
+        # active draft
+        draft.set_state(State.objects.get(type="draft", slug="active"))
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("Active Internet-Draft" in r.content)
+
+        # expired draft
+        draft.set_state(State.objects.get(type="draft", slug="expired"))
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("Expired Internet-Draft" in r.content)
+
+        # replaced draft
+        draft.set_state(State.objects.get(type="draft", slug="repl"))
+
+        replacement = Document.objects.create(
+            name="draft-ietf-replacement",
+            time=datetime.datetime.now(),
+            type_id="draft",
+            title="Replacement Draft",
+            stream_id=draft.stream_id, group_id=draft.group_id, abstract=draft.stream, rev=draft.rev,
+            pages=draft.pages, intended_std_level_id=draft.intended_std_level_id,
+            shepherd_id=draft.shepherd_id, ad_id=draft.ad_id, expires=draft.expires,
+            notify=draft.notify, note=draft.note)
+        DocAlias.objects.create(name=replacement.name, document=replacement)
+        rel = RelatedDocument.objects.create(source=replacement,
+                                             target=draft.docalias_set.get(name__startswith="draft"),
+                                             relationship_id="replaces")
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("Replaced Internet-Draft" in r.content)
+        self.assertTrue(replacement.name in r.content)
+        rel.delete()
+
+        # draft published as RFC
+        draft.set_state(State.objects.get(type="draft", slug="rfc"))
+        draft.std_level_id = "bcp"
+        draft.save()
+
+        DocEvent.objects.create(doc=draft, type="published_rfc", by=Person.objects.get(name="(System)"))
+
+        rfc_alias = DocAlias.objects.create(name="rfc123456", document=draft)
+        bcp_alias = DocAlias.objects.create(name="bcp123456", document=draft)
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(r.status_code, 302)
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=bcp_alias.name)))
+        self.assertEqual(r.status_code, 302)
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=rfc_alias.name)))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("RFC 123456" in r.content)
+        self.assertTrue(draft.name in r.content)
+
+        # naked RFC
+        rfc = Document.objects.create(
+            name="rfc1234567",
+            type_id="draft",
+            title="RFC without a Draft",
+            stream_id="ise",
+            group=Group.objects.get(type="individ"),
+            std_level_id="ps")
+        DocAlias.objects.create(name=rfc.name, document=rfc)
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=rfc.name)))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("RFC 1234567" in r.content)
+
+        # unknown draft
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name="draft-xyz123")))
+        self.assertEqual(r.status_code, 404)
+
+    def test_document_charter(self):
+        make_test_data()
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name="charter-ietf-mars")))
+        self.assertEqual(r.status_code, 200)
+
+    def test_document_conflict_review(self):
+        make_test_data()
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name='conflict-review-imaginary-irtf-submission')))
+        self.assertEqual(r.status_code, 200)
+
+    def test_document_ballot(self):
+        doc = make_test_data()
+        ballot = doc.active_ballot()
+
+        BallotPositionDocEvent.objects.create(
+            doc=doc,
+            type="changed_ballot_position",
+            pos_id="yes",
+            comment="Looks fine to me",
+            comment_time=datetime.datetime.now(),
+            ad=Person.objects.get(user__username="ad"),
+            by=Person.objects.get(name="(System)"))
+
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
+        self.assertEqual(r.status_code, 200)
+
+        # test popup too while we're at it
+        r = self.client.get(urlreverse("ietf.doc.views_doc.ballot_for_popup", kwargs=dict(name=doc.name)))
+        self.assertEqual(r.status_code, 200)
+        
+    def test_document_json(self):
+        doc = make_test_data()
+
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_json", kwargs=dict(name=doc.name)))
+        self.assertEqual(r.status_code, 200)