memi-engine 0.4.0__tar.gz → 0.4.2__tar.gz

{memi_engine-0.4.0 → memi_engine-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: memi-engine
-Version: 0.4.0
+Version: 0.4.2
 Summary: Engine for building memi memory card game instances
 Project-URL: Homepage, https://memi.games
 Project-URL: Repository, https://github.com/filias/memi-engine

{memi_engine-0.4.0 → memi_engine-0.4.2}/memi_engine/app.py

@@ -136,6 +136,7 @@ def create_app(config: MemiConfig, instance_static: str | None = None) -> Flask:
             config=config,
             filters=all_filters,
             initial_category=initial_category,
+            category_slugs=seo.canonical_slugs(registry.get_all()),
             page=page or _page(seo.home_meta(config), "/"),
         )
 

{memi_engine-0.4.0 → memi_engine-0.4.2}/memi_engine/seo.py

@@ -15,6 +15,7 @@ override for instances that want their own wording.
 from __future__ import annotations
 
 import re
+import unicodedata
 from collections import Counter
 
 # Roughly where Google truncates the snippet. Not a hard rule on their side,
@@ -67,40 +68,79 @@ def category_label(key: str) -> str:
     return key.rsplit(":", 1)[-1]
 
 
+# Letters NFKD doesn't decompose into an ASCII base + accent.
+_ASCII_FOLD = str.maketrans(
+    {"ł": "l", "Ł": "L", "ø": "o", "Ø": "O", "ß": "ss", "đ": "d"}
+)
+_APOSTROPHES = re.compile(r"['’ʼ`]")
+_NON_SLUG = re.compile(r"[^a-z0-9]+")
+
+
+def slugify(text: str) -> str:
+    """URL-safe form of a category name: ``"marta’s tips"`` -> ``"martas-tips"``.
+
+    Lowercase ASCII letters and digits joined by dashes; accents are dropped
+    (``"monumentos históricos"`` -> ``"monumentos-historicos"``) and apostrophes
+    vanish rather than splitting the word. Empty when nothing ASCII is left
+    (a name in a non-Latin script), and the caller then keeps the raw name.
+    """
+    folded = unicodedata.normalize("NFKD", text.translate(_ASCII_FOLD))
+    ascii_text = folded.encode("ascii", "ignore").decode().lower()
+    return _NON_SLUG.sub("-", _APOSTROPHES.sub("", ascii_text)).strip("-")
+
+
+def _preferred_slugs(keys) -> dict[str, str]:
+    """The one slug each key is shared and indexed under.
+
+    The slugified last segment when no other key's last segment slugifies the
+    same (``culture:food`` -> ``food``), else the slugified full key
+    (``nature-all``). A name with nothing ASCII in it keeps its raw form.
+    """
+    def slug_or_raw(text):
+        return slugify(text) or text
+
+    short = {k: slug_or_raw(category_label(k)) for k in keys}
+    counts = Counter(short.values())
+    return {
+        k: short[k] if counts[short[k]] == 1 else slug_or_raw(k.replace(":", "-"))
+        for k in keys
+    }
+
+
 def category_slugs(keys) -> dict[str, str]:
     """Map every URL slug to its category key.
 
-    A key's last ``:``-segment is a slug when that segment is unique
-    (``culture:food`` -> ``food``); the full dashed key is always available too
-    (``culture-food``), and is the *only* slug for segments that would collide
-    (e.g. several ``…:all`` categories, which all end in ``all``).
+    Each key answers at its preferred slug (see :func:`canonical_slugs`) and,
+    so that links already shared keep working, at the raw forms earlier
+    versions used: the last segment when unique (``marta’s tips``) and the full
+    dashed key (``culture-food``). The raw forms canonicalise to the preferred
+    one, so the duplicates are never indexed.
     """
     keys = list(keys)
+    preferred = _preferred_slugs(keys)
     last = {k: category_label(k) for k in keys}
     counts = Counter(last.values())
     slugs: dict[str, str] = {}
+    for k in keys:
+        slugs[preferred[k]] = k
     for k in keys:
         if counts[last[k]] == 1:
-            slugs[last[k]] = k
+            slugs.setdefault(last[k], k)
         slugs.setdefault(k.replace(":", "-"), k)
