moosey-cms 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

moosey_cms/helpers.py

@@ -8,7 +8,7 @@ https://opensource.org/licenses/MIT
 import os
 import frontmatter
 from pathlib import Path
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Optional
 from jinja2 import TemplateNotFound
 from jinja2.sandbox import SandboxedEnvironment 
 from datetime import datetime
@@ -82,63 +82,55 @@ def get_secure_target(user_path: str, relative_to_path: Path) -> Path:
 
 
 @cache_fn(debug=cache_debug)
-def find_best_template(templates, path_str: str, is_index_file: bool = False) -> str:
+def find_best_template(templates, path_str: str, is_index_file: bool = False, frontmatter: Optional[dict] = None) -> str:
     """
-    Determines the best template based on the path hierarchy.
-    path_str: The clean relative path (e.g. 'posts/stories/my-story')
-    is_index_file: True if we are rendering a directory index (e.g. 'posts/stories/index.md')
+    Determines the best template based on hierarchy or Frontmatter override.
     """
+    
+    # 0. Check Frontmatter Override First
+    if frontmatter and frontmatter.get('template'):
+        candidate = frontmatter.get('template')
+        # Ensure it ends with .html if user forgot
+        if not candidate.endswith('.html'):
+            candidate += '.html'
+        
+        if template_exists(templates, candidate):
+            return candidate
 
     parts = [p for p in path_str.strip("/").split("/") if p]
 
-    # use index,html for home...
-    if len(parts)==0:
+    if len(parts) == 0:
         index_candidate = 'index.html'
         if template_exists(templates, index_candidate):
             return index_candidate
 
-
-    # 1. Exact Match (Specific File Override)
-    # We skip this for index files, as their "Exact Match" is essentially
-    # the folder name check in step 2B.
+    # 1. Exact Match
     if not is_index_file:
         candidate = "/".join(parts) + ".html"
-
         if template_exists(templates, candidate):
             return candidate
-
-        # If we didn't find specific 'my-story.html',
-        # pop the filename so we start searching from parent 'stories'
         if parts:
             parts.pop()
 
     # 2. Recursive Parent Search
     while len(parts) > 0:
-        current_folder = parts[-1]  # e.g. "stories"
-        parent_path = parts[:-1]  # e.g. ["posts"]
+        current_folder = parts[-1]
+        parent_path = parts[:-1]
 
-        # A. Singular Check (The "Item" Template)
-        # e.g. "posts/story.html"
-        # Only valid if we are NOT rendering a directory list (index file)
+        # A. Singular Check
         if not is_index_file:
             singular_name = singularize(current_folder)
             singular_candidate = "/".join(parent_path + [singular_name]) + ".html"
-
-            print('>>>>parts', parts)
-
             if template_exists(templates, singular_candidate):
                 return singular_candidate
 
-        # B. Plural/Folder Check (The "Section" Template)
-        # e.g. "posts/stories.html"
+        # B. Plural/Folder Check
         plural_candidate = "/".join(parts) + ".html"
         if template_exists(templates, plural_candidate):
             return plural_candidate
 
-        # Traverse up
         parts.pop()
 
-
     # 3. Final Fallback
     return "page.html"
 
@@ -147,17 +139,16 @@ def find_best_template(templates, path_str: str, is_index_file: bool = False) ->
 def parse_markdown_file(file):
     data = frontmatter.load(file)
     stats = file.stat()
-    # Last date
-    data.metadata["date"] = {
-        "updated": datetime.fromtimestamp(stats.st_mtime),
-        "created": datetime.fromtimestamp(stats.st_ctime),
-    }
-    # add slug
+    
+    # Ensure date metadata exists
+    if "date" not in data.metadata or not isinstance(data.metadata["date"], dict):
+        data.metadata["date"] = {}
+        
+    data.metadata["date"]["updated"] = datetime.fromtimestamp(stats.st_mtime)
+    data.metadata["date"]["created"] = datetime.fromtimestamp(stats.st_ctime)
     data.metadata["slug"] = slugify(str(file.stem))
 
     data.html = parse_markdown(data.content)
