focomy 0.1.106__tar.gz → 0.1.108__tar.gz

{focomy-0.1.106 → focomy-0.1.108}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: focomy
-Version: 0.1.106
+Version: 0.1.108
 Summary: The Most Beautiful CMS - A metadata-driven, zero-duplicate-code content management system
 Project-URL: Homepage, https://github.com/focomy/focomy
 Project-URL: Documentation, https://focomy.dev/docs

{focomy-0.1.106 → focomy-0.1.108}/core/api/forms.py

@@ -13,6 +13,7 @@ from ..rate_limit import limiter
 from ..services.entity import EntityService
 from ..services.mail import mail_service
 from ..services.theme import theme_service
+from ..utils import require_feature_async
 
 router = APIRouter(prefix="/forms", tags=["forms"])
 
@@ -30,6 +31,7 @@ async def view_form(
     db: AsyncSession = Depends(get_db),
 ):
     """View a public form."""
+    await require_feature_async("form", db)
     entity_svc = EntityService(db)
 
     # Find form
@@ -83,6 +85,7 @@ async def submit_form(
     db: AsyncSession = Depends(get_db),
 ):
     """Submit a form."""
+    await require_feature_async("form", db)
     entity_svc = EntityService(db)
 
     # Find form

{focomy-0.1.106 → focomy-0.1.108}/core/config.py

@@ -143,7 +143,7 @@ class FeaturesConfig(BaseModel):
 
     # Phase 5: Extended features
     comment: bool = False
-    form: bool = False
+    form: bool = True
     api_auth: bool = False
     oauth: bool = False
     mail: bool = False

{focomy-0.1.106 → focomy-0.1.108}/core/engine/routes.py

@@ -163,6 +163,13 @@ async def render_theme(
             # Build edit URL if entity provided
             if entity and content_type:
                 context["edit_url"] = f"/admin/{content_type}/{entity.id}/edit"
+            # Add content_types for admin bar dropdown
+            all_ct = field_service.get_all_content_types()
+            context["content_types"] = {
+                name: ct.model_dump()
+                for name, ct in all_ct.items()
+                if ct.admin_menu  # Only show types with admin_menu=true
+            }
         else:
             context["is_admin"] = False
 

{focomy-0.1.106 → focomy-0.1.108}/core/main.py

@@ -452,7 +452,6 @@ async def server_error_handler(request: Request, exc: Exception):
 from .admin import routes as admin
 from .api import auth, comments, entities, forms, media, relations, revisions, schema, search, seo
 from .engine import routes as engine
-from .utils import is_feature_enabled
 
 # Phase 1: Core APIs (always enabled)
 app.include_router(entities.router, prefix="/api")
@@ -462,21 +461,16 @@ app.include_router(auth.router, prefix="/api")
 app.include_router(seo.router)
 app.include_router(admin.router)
 
-# Phase 2: Media
-if is_feature_enabled("media"):
-    app.include_router(media.router, prefix="/api")
-
-# Phase 4: Search, Revisions
-if is_feature_enabled("search"):
-    app.include_router(search.router, prefix="/api")
-if is_feature_enabled("revision"):
-    app.include_router(revisions.router, prefix="/api")
-
-# Phase 5: Comments, Forms
-if is_feature_enabled("comment"):
-    app.include_router(comments.router, prefix="/api")
-if is_feature_enabled("form"):
-    app.include_router(forms.router)
+# Phase 2: Media (runtime check in endpoints)
+app.include_router(media.router, prefix="/api")
+
+# Phase 4: Search, Revisions (runtime check in endpoints)
+app.include_router(search.router, prefix="/api")
+app.include_router(revisions.router, prefix="/api")
+
+# Phase 5: Comments, Forms (runtime check in endpoints)
+app.include_router(comments.router, prefix="/api")
+app.include_router(forms.router)
 
 
 @app.get("/api/health")

{focomy-0.1.106 → focomy-0.1.108}/core/services/settings.py

@@ -39,6 +39,14 @@ DEFAULT_SETTINGS = {
         "lockout_duration": 900,
         "password_min_length": 12,
     },
+    "features": {
+        "media": True,
+        "comment": False,
+        "form": True,
+        "wordpress_import": False,
+        "menu": True,
+        "widget": True,
+    },
 }
 
 
@@ -235,6 +243,7 @@ class SettingsService:
             "media": app_settings.media,
             "security": app_settings.security,
             "theme": app_settings.theme,
+            "features": app_settings.features,
         }
 
         config_obj = config_map.get(category)
@@ -253,6 +262,7 @@ class SettingsService:
             "media": app_settings.media,
             "security": app_settings.security,
             "theme": app_settings.theme,
+            "features": app_settings.features,
         }
 
         categories = [category] if category else config_map.keys()

focomy-0.1.108/core/utils.py

