Link the author in each example. Switch from PurePath keys to just strings.

Author: pauleveritt

src/psc/__main__.py

@@ -102,15 +102,15 @@ def build() -> None:  # pragma: no cover
         # Now for each page
         resources = get_resources()
         for page in resources.pages.values():
-            response = test_client.get(f"/pages/{page.path.stem}.html")
-            output = public / f"pages/{page.path.stem}.html"
+            response = test_client.get(f"/pages/{page.name}.html")
+            output = public / f"pages/{page.name}.html"
             output.write_text(response.text)
 
         # And for each example
         for example in resources.examples.values():
-            url = f"/gallery/examples/{example.path.stem}/index.html"
+            url = f"/gallery/examples/{example.name}/index.html"
             response = test_client.get(url)
-            output = public / f"gallery/examples/{example.path.stem}/index.html"
+            output = public / f"gallery/examples/{example.name}/index.html"
             output.write_text(response.text)
 
 

src/psc/app.py

@@ -1,7 +1,6 @@
 """Provide a web server to browse the examples."""
 import contextlib
 from collections.abc import Iterator
-from pathlib import PurePath
 from typing import AsyncContextManager
 
 from starlette.applications import Starlette
@@ -20,6 +19,7 @@
 from psc.resources import Resources
 from psc.resources import get_resources
 
+
 templates = Jinja2Templates(directory=HERE / "templates")
 
 
@@ -46,8 +46,10 @@ async def homepage(request: Request) -> _TemplateResponse:
 
 async def gallery(request: Request) -> _TemplateResponse:
     """Handle the gallery listing page."""
-    these_examples: Iterator[Example] = request.app.state.resources.examples.values()
+    resources = request.app.state.resources
+    these_examples: Iterator[Example] = resources.examples.values()
     root_path = ".."
+    these_authors = resources.authors
 
     return templates.TemplateResponse(
         "gallery.jinja2",
@@ -56,6 +58,7 @@ async def gallery(request: Request) -> _TemplateResponse:
             examples=these_examples,
             root_path=root_path,
             request=request,
+            authors=these_authors,
         ),
     )
 
@@ -78,9 +81,9 @@ async def authors(request: Request) -> _TemplateResponse:
 
 async def author(request: Request) -> _TemplateResponse:
     """Handle an author page."""
-    author_path = PurePath(request.path_params["author_name"])
+    author_name = request.path_params["author_name"]
     resources: Resources = request.app.state.resources
-    this_author = resources.authors[author_path]
+    this_author = resources.authors[author_name]
     root_path = "../../.."
 
     return templates.TemplateResponse(
@@ -96,10 +99,15 @@ async def author(request: Request) -> _TemplateResponse:
 
 async def example(request: Request) -> _TemplateResponse:
     """Handle an example page."""
-    example_path = PurePath(request.path_params["example_name"])
+    example_name = request.path_params["example_name"]
     resources: Resources = request.app.state.resources
-    this_example = resources.examples[example_path]
+    this_example = resources.examples[example_name]
     root_path = "../../.."
+    author_name = this_example.author
+    if author_name:
+        this_author = resources.authors.get(author_name, None)
+    else:
+        this_author = None
 
     # Set the pyscript URL to the CDN if we are being built from
     # the ``psc build`` command.
@@ -119,15 +127,16 @@ async def example(request: Request) -> _TemplateResponse:
             request=request,
             root_path=root_path,
             pyscript_url=pyscript_url,
+            author=this_author,
         ),
     )
 
 
 async def content_page(request: Request) -> _TemplateResponse:
     """Handle a content page."""
-    page_path = PurePath(request.path_params["page_name"])
+    page_name = request.path_params["page_name"]
     resources: Resources = request.app.state.resources