+        slugs.setdefault(slugify(k.replace(":", "-")) or k, k)
     return slugs
 
 
 def canonical_slugs(keys) -> dict[str, str]:
     """Map each category key to the one slug that represents it.
 
-    The inverse of :func:`category_slugs`, and the reason it exists: a category
-    with a unique last segment is reachable at both ``/food`` and
-    ``/culture-food``. Both keep working — links to either are already out
-    there — but only the short one goes in the sitemap, and the long one
-    canonicalises to it, so the pair is never indexed as two pages.
+    The inverse of :func:`category_slugs`: a category answers at several
+    slugs (``/food`` and ``/culture-food``; ``/martas-tips`` and the raw
+    ``/marta’s tips``). All keep working — links to them are already out
+    there — but only this one goes in the sitemap and the address bar, and the
+    others canonicalise to it, so they are never indexed as separate pages.
     """
-    preferred: dict[str, str] = {}
-    for slug, key in category_slugs(keys).items():
-        current = preferred.get(key)
-        if current is None or len(slug) < len(current):
-            preferred[key] = slug
-    return preferred
+    return _preferred_slugs(list(keys))
 
 
 def site_description(config) -> str:

{memi_engine-0.4.0 → memi_engine-0.4.2}/memi_engine/static/css/style.css

@@ -699,6 +699,18 @@ h1 a {
     gap: 0.75rem;
 }
 
+.details-title {
+    margin: 0;
+    font-size: 1.3rem;
+    line-height: 1.25;
+    color: var(--heading);
+}
+
+/* Directly under the title, closer than the panel's usual gap. */
+.details-title + .details-area {
+    margin-top: -0.5rem;
+}
+
 .details-area {
     align-self: flex-start;
     font-size: 0.8rem;

{memi_engine-0.4.0 → memi_engine-0.4.2}/memi_engine/static/js/app.js

@@ -66,6 +66,7 @@ function toggleSubmenu(parent) {
     selectedCategories = [];
     seenItems = [];
     menuStack = [];
+    syncUrl();
     renderSubmenu(subcategories[parent], parent);
 }
 
@@ -141,7 +142,20 @@ function closeSubmenu() {
 
 // --- Generic filter system ---
 
+// Keep the address bar on the shareable URL of what's being played: /<slug>
+// while exactly one category is selected, / otherwise. replaceState, so moving
+// between categories doesn't pile up back-button entries.
+function syncUrl() {
+    if (typeof CATEGORY_SLUGS === 'undefined' || !window.history.replaceState) return;
+    const slug = selectedCategories.length === 1 ? CATEGORY_SLUGS[selectedCategories[0]] : null;
+    const path = slug ? '/' + encodeURIComponent(slug) : '/';
+    if (window.location.pathname !== path || window.location.search) {
+        window.history.replaceState(null, '', path);
+    }
+}
+
 function updateFilters() {
+    syncUrl();
     for (const [filterName, filterInfo] of Object.entries(FILTER_CONFIG)) {
         const el = document.getElementById(filterName + '-filter');
         if (!el) continue;
@@ -359,6 +373,8 @@ function osmEmbedUrl(lat, lon, zoom, width, height) {
 function showDetails(details) {
     const panel = document.getElementById('details');
     if (!panel || !details) return;
+    // Headed by the card's answer; the area (if any) sits underneath it.
+    document.getElementById('details-title').textContent = currentName;
     const area = document.getElementById('details-area');
     const text = document.getElementById('details-text');
     const map = document.getElementById('details-map');

{memi_engine-0.4.0 → memi_engine-0.4.2}/memi_engine/templates/index.html

@@ -59,6 +59,7 @@
     </div>
     {% if config.layout == "enriched" %}
     <aside class="details" id="details" hidden>
+        <h2 class="details-title" id="details-title"></h2>
         <a class="details-area" id="details-area" target="_blank" rel="noopener" hidden></a>
         <p class="details-text" id="details-text" hidden></p>
         <div class="details-map" id="details-map" hidden></div>
@@ -100,6 +101,8 @@
     // Deep-link target: a category key when the page was opened via /<slug> or
     // ?cat=<key>, else null. app.js opens straight into it on load.
     var INITIAL_CATEGORY = {{ (initial_category or none) | tojson }};
+    // Each category's shareable path (/<slug>); the address bar follows the game.
+    var CATEGORY_SLUGS = {{ category_slugs | tojson }};
     </script>
     <script id="subcategories-data" type="application/json">{{ subcategories | tojson }}</script>
     <script src="{{ url_for('static', filename='js/app.js') }}?v={{ version }}"></script>

{memi_engine-0.4.0 → memi_engine-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "memi-engine"
-version = "0.4.0"
+version = "0.4.2"
 description = "Engine for building memi memory card game instances"
 license = "MIT"
 license-files = ["LICENSE"]