@@ -0,0 +1,90 @@
+"""Utility functions for Focomy."""
+
+from datetime import datetime, timezone
+from functools import lru_cache
+
+from fastapi import HTTPException
+
+
+def utcnow() -> datetime:
+    """Return current UTC time as naive datetime for DB storage.
+
+    PostgreSQL TIMESTAMP WITHOUT TIME ZONE expects naive datetimes.
+    This function returns UTC time without tzinfo to avoid mismatch errors.
+    """
+    return datetime.now(timezone.utc).replace(tzinfo=None)
+
+
+def is_feature_enabled(feature: str) -> bool:
+    """Check if a feature is enabled.
+
+    Args:
+        feature: Feature name (e.g., 'media', 'comment', 'wordpress_import')
+
+    Returns:
+        True if feature is enabled, False otherwise
+    """
+    from .config import get_settings
+
+    settings = get_settings()
+    return getattr(settings.features, feature, False)
+
+
+def require_feature(feature: str) -> None:
+    """Raise 404 if feature is disabled.
+
+    Use this at the start of API endpoints to disable them when feature is off.
+
+    Args:
+        feature: Feature name
+
+    Raises:
+        HTTPException: 404 if feature is disabled
+    """
+    if not is_feature_enabled(feature):
+        raise HTTPException(status_code=404, detail="Not Found")
+
+
+async def is_feature_enabled_async(feature: str, db) -> bool:
+    """Check if a feature is enabled (async version, DB-first).
+
+    Priority: DB settings > config.yaml > False
+
+    Args:
+        feature: Feature name (e.g., 'form', 'comment')
+        db: AsyncSession database session
+
+    Returns:
+        True if feature is enabled, False otherwise
+    """
+    from .services.settings import SettingsService
+
+    settings_svc = SettingsService(db)
+    db_value = await settings_svc.get(f"features.{feature}")
+
+    if db_value is not None:
+        # DB value exists, use it
+        if isinstance(db_value, bool):
+            return db_value
+        if isinstance(db_value, str):
+            return db_value.lower() in ("true", "1", "yes")
+        return bool(db_value)
+
+    # Fallback to config.yaml
+    return is_feature_enabled(feature)
+
+
+async def require_feature_async(feature: str, db) -> None:
+    """Raise 404 if feature is disabled (async version, DB-first).
+
+    Use this at the start of API endpoints for dynamic feature checking.
+
+    Args:
+        feature: Feature name
+        db: AsyncSession database session
+
+    Raises:
+        HTTPException: 404 if feature is disabled
+    """
+    if not await is_feature_enabled_async(feature, db):
+        raise HTTPException(status_code=404, detail="Not Found")

{focomy-0.1.106 → focomy-0.1.108}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "focomy"
-version = "0.1.106"
+version = "0.1.108"
 description = "The Most Beautiful CMS - A metadata-driven, zero-duplicate-code content management system"
 readme = "README.md"
 license = "MIT"

{focomy-0.1.106 → focomy-0.1.108}/themes/default/templates/base.html

@@ -123,7 +123,18 @@
     <div id="admin-bar">
         <a href="/" class="admin-bar-site">{{ site_name }}</a>
         <a href="/admin">ダッシュボード</a>
-        <a href="/admin/post/new">+ 新規投稿</a>
+        <div class="admin-bar-dropdown">
+            <button class="admin-bar-dropdown-btn">+ 新規作成</button>
+            <div class="admin-bar-dropdown-menu">
+                {% if content_types %}
+                {% for name, ct in content_types.items()|sort(attribute='0') %}
+                <a href="/admin/{{ name }}/new">{{ ct.label or name }}</a>
+                {% endfor %}
+                {% else %}
+                <a href="/admin/post/new">投稿</a>
+                {% endif %}
+            </div>
+        </div>
         {% if edit_url %}
         <a href="{{ edit_url }}">編集</a>
         {% endif %}
@@ -163,6 +174,44 @@
         .admin-bar-user {
             color: #94a3b8;
         }
+        .admin-bar-dropdown {
+            position: relative;
+        }
+        .admin-bar-dropdown-btn {
+            background: transparent;
+            border: none;
+            color: white;
+            cursor: pointer;
+            font-size: inherit;
+            padding: 0;
+        }
+        .admin-bar-dropdown-btn:hover {
+            text-decoration: underline;
+        }
+        .admin-bar-dropdown-menu {
+            display: none;
+            position: absolute;
+            top: 100%;
+            left: 0;
+            background: #1e293b;
+            border: 1px solid #374151;
+            border-radius: 4px;
+            min-width: 150px;
+            padding: 0.5rem 0;
+            box-shadow: 0 4px 6px rgba(0,0,0,0.3);
+        }
+        .admin-bar-dropdown-menu a {
+            display: block;
+            padding: 0.5rem 1rem;
+            white-space: nowrap;
+        }
+        .admin-bar-dropdown-menu a:hover {
+            background: #374151;
+            text-decoration: none;
+        }
+        .admin-bar-dropdown:hover .admin-bar-dropdown-menu {
+            display: block;
+        }
         body { padding-top: 32px; }
     </style>
     {% endif %}

focomy-0.1.106/core/utils.py

@@ -1,45 +0,0 @@
-"""Utility functions for Focomy."""
-
-from datetime import datetime, timezone
-from functools import lru_cache
-
-from fastapi import HTTPException
-
-
-def utcnow() -> datetime:
-    """Return current UTC time as naive datetime for DB storage.
-
-    PostgreSQL TIMESTAMP WITHOUT TIME ZONE expects naive datetimes.
-    This function returns UTC time without tzinfo to avoid mismatch errors.
-    """
-    return datetime.now(timezone.utc).replace(tzinfo=None)
-
-
-def is_feature_enabled(feature: str) -> bool:
-    """Check if a feature is enabled.
-
-    Args:
-        feature: Feature name (e.g., 'media', 'comment', 'wordpress_import')
-
-    Returns:
-        True if feature is enabled, False otherwise
-    """
-    from .config import get_settings
-
-    settings = get_settings()
-    return getattr(settings.features, feature, False)
-
-
-def require_feature(feature: str) -> None:
-    """Raise 404 if feature is disabled.
-
-    Use this at the start of API endpoints to disable them when feature is off.
-
-    Args:
-        feature: Feature name
-
-    Raises:
-        HTTPException: 404 if feature is disabled
-    """
-    if not is_feature_enabled(feature):
-        raise HTTPException(status_code=404, detail="Not Found")