-
-
     return data
 
 
@@ -176,8 +167,7 @@ def ensure_sandbox_filters(main_templates):
 # template_render_content only in sandbox mode
 @cache_fn(debug=cache_debug) 
 def template_render_content(templates, content, data, safe=True):
-    if not content:
-        return ""
+    if not content: return ""
 
     try:
         # Sync filters/globals from the main app to our sandbox
@@ -196,51 +186,95 @@ def template_render_content(templates, content, data, safe=True):
 
 @cache_fn(debug=cache_debug)
 def get_directory_navigation(
-    physical_folder: Path, current_url: str, relative_to_path: Path
+    physical_folder: Path, current_url: str, relative_to_path: Path, mode: str = "production"
 ) -> List[Dict[str, Any]]:
     """
-    Scans the folder containing the current file to generate a sidebar menu.
+    Scans folder for sidebar menu. Supports advanced frontmatter features.
     """
     if not physical_folder.exists() or not physical_folder.is_dir():
         return []
 
     items = []
     try:
-        # Iterate over files in the folder
-        for entry in sorted(
-            physical_folder.iterdir(), key=lambda x: (not x.is_dir(), x.name)
-        ):
-            if entry.name.startswith("."):
-                continue  # Skip hidden
-
-            # Skip self-reference if inside index
-            if entry.name == "index.md":
-                continue  
-
-            # if dir only list if it has an index.md
-            if  entry.is_dir() and not (entry / 'index.md').exists() :
-                continue
+        for entry in physical_folder.iterdir():
+            if entry.name.startswith("."): continue
+            if entry.name == "index.md": continue  
+            if entry.is_dir() and not (entry / 'index.md').exists(): continue
+
+            # Determine Metadata Source
+            meta_file = entry / 'index.md' if entry.is_dir() else entry
+            
+            # Defaults
+            sort_weight = 9999
+            display_title = entry.stem.replace("-", " ").title()
+            nav_group = None
+            external_url = None
+            is_visible = True
+            target = "_self"
 
+            try:
+                # Load minimal metadata
+                post = frontmatter.load(meta_file)
+                meta = post.metadata
+
+                # 1. Visibility & Draft Check
+                if meta.get('visible') is False:
+                    is_visible = False
+                
+                if meta.get('draft') is True and mode != 'development':
+                    is_visible = False
+
+                
+                if not is_visible:
+                    continue
+
+                # 2. Ordering
+                if 'order' in meta: sort_weight = int(meta['order'])
+                
+                # 3. Titles & Grouping
+                if 'nav_title' in meta: display_title = meta['nav_title']
+                elif 'title' in meta: display_title = meta['title']
+                
+                nav_group = meta.get('group')
+
+                # 4. External Links
+                if 'external_link' in meta:
+                    external_url = meta['external_link']
+                    target = "_blank"
+                elif 'redirect' in meta:
+                    external_url = meta['redirect']
+
+            except Exception:
+                pass 
 
             # Build URL
-            try:
-                rel_path = entry.relative_to(relative_to_path)
-                # Strip .md for URL, keep pure for directories
-                url_slug = str(rel_path).replace(".md", "").replace("\\", "/")
-                entry_url = f"/{url_slug}"
-            except ValueError:
-                continue
-
-            items.append(
-                {
-                    "name": entry.stem.replace("-", " ").title(),
-                    "url": entry_url,
-                    "is_active": entry_url == current_url,
-                    "is_dir": entry.is_dir(),
-                }
-            )
+            if external_url:
+                entry_url = external_url
+                is_active = False # External links are never 'active' page
+            else:
+                try:
+                    rel_path = entry.relative_to(relative_to_path)
+                    url_slug = str(rel_path).replace(".md", "").replace("\\", "/")
+                    entry_url = f"/{url_slug}"
+                    is_active = (entry_url == current_url)
+                except ValueError:
+                    continue
+
+            items.append({
+                "name": display_title,
+                "url": entry_url,
+                "is_active": is_active,
+                "is_dir": entry.is_dir(),
+                "weight": sort_weight,
+                "group": nav_group,
+                "target": target
+            })
+            
+        # Sorting: Weight first, then Name
+        items.sort(key=lambda x: (x['weight'], x['name']))
+
     except OSError:
