Update trac 1.4.4

DjangoPlugin/tracdjangoplugin/__init__.py

@@ -7,6 +7,17 @@
 from tracext.github import GitHubBrowser
 
 
+class CustomTheme(Component):
+    implements(IRequestFilter)
+
+    def pre_process_request(self, req, handler):
+        return handler
+
+    def post_process_request(self, req, template, data, metadata):
+        req.chrome["theme"] = "django_theme.html"
+        return template, data, metadata
+
+
 class CustomWikiModule(WikiModule):
     """Works in combination with the CustomNavigationBar and replaces
     the default wiki module.  Has a different logic for active item
@@ -37,7 +48,7 @@ def process_request(self, req):
     def pre_process_request(self, req, handler):
         return handler
 
-    def post_process_request(self, req, template, data, content_type):
+    def post_process_request(self, req, template, data, metadata):
         if data is None:
             data = {}
         if req.path_info == "/newticket" and not data.get("preview_mode", False):
@@ -48,7 +59,7 @@ def post_process_request(self, req, template, data, content_type):
                 ]
             data["simple_interface"] = simple_interface
             template = "custom_ticket.html"
-        return template, data, content_type
+        return template, data, metadata
 
 
 class CustomNavigationBar(Component):

README.rst

@@ -11,7 +11,7 @@ that can help:
   the database creation).
 * Use ``trac-admin ./trac-env/ permission add anonymous TRAC_ADMIN``
   to give all permissions to the anonymous user.
-* Use the command ``tracd --port 9000 -s trac-env`` to serve Trac locally.
+* Use the command ``DJANGO_SETTINGS_MODULE=tracdjangoplugin.settings TRAC_ENV=`pwd`/trac-env gunicorn tracdjangoplugin.wsgi:application --bind 0.0.0.0:9000 --workers=1 --reload`` to serve Trac locally.
 * If you've modified the ``trackhack.scss`` file, use
   ``sassc scss/trachacks.scss trac-env/htdocs/css/trachacks.css -s compressed``
   to compile it to CSS.

noshadows.py

@@ -0,0 +1,226 @@
+import argparse
+from datetime import datetime
+from functools import partial, singledispatch
+from pathlib import Path
+import sys
+import unittest
+
+try:
+    from tinycss2 import parse_stylesheet
+    from tinycss2 import ast as tokens
+except ImportError:
+    print("Missing requirement: tinycss2", file=sys.stderr)
+    sys.exit(1)
+
+
+def get_parser():
+    parser = argparse.ArgumentParser(
+        description="Scan trac's CSS files to detect box-shadow rules and generate a stylesheet that resets them."
+    )
+    parser.add_argument("cssfiles", nargs="*", type=Path, help="The CSS files to scan")
+    parser.add_argument(
+        "--outfile",
+        "-o",
+        type=argparse.FileType("w"),
+        default="-",
+        help="Where to write the output",
+    )
+    parser.add_argument("--tests", action="store_true")
+    return parser
+
+
+def tripletwise(iterable):  # no relation to Jeff
+    """
+    Like itertools.pairwise, but for triplets instead of pairs.
+    """
+    i = iter(iterable)
+    try:
+        x, y, z = next(i), next(i), next(i)
+    except StopIteration:
+        return
+
+    yield x, y, z
+    for el in i:
+        x, y, z = y, z, el
+        yield x, y, z
+
+
+def skip_whitespace(nodes):
+    return filter(lambda node: node.type != "whitespace", nodes)
+
+
+def has_shadow(rule):
+    if not rule.content:
+        return False
+
+    for a, b, c in tripletwise(skip_whitespace(rule.content)):
+        if isinstance(a, tokens.IdentToken) and a.value == "box-shadow":
+            assert isinstance(
+                c, (tokens.IdentToken, tokens.DimensionToken, tokens.NumberToken)
+            ), f"Unexpected node type {c.type}"
+            return isinstance(c, (tokens.DimensionToken, tokens.NumberToken))
+
+
+def find_shadow(rules):
+    for rule in rules:
+        if has_shadow(rule):
+            yield rule
+
+
+@singledispatch
+def tokenstr(token: tokens.Node):
+    return token.value
+
+
+@tokenstr.register
+def _(token: tokens.WhitespaceToken):
+    return " "
+
+
+@tokenstr.register
+def _(token: tokens.SquareBracketsBlock):
+    return "[" + tokenlist_to_str(token.content) + "]"
+
+
+@tokenstr.register
+def _(token: tokens.HashToken):
+    return f"#{token.value}"
+
+
+@tokenstr.register
+def _(token: tokens.StringToken):
+    return f'"{token.value}"'
+
+
+def tokenlist_to_str(tokens):
+    return "".join(map(tokenstr, tokens))
+
+
+def selector_str(rule):
+    """
+    Return the given rule's selector as a string
+    """
+    return tokenlist_to_str(rule.prelude).strip()
+
+
+def reset_css_str(selector):
+    return f"{selector}{{\n    @include noshadow;\n}}"
+
+
+class NoShadowTestCase(unittest.TestCase):
+    @classmethod
+    def run_and_exit(cls):
+        """
+        Run all tests on the class and exit with the proper exit status (1 if any failures occured,
+        0 otherwise)
+        """
+        runner = unittest.TextTestRunner()
+        suite = unittest.defaultTestLoader.loadTestsFromTestCase(cls)
+        result = runner.run(suite)
+        retval = 0 if result.wasSuccessful() else 1
+        sys.exit(retval)
+
+    def test_tripletwise(self):
+        self.assertEqual(
+            list(tripletwise("ABCDEF")),
+            [("A", "B", "C"), ("B", "C", "D"), ("C", "D", "E"), ("D", "E", "F")],
+        )
+
+    def test_tripletwise_too_short(self):
+        self.assertEqual(list(tripletwise("AB")), [])
+
+    def test_skip_whitespace(self):
+        rules = parse_stylesheet("html { color: red  ; }")
+        self.assertEqual(len(rules), 1)
+        non_whitespace_content = list(skip_whitespace(rules[0].content))
+        self.assertEqual(
+            len(non_whitespace_content), 4
+        )  # attr, colon, value, semicolon
+
+    def test_has_shadow(self):
+        (rule,) = parse_stylesheet("html {box-shadow: 10px 5px 5px red;}")
+        self.assertTrue(has_shadow(rule))
+
+    def test_has_shadow_with_box_shadow_none(self):
+        (rule,) = parse_stylesheet("html {box-shadow: none;}")
+        self.assertFalse(has_shadow(rule))
+
+    def test_has_shadow_empty_rule(self):
+        (rule,) = parse_stylesheet("html {}")
+        self.assertFalse(has_shadow(rule))
+
+    def test_selector_str_tag(self):
+        (rule,) = parse_stylesheet("html {}")
+        self.assertEqual(selector_str(rule), "html")
+
+    def test_selector_str_classname(self):
+        (rule,) = parse_stylesheet(".className {}")
+        self.assertEqual(selector_str(rule), ".className")
+
+    def test_selector_str_id(self):
+        (rule,) = parse_stylesheet("#identifier {}")
+        self.assertEqual(selector_str(rule), "#identifier")
+
+    def test_selector_str_with_brackets(self):
+        (rule,) = parse_stylesheet('input[type="text"] {}')
+        self.assertEqual(selector_str(rule), 'input[type="text"]')
+
+    def test_selector_str_with_brackets_noquotes(self):
+        (rule,) = parse_stylesheet("input[type=text] {}")
+        self.assertEqual(selector_str(rule), "input[type=text]")
+
+    def test_selector_str_with_comma(self):
+        (rule,) = parse_stylesheet("a, button {}")
+        self.assertEqual(selector_str(rule), "a, button")
+
+    def test_selector_str_with_comma_and_newline(self):
+        (rule,) = parse_stylesheet("a,\nbutton {}")
+        self.assertEqual(selector_str(rule), "a, button")
+
+    def test_selector_str_pseudoclass(self):
+        (rule,) = parse_stylesheet("a:visited {}")
+        self.assertEqual(selector_str(rule), "a:visited")
+
+    def test_selector_str_pseudoclass_nonstandard(self):
+        (rule,) = parse_stylesheet("button::-moz-focus-inner {}")
+        self.assertEqual(selector_str(rule), "button::-moz-focus-inner")
+
+
+SCSS_NOSHADOW_MIXIN_HEADER = """\
+// Trac uses box-shadow and text-shadow everywhere but their 90s look doesn't
+// fit well with our design.
+@mixin noshadow {
+    box-shadow: none;
+    border-radius: unset;
+}
+"""
+
+
+if __name__ == "__main__":
+    parser = get_parser()
+    options = parser.parse_args()
+
+    if options.tests:
+        NoShadowTestCase.run_and_exit()
+
+    echo = partial(print, file=options.outfile)
+
+    echo(
+        f"// Generated by {Path(__file__).name} on {datetime.now().isoformat()}",
+        end="\n\n",
+    )
+    echo(SCSS_NOSHADOW_MIXIN_HEADER)
+    echo()
+
+    for i, filepath in enumerate(sorted(options.cssfiles)):
+        rules = parse_stylesheet(
+            filepath.read_text(), skip_comments=True, skip_whitespace=True
+        )
+        shadowrules = list(find_shadow(rules))
+        if shadowrules:
+            if i > 0:
+                echo()
+                echo()
+            echo(f"// {filepath.name}")
+            combined_selector = ",\n".join(map(selector_str, shadowrules))
+            echo(reset_css_str(combined_selector))

requirements.txt

@@ -1,15 +1,17 @@
-Trac==1.2.6
+Trac==1.4.4
 Pygments==2.5.2
 dnspython==1.15
 spambayes == 1.1b1
 psycopg2==2.7.6.1 --no-binary=psycopg2
 docutils==0.14
 Django==1.11.29
 libsass==0.17.0
+Genshi==0.7.7  # still required by some plugins
 
 # Trac plugins
 TracSpamFilter==1.2.7
-TracXMLRPC==1.1.9
+# TracXMLRPC from PyPI does not (yet) have a 1.2.0 release (compatible with Trac 1.4)
+https://trac-hacks.org/browser/xmlrpcplugin/trunk?rev=18591&format=zip
 
 oauthlib==2.1.0
 requests==2.20.1
@@ -19,4 +21,4 @@ trac-github==2.3
 gunicorn==19.10.0
 sentry-sdk==1.11.0
 
--e ./DjangoPlugin
+-e ./DjangoPlugin