refactor: tidy schema valdation

blurry/file_processors/__init__.py

@@ -102,9 +102,7 @@ def write_html_file(
         extra_context["sibling_pages"] = sibling_pages
     folder_in_build = convert_content_path_to_directory_in_build(filepath)
 
-    file_data = [
-        f for f in file_data_by_directory[filepath.parent] if f.path == filepath
-    ][0]
+    file_data = [f for f in file_data_list if f.path == filepath][0]
     schema_type = file_data.front_matter.get("@type")
     if not schema_type:
         raise ValueError(
@@ -135,7 +133,7 @@ def write_html_file(
         default=json_converter_with_dates,
     )
 
-    validate_front_matter_as_schema(filepath, front_matter, warning_console)
+    validate_front_matter_as_schema(filepath, schema_variables, warning_console)
 
     schema_type_tag = f'<script type="application/ld+json">{schema_data}</script>'
 

blurry/schema_validation.py

@@ -6,22 +6,15 @@
 from rich.console import Console
 
 from blurry.settings import SETTINGS
-from blurry.settings import update_settings
-
-
-class Config:
-    extra = "forbid"
 
 
 def validate_front_matter_as_schema(
-    path: Path, front_matter: MutableMapping, console: Console
+    path: Path, schema_variables: MutableMapping, console: Console
 ):
     """
     Validates schema data using pydantic_schemaorg, disallowing extra fields
     """
-    update_settings()
-
-    schema_type = front_matter["@type"]
+    schema_type = schema_variables["@type"]
 
     if mapped_schema_type := SETTINGS["TEMPLATE_SCHEMA_TYPES"].get(schema_type):
         schema_type = mapped_schema_type
@@ -37,21 +30,15 @@ def validate_front_matter_as_schema(
         )
         return
 
-    schema_model = getattr(pydantic_schemaorg_model_module, schema_type)
+    SchemaModel = getattr(pydantic_schemaorg_model_module, schema_type)
 
     # Create new Pydantic model that forbids extra fields
-    class NonExtraSchemaModel(schema_model, extra="forbid"):  # type: ignore
+    class SchemaModelWithoutExtraFields(SchemaModel, extra="forbid"):  # type: ignore
         pass
 
     # Validate model and print errors
     try:
-        non_schema_variable_prefix = SETTINGS["FRONTMATTER_NON_SCHEMA_VARIABLE_PREFIX"]
-        schema_front_matter = {
-            k: v
-            for k, v in front_matter.items()
-            if not k.startswith(non_schema_variable_prefix)
-        }
-        NonExtraSchemaModel(**schema_front_matter)
+        SchemaModelWithoutExtraFields(**schema_variables)
     except ValidationError as e:
         for error in e.errors():
             msg = error["msg"]

tests/test_schema_validation.py

@@ -41,33 +41,13 @@ def test_validate_front_matter_as_schema_with_valid_front_matter():
 
 
 def test_validate_front_matter_as_schema_with_extra_value():
-    _, front_matter = get_data(MARKDOWN_WITH_EXTRA_VALUE_IN_TOML_FRONT_MATTER)
+    _, front_matter_with_extra_value = get_data(
+        MARKDOWN_WITH_EXTRA_VALUE_IN_TOML_FRONT_MATTER
+    )
     path = Path("pages/intro.md")
     test_console = Console()
     test_console.print = MagicMock()
-    validate_front_matter_as_schema(path, front_matter, test_console)
+    validate_front_matter_as_schema(path, front_matter_with_extra_value, test_console)
     test_console.print.assert_called_with(
         "pages/intro.md: WebPage schema validation error: extra fields not permitted: ('extra_value',)"
     )
-
-
-MARKDOWN_WITH_NON_SCHEMA_VALUE_IN_TOML_FRONT_MATTER = """
-+++
-"@type" = "WebPage"
-name = "Introduction"
-abstract = "A Python-powered static site generator with a focus on page speed and SEO."
-datePublished = 2023-04-09
-_valid_extra_value = true
-+++
-
-# Blurry: A Python-powered static site generator
-""".strip()
-
-
-def test_validate_front_matter_as_schema_with_non_schema_value():
-    _, front_matter = get_data(MARKDOWN_WITH_NON_SCHEMA_VALUE_IN_TOML_FRONT_MATTER)
-    path = Path("pages/intro.md")
-    test_console = Console()
-    test_console.print = MagicMock()
-    validate_front_matter_as_schema(path, front_matter, test_console)
-    assert not test_console.print.called