-        pass  # Ignore permission errors
+        pass 
 
     return items
 

moosey_cms/main.py

@@ -211,6 +211,12 @@ def init_routes(app, dirs: Dirs, templates, mode, reloader):
             md_data = helpers.parse_markdown_file(target_file)
             front_matter = md_data.metadata
 
+            # never render drafts in production
+            if front_matter.get("draft") is True and mode != "development":
+                return templates.TemplateResponse(
+                    "404.html", {"request": request}, status_code=404
+                )
+
             # Merge front matter
             template_data = {
                 **template_data,
@@ -219,7 +225,6 @@ def init_routes(app, dirs: Dirs, templates, mode, reloader):
                 "site_code": app.state.site_code,
             }
 
-
             # Render jinja inside frontmatter strings
             for k in front_matter:
                 if isinstance(front_matter[k], str):
@@ -227,7 +232,6 @@ def init_routes(app, dirs: Dirs, templates, mode, reloader):
                         templates, front_matter[k], template_data, False
                     )
 
-
             html_content = md_data.html
 
             # Render jinja inside markdown body
@@ -248,13 +252,14 @@ def init_routes(app, dirs: Dirs, templates, mode, reloader):
             physical_folder=nav_folder,
             current_url=current_url,
             relative_to_path=dirs["content"],
+            mode=mode,
         )
         breadcrumbs = helpers.get_breadcrumbs(full_path)
 
         # 7. Find Template
         search_path = "" if clean_path == "index" else clean_path
         template_name = helpers.find_best_template(
-            templates, search_path, is_index_file=is_index
+            templates, search_path, is_index_file=is_index, frontmatter=front_matter
         )
 
         template_data = {**template_data, **md_data}

