moosey-cms 0.2.0__tar.gz → 0.4.0__tar.gz

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moosey-cms
-Version: 0.2.0
+Version: 0.4.0
 Summary: Add your description here
 Requires-Python: >=3.9
 Requires-Dist: cachetools>=6.2.4
@@ -271,7 +271,6 @@ The `init_cms` function accepts the following parameters:
 | `dirs` | `dict` | Dictionary containing `content` and `templates` Paths. |
 | `mode` | `str` | `"development"` (enables hot reload/no cache) or `"production"`. |
 | `site_data` | `dict` | Global data (Name, Author, Social Links). |
-| `site_code` | `dict` | Inject custom HTML (e.g., analytics) via `{{ site_code.footer_code }}`. |
 
 ---
 

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/README.md

@@ -254,7 +254,6 @@ The `init_cms` function accepts the following parameters:
 | `dirs` | `dict` | Dictionary containing `content` and `templates` Paths. |
 | `mode` | `str` | `"development"` (enables hot reload/no cache) or `"production"`. |
 | `site_data` | `dict` | Global data (Name, Author, Social Links). |
-| `site_code` | `dict` | Inject custom HTML (e.g., analytics) via `{{ site_code.footer_code }}`. |
 
 ---
 

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "moosey-cms"
-version = "0.2.0"
+version = "0.4.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.9"

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/src/moosey_cms/file_watcher.py

@@ -5,13 +5,13 @@ from watchdog.events import FileSystemEventHandler
 class FileChangeHandler(FileSystemEventHandler):
     def __init__(self, callback):
         self.callback = callback
-        self.ts =0
+        self.ts = 0
 
     def on_any_event(self, event):
         if event.is_directory:
             return
 
-        if event.event_type == "modified" or event.event_type == "created":
+        if event.event_type in ["modified", "created", "deleted"]:
             # Trigger the callback
             self.callback(event.src_path, event.event_type)
 

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/src/moosey_cms/helpers.py

@@ -205,7 +205,7 @@ def get_directory_navigation(
             meta_file = entry / 'index.md' if entry.is_dir() else entry
             
             # Defaults
-            sort_weight = 9999
+            sort_order = 9999
             display_title = entry.stem.replace("-", " ").title()
             nav_group = None
             external_url = None
@@ -229,13 +229,13 @@ def get_directory_navigation(
                     continue
 
                 # 2. Ordering
-                if 'order' in meta: sort_weight = int(meta['order'])
+                if 'order' in meta: sort_order = 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')
+                nav_group = meta.get('group') or "" 
 
                 # 4. External Links
                 if 'external_link' in meta:
@@ -265,13 +265,36 @@ def get_directory_navigation(
                 "url": entry_url,
                 "is_active": is_active,
                 "is_dir": entry.is_dir(),
-                "weight": sort_weight,
+                "order": sort_order,
                 "group": nav_group,
                 "target": target
             })
             
-        # Sorting: Weight first, then Name
-        items.sort(key=lambda x: (x['weight'], x['name']))
+        # Sorting: order first, then Name
+        # items.sort(key=lambda x: (x['order'], x['name']))
+        group_min_orders = {}
+    
+        for item in items:
+            g = item['group']
+            w = item['order']
+            # If we haven't seen this group, or if this item is lighter (more important)
+            if g not in group_min_orders or w < group_min_orders[g]:
+                group_min_orders[g] = w
+
+        # 2. Sort the list with a Tuple Key
+        items.sort(key=lambda x: (
+            # Primary: Group order (Groups with important items float to top)
+            group_min_orders[x['group']], 
+            
+            # Secondary: Group Name (Keep groups clustered together)
+            x['group'], 
+            
+            # Tertiary: Item order (Sort items inside the group)
+            x['order'],
+            
+            # Quaternary: Item Name (Alphabetical fallback)
+            x['name']
+        ))
 
     except OSError:
         pass 

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/src/moosey_cms/main.py

@@ -46,7 +46,7 @@ class ConnectionManager:
                 self.disconnect(connection)
 
 
-from .models import CMSConfig, Dirs, SiteCode, SiteData
+from .models import CMSConfig, Dirs,  SiteData
 
 
 def init_cms(
@@ -56,7 +56,6 @@ def init_cms(
     dirs: Dirs,
     mode: str,
     site_data: SiteData = {},
-    site_code: SiteCode = {},
 ):
 
     # validate dirs inputs
@@ -65,8 +64,7 @@ def init_cms(
         port=port,
         dirs=dirs,
         mode=mode,
-        site_data=site_data,
-        site_code=site_code,
+        site_data=site_data
     )
 
     # resolve paths
@@ -77,13 +75,11 @@ def init_cms(
     templates = Jinja2Templates(directory=str(dirs["templates"]), extensions=[])
 
     # Important for filters like seo to access them
-    app.state.site_code = site_code
     app.state.site_data = site_data
     app.state.mode = mode
 
     # This ensures site_data is available in 404.html and base.html automatically
     templates.env.globals["site_data"] = site_data
-    templates.env.globals["site_code"] = site_code
     templates.env.globals["mode"] = mode
 
     # Register all custom filters once
@@ -221,8 +217,7 @@ def init_routes(app, dirs: Dirs, templates, mode, reloader):
             template_data = {
                 **template_data,
                 **front_matter,
-                "site_data": app.state.site_data,
-                "site_code": app.state.site_code,
+                "site_data": app.state.site_data
             }
 
             # Render jinja inside frontmatter strings
@@ -264,6 +259,8 @@ def init_routes(app, dirs: Dirs, templates, mode, reloader):
 
         template_data = {**template_data, **md_data}
 
+        # pprint(nav_items)
+
         # 8. Render
         return templates.TemplateResponse(
             template_name,

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/src/moosey_cms/models.py

@@ -44,12 +44,6 @@ class SiteData(BaseModel):
     social: Optional[SocialConfig] = Field(..., description="Social media links")
 
 
-class SiteCode(BaseModel):
-    """Custom HTML/code snippets for the site"""
-    styled_name: Optional[str] = Field(None, description="Styled HTML name")
-    header_code: Optional[str] = Field(None, description="Code to inject in header")
-    footer_code: Optional[str] = Field(None, description="Code to inject in footer")
-
 
 class Dirs(BaseModel):
     """Directory paths configuration"""
@@ -76,4 +70,4 @@ class CMSConfig(BaseModel):
         description="Application mode"
     )
     site_data: Optional[SiteData] = Field(..., description="Site metadata")
-    site_code: Optional[SiteCode] = Field(..., description="Custom site code")
+    # site_code: Optional[SiteCode] = Field(..., description="Custom site code")

{moosey_cms-0.2.0 → moosey_cms-0.4.0}/src/moosey_cms/seo.py

@@ -29,8 +29,6 @@ def seo_tags(
     app = request.app
 
     site_data = app.state.site_data
-    site_code = app.state.site_code
-
 
     site_name = site_data.get("name")
     site_keywords = site_data.get("keywords")