Up through antigravity example.

pauleveritt · pauleveritt · commit e999286f070b · 2022-10-01T16:52:51.000-04:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@ classifiers = [
 Changelog = "https://github.com/pauleveritt/psc/releases"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.10"
 click = ">=8.0.1"
 nox = "^2022.1.7"
 typer = { extras = ["all"], version = "^0.6.1" }
diff --git a/src/psc/gallery/examples/altair/index.html b/src/psc/gallery/examples/altair/index.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Altair Visualization</title>
+    <link rel="icon" type="image/png" href="../../../favicon.png">
+    <script defer src="../../../pyscript/pyscript.js"></script>
+</head>
+<body>
+<py-config src="../py_config.toml">
+    packages=[
+    "altair",
+    "pandas",
+    "vega_datasets"
+    ]
+</py-config>
+<div id="altair" style="width: 100%; height: 100%"></div>
+<py-script output="altair">
+        import altair as alt
+        from vega_datasets import data
+
+        source = data.movies.url
+
+        pts = alt.selection(type="single", encodings=['x'])
+
+        rect = alt.Chart(data.movies.url).mark_rect().encode(
+            alt.X('IMDB_Rating:Q', bin=True),
+            alt.Y('Rotten_Tomatoes_Rating:Q', bin=True),
+            alt.Color('count()',
+                      scale=alt.Scale(scheme='greenblue'),
+                      legend=alt.Legend(title='Total Records')
+                      )
+        )
+
+        circ = rect.mark_point().encode(
+            alt.ColorValue('grey'),
+            alt.Size('count()',
+                     legend=alt.Legend(title='Records in Selection')
+                     )
+        ).transform_filter(
+            pts
+        )
+
+        bar = alt.Chart(source).mark_bar().encode(
+            x='Major_Genre:N',
+            y='count()',
+            color=alt.condition(pts, alt.ColorValue("steelblue"), alt.ColorValue("grey"))
+        ).properties(
+            width=550,
+            height=200
+        ).add_selection(pts)
+
+        alt.vconcat(
+            rect + circ,
+            bar
+        ).resolve_legend(
+            color="independent",
+            size="independent"
+        )
+</py-script>
+</body>
+</html>
diff --git a/src/psc/gallery/examples/altair/index.md b/src/psc/gallery/examples/altair/index.md
@@ -0,0 +1,5 @@
+---
+title: Altair Visualization
+subtitle: Declarative statistical visualization library.
+---
+Visualizing the IMDB ranking.
diff --git a/src/psc/gallery/examples/antigravity/antigravity.py b/src/psc/gallery/examples/antigravity/antigravity.py
@@ -0,0 +1,52 @@
+"""Animate the xkcd comic."""
+import random
+import sys
+
+from js import DOMParser
+from js import document
+from js import setInterval
+from pyodide.ffi import create_proxy
+from pyodide.http import open_url
+
+
+class Antigravity:
+    """Implement antigravity."""
+
+    url = "./antigravity.svg"
+
+    def __init__(self, target=None, interval=10, append=True, fly=False):
+        """Construct antigravity."""
+        target = target or sys.stdout._out
+        self.target = (
+            document.getElementById(target) if isinstance(target, str) else target
+        )
+        doc = DOMParser.new().parseFromString(
+            open_url(self.url).read(), "image/svg+xml"
+        )
+        self.node = doc.documentElement
+        if append:
+            self.target.append(self.node)
+        else:
+            self.target.replaceChildren(self.node)
+        self.xoffset, self.yoffset = 0, 0
+        self.interval = interval
+        if fly:
+            self.fly()
+
+    def fly(self):
+        """Schedule a taking off-and-fly."""
+        setInterval(create_proxy(self.move), self.interval)
+
+    def move(self):
+        """Move the item."""
+        char = self.node.getElementsByTagName("g")[1]
+        char.setAttribute("transform", f"translate({self.xoffset}, {-self.yoffset})")
+        self.xoffset += random.normalvariate(0, 1) / 20
+        if self.yoffset < 50:
+            self.yoffset += 0.1
+        else:
+            self.yoffset += random.normalvariate(0, 1) / 20
+
+
+_auto = Antigravity(append=True)
+fly = _auto.fly
diff --git a/src/psc/gallery/examples/antigravity/antigravity.svg b/src/psc/gallery/examples/antigravity/antigravity.svg
diff --git a/src/psc/gallery/examples/antigravity/index.html b/src/psc/gallery/examples/antigravity/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>xkcd Antigravity</title>
+    <link rel="icon" type="image/png" href="../../../favicon.png">
+    <script defer src="../../../pyscript/pyscript.js"></script>
+</head>
+<body>
+<py-config src="../py_config.toml">
+    paths = ["./antigravity.py"]
+</py-config>
+<strong>Based on xkcd: antigravity https://xkcd.com/353/.</strong>
+<py-script>
+    import antigravity
+
+    antigravity.fly()
+</py-script>
+
+</body>
+</html>
diff --git a/src/psc/gallery/examples/antigravity/index.md b/src/psc/gallery/examples/antigravity/index.md
@@ -0,0 +1,5 @@
+---
+title: xkcd Antigravity
+subtitle: We can fly!
+---
+Based on the [xkcd antigravity](https://xkcd.com/353/)
diff --git a/src/psc/gallery/examples/hello_world/index.html b/src/psc/gallery/examples/hello_world/index.html
@@ -1,15 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-
     <title>Hello World</title>
-
     <link rel="icon" type="image/png" href="../../../favicon.png">
     <script defer src="../../../pyscript/pyscript.js"></script>
     <link rel="stylesheet" href="hello_world.css">
-    <script defer src="hello_world.js"></script>
 </head>
 <body>
 <py-config src="../py_config.toml"></py-config>
diff --git a/src/psc/gallery/examples/hello_world/index.md b/src/psc/gallery/examples/hello_world/index.md
@@ -2,4 +2,4 @@
 title: Hello World
 subtitle: The classic hello world, but in Python -- in a browser!
 ---
-The *body* description.
+The *body* description.
diff --git a/src/psc/gallery/examples/hello_world_py/index.html b/src/psc/gallery/examples/hello_world_py/index.html
@@ -1,22 +1,11 @@
-<!--
-  contributor: example@contributor.me
-  tags: example-tag, another-example
--->
-
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-
     <title>Hello World Python</title>
-
     <link rel="icon" type="image/png" href="../../../favicon.png">
     <script defer src="../../../pyscript/pyscript.js"></script>
     <link rel="stylesheet" href="hello_world.css">
-    <script defer src="hello_world.js"></script>
 </head>
-
 <body>
 <py-config src="../py_config.toml">
     paths = ["hello_world.py"]
diff --git a/src/psc/gallery/examples/hello_world_py/index.md b/src/psc/gallery/examples/hello_world_py/index.md
@@ -2,4 +2,4 @@
 title: Hello World Python
 subtitle: The hello world example, but in a .py file.
 ---
-The *body* description.
+The *body* description.
diff --git a/src/psc/resources.py b/src/psc/resources.py
@@ -4,7 +4,6 @@
 """
 from dataclasses import dataclass
 from dataclasses import field
-from pathlib import Path
 from pathlib import PurePath
 from typing import cast
 
@@ -15,6 +14,7 @@
 
 from psc.here import HERE
 
+
 EXCLUSIONS = ("pyscript.css", "pyscript.js", "favicon.png")
 
 
diff --git a/tests/examples/test_altair.py b/tests/examples/test_altair.py
@@ -0,0 +1,24 @@
+"""Test the ``Altair`` example."""
+import pytest
+from playwright.sync_api import Page
+
+from psc.fixtures import PageT
+
+
+def test_altair(client_page: PageT) -> None:
+    """Test the static HTML for Altair."""
+    soup = client_page("/gallery/examples/altair/")
+    title = soup.select_one("title")
+    assert title and title.text == "Altair Visualization | PyScript Collective"
+
+
+@pytest.mark.full
+def test_altair_full(fake_page: Page) -> None:
+    """Use Playwright to do a test on Altair."""
+    # Use `PWDEBUG=1` to run "head-ful" in Playwright test app
+    url = "http://fake/gallery/examples/altair/index.html"
+    fake_page.goto(url)
+    assert fake_page.title() == "Altair Visualization"
+    element = fake_page.wait_for_selector(".chart-wrapper")
+    if element:
+        assert element.get_attribute("role") == "graphics-document"
diff --git a/tests/examples/test_antigravity.py b/tests/examples/test_antigravity.py
@@ -0,0 +1,24 @@
+"""Test the ``Antigravity`` example."""
+import pytest
+from playwright.sync_api import Page
+
+from psc.fixtures import PageT
+
+
+def test_antigravity(client_page: PageT) -> None:
+    """Test the static HTML for Antigravity."""
+    soup = client_page("/gallery/examples/antigravity/")
+    title = soup.select_one("title")
+    assert title and title.text == "xkcd Antigravity | PyScript Collective"
+
+
+@pytest.mark.full
+def test_antigravity_full(fake_page: Page) -> None:
+    """Use Playwright to do a test on Antigravity."""
+    # Use `PWDEBUG=1` to run "head-ful" in Playwright test app
+    url = "http://fake/gallery/examples/antigravity/index.html"
+    fake_page.goto(url)
+    assert fake_page.title() == "xkcd Antigravity"
+    element = fake_page.wait_for_selector("#svg8")
+    if element:
+        assert element.get_attribute("id") == "svg8"
diff --git a/tests/examples/test_hello_world.py b/tests/examples/test_hello_world.py
@@ -18,6 +18,7 @@ def test_hello_world_full(fake_page: Page) -> None:
     # Use `PWDEBUG=1` to run "head-ful" in Playwright test app
     url = "http://fake/gallery/examples/hello_world/index.html"
     fake_page.goto(url)
+    assert fake_page.title() == "Hello World"
     element = fake_page.wait_for_selector("text=...world")
     if element:
         assert element.text_content() == "...world"
diff --git a/tests/examples/test_hello_world_py.py b/tests/examples/test_hello_world_py.py
@@ -1,4 +1,8 @@
 """Test the ``Hello World`` in Python file example."""
+import builtins
+from dataclasses import dataclass
+from typing import cast
+
 import pytest
 from playwright.sync_api import Page
 
@@ -12,12 +16,36 @@ def test_hello_world(client_page: PageT) -> None:
     assert title and title.text == "Hello World Python | PyScript Collective"
 
 
+@dataclass
+class FakeElement:
+    """Stub out the usage of PyScript's injected Element."""
+
+    target_name: str
+    result: str | None = None
+
+    def write(self, value: str) -> None:
+        """Store what you were told to display."""
+        self.result = value
+
+
+def test_hello_world_python() -> None:
+    """Unit test the hello_world.py that is loaded."""
+    try:
+        builtins.Element = FakeElement
+        from psc.gallery.examples.hello_world_py.hello_world import output
+    finally:
+        delattr(builtins, "Element")
+
+    assert cast(FakeElement, output).result == "From Python..."
+
+
 @pytest.mark.full
 def test_hello_world_full(fake_page: Page) -> None:
     """Use Playwright to do a test on Hello World."""
     # Use `PWDEBUG=1` to run "head-ful" in Playwright test app
     url = "http://fake/gallery/examples/hello_world_py/index.html"
     fake_page.goto(url)
+    assert fake_page.title() == "Hello World Python"
     element = fake_page.wait_for_selector("text=From Python...")
     if element:
         assert element.text_content() == "From Python..."
diff --git a/tests/test_generic_example.py b/tests/test_generic_example.py
@@ -1,7 +1,4 @@
 """Test machinery common to all gallery examples."""
-import pytest
-from bs4 import element
-from playwright.sync_api import Page
 from starlette.testclient import TestClient
 
 from psc.fixtures import PageT
@@ -24,7 +21,6 @@ def test_hello_world(client_page: PageT) -> None:
 
     # See if extra_head got filled, then resolve those
     assert soup.find_all("link", href="hello_world.css")
-    assert soup.find_all("script", src="hello_world.js")
 
     # Ensure the ``<main>`` got filled
     assert soup.select_one("main")
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -1,5 +1,4 @@
 """Test cases for the __main__ module."""
-import pytest
 from typer.testing import CliRunner
 
 from psc.__main__ import app
diff --git a/tests/test_resources.py b/tests/test_resources.py
@@ -76,7 +76,6 @@ def test_example() -> None:
         == "The classic hello world, but in Python -- in a browser!"
     )
     assert "hello_world.css" in this_example.extra_head
-    assert "hello_world.js" in this_example.extra_head
     assert "<h1>Hello ...</h1>" in this_example.body
 
 