{moosey_cms-0.1.0.dist-info → moosey_cms-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moosey-cms
-Version: 0.1.0
+Version: 0.2.0
 Summary: Add your description here
 Requires-Python: >=3.9
 Requires-Dist: cachetools>=6.2.4
@@ -162,129 +162,55 @@ A user visits **`/posts/post-1`**.
 
 **Resolution Order:**
 
-1.  **`templates/posts/post-1.html`** (Exact Match):
-    Checked first. Use this if a specific article requires a unique design completely different from other posts.
-
-2.  **`templates/post.html`** (Singular Parent):
-    The system automatically "singularizes" the parent folder name (`posts` → `post`). This is the standard template used to render individual blog items.
-
-3.  **`templates/posts.html`** (Plural Parent):
-    If no singular template exists, the system looks for the folder's name. This allows articles to inherit the layout of their parent section if desired.
-
-4.  **`templates/page.html`** (Global Fallback):
-    If no specific, singular, or plural templates are found, the system defaults to the generic page layout.
-
-**Important Notes:**
-
-*   **The Index File:** For a directory route like `/posts` to work, a **`content/posts/index.md`** file must exist. This tells the CMS that the folder is a navigable section containing content. Without it, accessing `/posts` will return a 404 error.
-*   **Navigation:** If `content/posts/index.md` is missing, the `posts` folder will be omitted from auto-generated menus and sidebars (`nav_items`).
-
-### Inside a Template
-
-Your templates have access to powerful context variables:
-
-*   `content`: The rendered HTML from your Markdown.
-*   `metadata`: The YAML frontmatter from the markdown file.
-*   `site_data`: Global site configuration.
-*   `breadcrumbs`: Auto-generated breadcrumb navigation.
-*   `nav_items`: List of sibling pages/folders for sidebar navigation.
-
-**Example `page.html`:**
-
-```html
-{% extends "base.html" %}
-
-{% block content %}
-    <h1>{{ title }}</h1>
-    
-    <!-- Render Breadcrumbs -->
-    <nav>
-        {% for crumb in breadcrumbs %}
-            <a href="{{ crumb.url }}">{{ crumb.name }}</a> /
-        {% endfor %}
-    </nav>
-
-    <!-- Render Content -->
-    <article>
-        {{ content | safe }}
-    </article>
-    
-    <!-- Automatic Sidebar -->
-    <aside>
-        {% for item in nav_items %}
-            <a href="{{ item.url }}" class="{% if item.is_active %}active{% endif %}">
-                {{ item.name }}
-            </a>
-        {% endfor %}
-    </aside>
-{% endblock %}
-```
+1.  **Frontmatter Override:** If `post-1.md` contains `template: special.html`, that template is used immediately.
+2.  **Exact Match:** `templates/posts/post-1.html`.
+3.  **Singular Parent:** `templates/post.html` (Perfect for generic blog posts).
+4.  **Plural Parent:** `templates/posts.html` (Perfect for section indexes).
+5.  **Fallback:** `templates/page.html`.
 
 ---
 
-## 📝 Markdown Features
+## 📝 Frontmatter Configuration
 
-### Frontmatter
-You can define metadata at the top of any Markdown file. These values are passed to your template.
+You can control routing, visibility, and layout directly from the Markdown file YAML frontmatter.
 
-```markdown
----
+### Basic Metadata
+```yaml
 title: My Amazing Post
 date: 2024-01-01
-tags: [fastapi, python]
----
-
-# Hello World
-
-This is content.
+description: A short summary for SEO.
 ```
 
-### Dynamic Content in Markdown
-You can use Jinja2 syntax **inside** your Markdown content! This is powered by a **Sandboxed Environment**, making it safe to use variables without exposing your server to vulnerabilities (SSTI).
-
-**Example `about.md`:**
-```markdown
-# Welcome to {{ site_data.name }}
-
-This page was generated by **{{ site_data.author }}**.
-Today is {{ metadata.date.created | fancy_date }}.
-```
-
-**Allowed Context:**
-*   `site_data`: Global configuration (Name, Author, etc.)
-*   `site_code`: Global code snippets.
-*   `metadata`: The frontmatter of the current file.
-*   **Filters:** All standard Moosey filters (`fancy_date`, `read_time`, etc.) are available.
-
-### Included Extensions
-Moosey includes `pymdown-extensions` to provide:
-*   Tables
-*   Task Lists `[x]`
-*   Emojis `:smile:`
-*   Code Fences with highlighting
-*   Admonitions (Alerts/Callouts)
-*   Math/Arithmatex
+### Organization & Navigation
+| Key | Type | Description |
+| :--- | :--- | :--- |
+| `order` | `int` | Sort order in sidebars. Lower numbers appear first. Default: `9999`. |
+| `nav_title` | `str` | Short title to display in sidebars (if different from `title`). |
+| `visible` | `bool` | Set to `false` to hide from sidebars/menus (page remains accessible via URL). |
+| `draft` | `bool` | If `true`, the page is only visible in `development` mode. |
+| `group` | `str` | Group sidebar items under a heading (requires template support). |
+
+### Advanced Routing
+| Key | Type | Description |
+| :--- | :--- | :--- |
+| `template` | `str` | Force a specific template file (e.g., `template: landing.html`). |
+| `external_link` | `str` | The sidebar link will point to this external URL instead of the page itself. |
+| `redirect` | `str` | Alias for `external_link`. |
 
+**Example:**
+```yaml
+---
+title: API Documentation
+nav_title: API Docs
+weight: 1
+group: "Developer Tools"
+external_link: "https://api.mysite.com"
 ---
-
-## 🛠️ SEO & Metadata
-
-Moosey CMS includes a robust SEO helper. In your `base.html` `<head>`, simply add:
-
-```html
-<head>
-    <!-- Automatically generates Title, Meta Description, OpenGraph, 
-         Twitter Cards, and JSON-LD Structured Data -->
-    {{ seo() }}
-    
-    <!-- Or override specific values -->
-    {{ seo(title="Custom Title", image="/static/custom.jpg") }}
-</head>
 ```
 
 ---
 
-## 🧩 Custom Filters
+## 🧩 Custom Filters & Logic
 
 Moosey CMS comes packed with a comprehensive library of Jinja2 filters to help you format your data effortlessly.
 

{moosey_cms-0.1.0.dist-info → moosey_cms-0.2.0.dist-info}/RECORD

@@ -1,18 +1,17 @@
 moosey_cms/.python-version,sha256=e1X45ntWI8S-8_ppEojalDfXnTq6FW3kjUgdsyrH0W0,5
-moosey_cms/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moosey_cms/__init__.py,sha256=y7gzxC1LB7qRmjqJHJpN4kEqBNAbuIwNc4xeEI2clMY,184
 moosey_cms/cache.py,sha256=YI6rRb4OVi-Mb1CmMW-jRz0CC9U6YZyszqLmjqLOsq8,2067
 moosey_cms/file_watcher.py,sha256=ViadvrDD2y0MN9VJlz9Kkp31qFkYBhDCoK7xtdA4tAY,923
 moosey_cms/filters.py,sha256=QIHeffZAxn4KqQE4zwR4D7njE96L-oeqHc5DYrYgCpw,15983
-moosey_cms/helpers.py,sha256=fzBUEt7m3mc9n_Ilyndv13CgJaBqL-FTiqC2XZYFp7Q,8069
+moosey_cms/helpers.py,sha256=nUP9wPrBWyfsyaTYgYSBVaWcvjgz4Gf0H-SE0DXmCeE,9438
 moosey_cms/hot_reload_script.py,sha256=Dflj5hgHVkVOfjeU7wzEUeVTt684nj22et8jKzVFEGw,2987
-moosey_cms/main.py,sha256=xSNZKdv9zjcXsnpEQmD8p4-Ko2W5zCS9WQMQbrUOiaQ,8793
+moosey_cms/main.py,sha256=Xdxx6RpEWRz1t2RGfpYvQRmgt12mfegUWk86drHHHGk,9104
 moosey_cms/md.py,sha256=m857SKApJkK62wNrMVsypuJAqumbBt5GuPvcnuN1O6w,4970
 moosey_cms/models.py,sha256=Q4MRJ32Zy9GDwnPuHr0VJOuSCN8PlccpTOOXQaZqYqU,3392
 moosey_cms/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moosey_cms/pyproject.toml,sha256=lFRsY2yJOKtDWJc-Mfq9s0teGrhmB3ALDJyMltjBOGg,735
 moosey_cms/seo.py,sha256=ubuxb9nTGr3a5a6--zUMwxlZfYBOoGDJCZJeZSa0Bo4,5283
 moosey_cms/static/js/reload-script.js,sha256=hnrVXEWeTK-Y2vLeADmtlZ7fOXpDJMF-0zK09o3mrOA,2247
-moosey_cms-0.1.0.dist-info/METADATA,sha256=HT4jvuzgMVoRX43egWiwO-fQJfjmX7wXfvR4OsE6WTE,13096
-moosey_cms-0.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-moosey_cms-0.1.0.dist-info/RECORD,,
+moosey_cms-0.2.0.dist-info/METADATA,sha256=EC4s5kqVGf-fzOVQj6I3_vs8ZXCdiYVORLKUYcj1SqU,10998
+moosey_cms-0.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+moosey_cms-0.2.0.dist-info/RECORD,,