Merge pull request #285 from ma10/eliminate-hardcoded-values-20250221

yaml2xのリファクタリング

Author: ma10

.gitignore

@@ -7,3 +7,4 @@ build/
 incfiles.mk
 __pycache__/
 *:Zone.Identifier
+*.egg-info/

requirements.txt

@@ -12,4 +12,3 @@ google-api-python-client
 pytz
 pydantic
 tools/yaml2x/libs/freee_a11y_gl
-tools/yaml2x/libs/get_yaml_data

tools/yaml2x/libs/freee_a11y_gl/freee_a11y_gl/__init__.py

@@ -4,3 +4,18 @@
 from .initializer import setup_instances
 from .info_utils import get_info_links
 from .version_utils import get_version_info
+from .yaml_processor import process_yaml_data
+
+__all__ = [
+    # Existing exports from classes
+    'Category', 'Check', 'Guideline', 'Faq', 'FaqTag',
+    'WcagSc', 'InfoRef', 'AxeRule', 'CheckTool',
+    # Constants
+    'PLATFORM_NAMES', 'SEVERITY_TAGS', 'CHECK_TARGETS',
+    'IMPLEMENTATION_TARGETS',
+    # Utils
+    'get_src_path', 'setup_instances', 'get_info_links',
+    'get_version_info',
+    # YAML processing functionality
+    'process_yaml_data'
+]

tools/yaml2x/libs/freee_a11y_gl/freee_a11y_gl/classes.py

@@ -695,42 +695,23 @@ def procedures(self):
         return procedures
 
     def summary(self, lang):
-        language_info = {
-            'ja': {
-                'simple_pass_singular': 'を満たしている',
-                'simple_pass_plural': 'を満たしている',
-                'and_connector': '、かつ',
-                'or_connector': '、または',
-                'and_separator': 'と',
-                'or_separator': 'または'
-            },
-            'en': {
-                'simple_pass_singular': ' is true',
-                'simple_pass_plural': ' are true',
-                'and_connector': ', and ',
-                'or_connector': ', or ',
-                'and_separator': ' and ',
-                'or_separator': ' or '
-            },
-        }
-
         if self.type == 'simple':
-            return f'{self.procedure.id}{language_info[lang]["simple_pass_singular"]}'
+            return f'{self.procedure.id}{Config.get_pass_singular_text(lang)}'
 
         simple_conditions = [cond.summary(lang) for cond in self.conditions if cond.type == 'simple']
         complex_conditions = [f'({cond.summary(lang)})' for cond in self.conditions if cond.type != 'simple']
 
         if self.type == 'and':
-            summary_separator = language_info[lang]['and_separator']
-            summary_connector = language_info[lang]['and_connector'] 
-            simple_pass = language_info[lang]['simple_pass_plural']
+            summary_separator = Config.get_separator(lang, "and")
+            summary_connector = Config.get_conjunction(lang, "and")
+            simple_pass = Config.get_pass_plural_text(lang)
         else:
-            summary_separator = language_info[lang]['or_separator']
-            summary_connector = language_info[lang]['or_connector']
-            simple_pass = language_info[lang]['simple_pass_singular']
+            summary_separator = Config.get_separator(lang, "or")
+            summary_connector = Config.get_conjunction(lang, "or")
+            simple_pass = Config.get_pass_singular_text(lang)
 
         if len(simple_conditions) > 1:
-            simple_conditions = [cond.replace(language_info[lang]['simple_pass_singular'], '') for cond in simple_conditions]
+            simple_conditions = [cond.replace(Config.get_pass_singular_text(lang), '') for cond in simple_conditions]
             simple_summary = f'{summary_separator.join(simple_conditions)}{simple_pass}'
             return f'{simple_summary}{summary_connector}{summary_connector.join(complex_conditions)}' if complex_conditions else simple_summary
         else:

tools/yaml2x/libs/freee_a11y_gl/freee_a11y_gl/config.development.yaml

@@ -13,6 +13,15 @@ def register_settings(cls, new_settings: Optional[Dict[str, any]] = None) -> Non
         """Register new settings."""
         settings.update(new_settings)
 
+    @classmethod
+    def set_base_url(cls, base_url: str) -> None:
+        """Set the base URL for the site.
+        
+        Args:
+            base_url: Base URL (e.g., https://a11y-guidelines.freee.co.jp)
+        """
+        settings.update({"base_url": base_url.rstrip("/")})
+
     @classmethod
     def get_basedir(cls) -> str:
         """Get base directory path.
@@ -22,54 +31,89 @@ def get_basedir(cls) -> str:
         """
         return settings.get("basedir", ".")
 