-    this_page = resources.pages[page_path]
+    this_page = resources.pages[page_name]
 
     return templates.TemplateResponse(
         "page.jinja2",

src/psc/gallery/authors/pauleveritt.md

@@ -3,4 +3,4 @@ title: Paul Everitt
 ---
 
 Python and Web Developer Advocate at @JetBrains for @PyCharm and @WebStormIDE.
-Python oldster, Zope/Plone/Pyramid mafia. Girls lacrosse, formerly running.
+Python oldster, Zope/Plone/Pyramid mafia. Girls lacrosse, formerly running.

src/psc/gallery/examples/interest_calculator/index.md

@@ -1,5 +1,6 @@
 ---
 title: Compound Interest Calculator
-subtitle: The classic hello world, but in Python -- in a browser!
+subtitle: Enter some numbers, get some numbers.
+author: meg-1
 ---
 The *body* description.

src/psc/resources.py

@@ -17,12 +17,13 @@
 from psc.here import HERE
 from psc.here import PYODIDE
 
+
 EXCLUSIONS = ("pyscript.css", "pyscript.js", "favicon.png")
 
 
 def tag_filter(
-        tag: Tag,
-        exclusions: tuple[str, ...] = EXCLUSIONS,
+    tag: Tag,
+    exclusions: tuple[str, ...] = EXCLUSIONS,
 ) -> bool:
     """Filter nodes from example that should not get included."""
     attr = "href" if tag.name == "link" else "src"
@@ -74,7 +75,7 @@ def get_body_content(s: BeautifulSoup, test_path: Path = PYODIDE) -> str:
 class Resource:
     """Base dataclass used for all resources."""
 
-    path: PurePath
+    name: str
     title: str = ""
     body: str = ""
     extra_head: str = ""
@@ -91,21 +92,24 @@ class Example(Resource):
     """
 
     subtitle: str = ""
+    description: str = ""
+    author: str | None = None
 
     def __post_init__(self) -> None:
         """Extract most of the data from the HTML file."""
         # Title, subtitle, body come from the example's MD file.
-        index_md_file = HERE / "gallery/examples" / self.path / "index.md"
+        index_md_file = HERE / "gallery/examples" / self.name / "index.md"
         md_fm = frontmatter.load(index_md_file)
         self.title = md_fm.get("title", "")
+        self.author = md_fm.get("author", "")
         self.subtitle = md_fm.get("subtitle", "")
         md = MarkdownIt()
-        self.body = str(md.render(md_fm.content))
+        self.description = str(md.render(md_fm.content))
 
         # Main, extra head example's HTML file.
-        index_html_file = HERE / "gallery/examples" / self.path / "index.html"
+        index_html_file = HERE / "gallery/examples" / self.name / "index.html"
         if not index_html_file.exists():  # pragma: nocover
-            raise ValueError(f"No example at {self.path}")
+            raise ValueError(f"No example at {self.name}")
         soup = BeautifulSoup(index_html_file.read_text(), "html5lib")
         self.extra_head = get_head_nodes(soup)
         self.body = get_body_content(soup)
@@ -117,7 +121,7 @@ class Author(Resource):
 
     def __post_init__(self) -> None:
         """Initialize the rest of the fields from the Markdown."""
-        md_file = HERE / "gallery/authors" / f"{self.path}.md"
+        md_file = HERE / "gallery/authors" / f"{self.name}.md"
         md_fm = frontmatter.load(md_file)
         self.title = md_fm.get("title", "")
         md = MarkdownIt()
@@ -129,14 +133,13 @@ class Page(Resource):
     """A Markdown+frontmatter driven content page."""
 
     subtitle: str = ""
-    body: str = ""
 
     def __post_init__(self) -> None:
         """Extract content from either Markdown or HTML file."""
-        md_file = HERE / "pages" / f"{self.path}.md"
-        html_file = HERE / "pages" / f"{self.path}.html"
+        md_file = HERE / "pages" / f"{self.name}.md"
+        html_file = HERE / "pages" / f"{self.name}.html"
 
-        # If this self.path resolves to a Markdown file, use it first
+        # If this self.name resolves to a Markdown file, use it first
         if md_file.exists():
             md_fm = frontmatter.load(md_file)
             self.title = md_fm.get("title", "")
@@ -157,16 +160,16 @@ def __post_init__(self) -> None:
             if body_node and isinstance(body_node, Tag):
                 self.body = body_node.prettify()
         else:  # pragma: no cover
-            raise ValueError(f"No page at {self.path}")
+            raise ValueError(f"No page at {self.name}")
 
 
 @dataclass
 class Resources:
     """Container for all resources in site."""
 
-    authors: dict[PurePath, Author] = field(default_factory=dict)
-    examples: dict[PurePath, Example] = field(default_factory=dict)
-    pages: dict[PurePath, Page] = field(default_factory=dict)
+    authors: dict[str, Author] = field(default_factory=dict)
+    examples: dict[str, Example] = field(default_factory=dict)
+    pages: dict[str, Page] = field(default_factory=dict)
 
 
 def get_sorted_paths(target_dir: Path, only_dirs: bool = True) -> list[PurePath]:
@@ -183,26 +186,23 @@ def get_resources() -> Resources:
     """Factory to construct all the resources in the site."""
     resources = Resources()
 
-    # Load the examples
-    examples = HERE / "gallery/examples"
-    for example in get_sorted_paths(examples):
-        this_path = PurePath(example.name)
-        this_example = Example(path=this_path)
-        resources.examples[this_path] = this_example
-
     # Load the authors
     authors = HERE / "gallery/authors"
     for author in get_sorted_paths(authors, only_dirs=False):
-        this_path = PurePath(author.stem)
-        this_author = Author(path=this_path)
-        resources.authors[this_path] = this_author
+        this_author = Author(name=author.stem)
+        resources.authors[author.stem] = this_author
+
+    # Load the examples
+    examples = HERE / "gallery/examples"
+    for example in get_sorted_paths(examples):
+        this_example = Example(example.stem)
+        resources.examples[example.stem] = this_example
 
     # Load the Pages
     pages_dir = HERE / "pages"
     pages = [e for e in pages_dir.iterdir()]
     for page in pages:
-        this_path = PurePath(page.stem)
-        this_page = Page(path=this_path)
-        resources.pages[this_path] = this_page
+        this_page = Page(name=page.stem)
+        resources.pages[page.stem] = this_page
 
     return resources

src/psc/templates/authors.jinja2

@@ -16,7 +16,7 @@
                 <div class="tile is-parent is-4">
                     <article class="tile is-child box">
                         <p class="title"><a
-                                href="{{ root_path }}/authors/{{ author.path.name }}.html/">{{ author.title }}</a>
+                                href="{{ root_path }}/authors/{{ author.name }}.html/">{{ author.title }}</a>
                         </p>
                         <div class="content">
                             {{ author.body | safe }}

src/psc/templates/example.jinja2

@@ -6,6 +6,9 @@
 {% block main %}
     <main id="main_container" class="container">
         <h1 class="title">{{ title }}</h1>
+        {% if author %}
+            <p>By <a href="../authors/{{ author.name }}.html">{{ author.title  }}</a></p>
+        {% endif %}
         <h1 class="subtitle">{{ subtitle }}</h1>
         <div class="content">{{ body | safe }}</div>
     </main>

src/psc/templates/gallery.jinja2

@@ -11,20 +11,22 @@
         </div>
     </section>
     <main id="main_container" class="container">
-        <div class="tile is-ancestor">
-            {% for example in examples %}
-                <div class="tile is-parent is-4">
-                    <article class="tile is-child box">
-                        <p class="title"><a
-                                href="{{ root_path }}/gallery/examples/{{ example.path.name }}/">{{ example.title }}</a>
-                        </p>
-                        <p class="subtitle">{{ example.subtitle }}</p>
-                        <div class="content">
-                            {{ example.body | safe }}
-                        </div>
-                    </article>
-                </div>
-            {% endfor %}
-        </div>
+        {% for row in examples | batch(3) %}
+            <div class="tile is-ancestor">
+                {% for example in row %}
+                    <div class="tile is-parent is-4">
+                        <article class="tile is-child box">
+                            <p class="title"><a
+                                    href="{{ root_path }}/gallery/examples/{{ example.name }}/">{{ example.title }}</a>
+                            </p>
+                            <p class="subtitle">{{ example.subtitle }}</p>
+                            {% if example.author %}
+                                <p style="margin-top: 1em">By <a href="../authors/{{ example.author }}.html">{{ authors[example.author].title }}</a></p>
+                            {% endif %}
+                        </article>
+                    </div>
+                {% endfor %}
+            </div>
+        {% endfor %}
     </main>
 {% endblock %}

tests/test_author_pages.py

@@ -9,7 +9,8 @@ def test_authors_page(client_page: PageT) -> None:
     assert page_title and "Authors | PyScript Collective" == page_title.text
 
     authors = soup.select_one("article.tile p.title")
-    assert "Margaret" == authors.text.strip()
+    if authors:
+        assert "Margaret" == authors.text.strip()
 
 
 def test_author_page(client_page: PageT) -> None:
@@ -19,4 +20,5 @@ def test_author_page(client_page: PageT) -> None:
     assert page_title and "Margaret | PyScript Collective" == page_title.text
 
     author = soup.select_one("main h1")
-    assert "Margaret" == author.text.strip()
+    if author:
+        assert "Margaret" == author.text.strip()