Support _ in URLs

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 453f5a6338dfe5513b3e2cf68160786a4deb72c1..511abb3c17d6ae676be0cd838e5e5b8587e95526 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -5,53 +5,118 @@
 # Free Software Foundation, version 3.
 
 
+from abc import ABC, abstractmethod
 import unittest
 import io
+import re
 import subprocess
+
 import paperdoorknob
+
 from testing.fakeserver import FakeGlowficServer
-from fetch import DirectFetcher
-from texify import PandocTexifier
+from fetch import DirectFetcher, FakeFetcher, Fetcher
+from glowfic import ContentOnlyLayout, BesideIconLayout
+from images import FakeImageStore
+from spec import Spec
+from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
 TIMEOUT = 8
 
 
-class TestPaperDoorknob(unittest.TestCase):
-    def setUp(self) -> None:
-        self._server = self.enterContext(FakeGlowficServer())
-        self._port = self._server.port()
+class BaseTestProcess(ABC):
+
+    @abstractmethod
+    def url(self) -> str:
+        raise NotImplementedError()
 
-    def testReplies(self) -> None:
-        with DirectFetcher(TIMEOUT) as f:
-            replies = paperdoorknob.replies(
-                paperdoorknob.clean(
-                    paperdoorknob.parse(
-                        f.fetch(f"http://localhost:{self._port}"))))
-            self.assertEqual([r.text.strip() for r in replies],
-                             ["This is glowfic", "You sure?", "Pretty sure."])
+    @abstractmethod
+    def fetcher(self) -> Fetcher:
+        raise NotImplementedError()
 
     def testProcess(self) -> None:
-        texifier = PandocTexifier('pandoc')
-        with DirectFetcher(TIMEOUT) as f:
-            buf = io.BytesIO()
-            paperdoorknob.process(
-                f"http://localhost:{self._port}", f, texifier, buf)
-            self.assertEqual(buf.getvalue(), b'''\\documentclass{article}
+        buf = io.BytesIO()
+        spec = Spec(
+            self.url(),
+            self.fetcher(),
+            FakeImageStore(),
+            lambda x: x,
+            lambda x: None,
+            lambda x: x,
+            ContentOnlyLayout(PandocTexifier('pandoc')),
+            'margin=20mm',
+            buf,
+            lambda _: None)
+        paperdoorknob.process(spec)
+        assert re.match(br'''\\documentclass{article}
+(\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
-This is glowfic
-You \\emph{sure}?
+\\newcommand{\\href}\[2\]{#2\\footnote{\\detokenize{#1}}}
+This is \\href{https://glowfic.com}{glowfic}
+
+You \\emph{sure}\?
+
 Pretty sure.
+
 \\end{document}
-''')
+''', buf.getvalue())
+
+    def testDirectTexifier(self) -> None:
+        texifier = VerifyingTexifier(
+            PandocTexifier('pandoc'), DirectTexifier())
+        buf = io.BytesIO()
+        spec = Spec(
+            self.url(),
+            self.fetcher(),
+            FakeImageStore(),
+            lambda x: x,
+            lambda x: None,
+            lambda x: x,
+            ContentOnlyLayout(texifier),
+            None,
+            buf,
+            lambda _: None)
+        paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
-        texifier = PandocTexifier('pandoc')
-        with DirectFetcher(TIMEOUT) as f:
-            with open("test.tex", 'wb') as out:
-                paperdoorknob.process(
-                    f"http://localhost:{self._port}", f, texifier, out)
-            subprocess.run(['pdflatex', 'test.tex'],
-                           stdin=subprocess.DEVNULL, check=True)
+        with open("test.tex", 'wb') as out:
+            spec = Spec(
+                self.url(),
+                self.fetcher(),
+                FakeImageStore(),
+                lambda x: x,
+                lambda x: None,
+                lambda x: x,
+                BesideIconLayout(PandocTexifier('pandoc'), 20),
+                None,
+                out,
+                lambda _: None)
+            paperdoorknob.process(spec)
+        subprocess.run(['pdflatex', 'test.tex'],
+                       stdin=subprocess.DEVNULL, check=True)
+
+
+class TestProcessFromWebserver(BaseTestProcess, unittest.TestCase):
+
+    def setUp(self) -> None:
+        self._fetcher = self.enterContext(DirectFetcher(TIMEOUT))
+        self._server = self.enterContext(FakeGlowficServer())
+        self._port = self._server.port()
+
+    def url(self) -> str:
+        return f"http://localhost:{self._port}"
+
+    def fetcher(self) -> Fetcher:
+        return self._fetcher
+
+
+class TestProcessFromFakeFetcher(BaseTestProcess, unittest.TestCase):
+
+    def url(self) -> str:
+        return 'fic'
+
+    def fetcher(self) -> Fetcher:
+        with open('testdata/this-is-glowfic.html', 'rb') as f:
+            return FakeFetcher({'fic?view=flat': f.read(9999)})
 
 
 if __name__ == '__main__':