+    @classmethod
+    def _get_language_path(cls, lang: LanguageCode) -> str:
+        """Get the language-specific path segment.
+        
+        Args:
+            lang: Language code
+            
+        Returns:
+            Language path segment ("" for ja, "/en" for en)
+        """
+        return "" if lang == "ja" else f"/{lang}"
+
     @classmethod
     def get_base_url(cls, lang: Optional[LanguageCode] = None) -> str:
-        """Get base URL for specified language."""
+        """Get base URL with language path for specified language.
+        
+        Args:
+            lang: Language code. If None, default language from settings will be used.
+            
+        Returns:
+            Base URL with language path
+        """
         effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
-        return settings.get(f"base_url.{effective_lang}", "")
+        base = settings.get("base_url", "")
+        lang_path = cls._get_language_path(effective_lang)
+        return f"{base}{lang_path}"
 
     @classmethod
     def get_guidelines_path(cls) -> str:
         """Get guidelines (categories) path."""
-        return settings.get("paths.guidelines", "/")
+        return settings.get("paths.guidelines", "/categories/")
 
     @classmethod
     def get_separator(cls, lang: Optional[LanguageCode] = None, separator_type: Optional[str] = None) -> str:
         """Get separator of specified type for language."""
         effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
         effective_type = separator_type if separator_type is not None else "text"
-        return settings.get(f"separators.{effective_type}.{effective_lang}", "")
+        return settings.get(f"locale.{effective_lang}.{effective_type}_separator", "")
 
     @classmethod
     def get_text_separator(cls, lang: Optional[LanguageCode] = None) -> str:
         """Get text separator for specified language."""
         effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
-        return settings.get(f"separators.text.{effective_lang}", "")
+        return settings.get(f"locale.{effective_lang}.text_separator", "")
 
     @classmethod
     def get_list_separator(cls, lang: Optional[LanguageCode] = None) -> str:
         """Get list item separator for specified language."""
         effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
-        return settings.get(f"separators.list.{effective_lang}", ", ")
+        return settings.get(f"locale.{effective_lang}.list_separator", ", ")
 
     @classmethod
-    def get_pass_text(cls, lang: Optional[LanguageCode] = None) -> str:
+    def get_pass_singular_text(cls, lang: Optional[LanguageCode] = None) -> str:
         """Get localized pass text for conditions.
         
         Args:
             lang: Language code. If None, default language from settings will be used.
             
         Returns:
-            Localized pass text
+            Localized pass text for single condition
         """
         effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
-        return settings.get(f"separators.pass_text.{effective_lang}", " is true")
+        return settings.get(f"locale.{effective_lang}.pass_singular_text", " is true")
 
+    @classmethod
+    def get_pass_plural_text(cls, lang: Optional[LanguageCode] = None) -> str:
+        """Get localized pass text for conditions.
+        
+        Args:
+            lang: Language code. If None, default language from settings will be used.
+            
+        Returns:
+            Localized pass text for multiple conditions
+        """
+        effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
+        return settings.get(f"locale.{effective_lang}.pass_plural_text", " are true")
+
+    @classmethod
     def get_conjunction(cls, lang: Optional[LanguageCode] = None, conjunction_type: Optional[str] = None) -> str:
         """Get conjunction of specified type for language."""
         effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
         effective_type = conjunction_type if conjunction_type is not None else "and"
-        return settings.get(f"separators.{effective_type}_conjunction.{effective_lang}", " and ")
+        return settings.get(f"locale.{effective_lang}.{effective_type}_conjunction", "and")
 
     @classmethod
     def get_check_tool_name(cls, tool_id: str, lang: Optional[LanguageCode] = None) -> str:
@@ -135,7 +179,6 @@ def get_faq_path(cls) -> str:
 
     @classmethod
     def get_examples_url(cls, lang: Optional[LanguageCode] = None) -> str:
-        """Get examples base URL for specified language."""
         """Get examples base URL for specified language.
         
         Args:
@@ -147,7 +190,6 @@ def get_examples_url(cls, lang: Optional[LanguageCode] = None) -> str:
         base_url = cls.get_base_url(lang)
         return f"{base_url}/checks/examples/"
 
-    @staticmethod
     @classmethod
     def get_date_format(cls, lang: Optional[LanguageCode] = None) -> str:
         """Get localized date format string.
@@ -160,7 +202,7 @@ def get_date_format(cls, lang: Optional[LanguageCode] = None) -> str:
         """
         effective_lang = lang if lang is not None else settings.get("languages.default", "ja")
         default_format = "%Y年%-m月%-d日" if effective_lang == "ja" else "%B %-d, %Y"
-        return settings.get(f"formats.date.{effective_lang}", default_format)
+        return settings.get(f"locale.{effective_lang}.date_format", default_format)
 
     @staticmethod
     def tag2sc(tag: str) -> str: