ethspecify 0.3.2__tar.gz → 0.3.4__tar.gz

{ethspecify-0.3.2 → ethspecify-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethspecify
-Version: 0.3.2
+Version: 0.3.4
 Summary: A utility for processing Ethereum specification tags.
 Home-page: https://github.com/jtraglia/ethspecify
 Author: Justin Traglia

{ethspecify-0.3.2 → ethspecify-0.3.4}/ethspecify/core.py

@@ -589,9 +589,18 @@ def sort_specref_yaml(yaml_file):
         with open(yaml_file, 'r') as f:
             content_str = f.read()
 
-        # Try to fix common YAML issues with unquoted search strings containing colons
-        # This is the same fix used in check_source_files
-        content_str = re.sub(r'(\s+search:\s+)([^"\n]+:)(\s*$)', r'\1"\2"\3', content_str, flags=re.MULTILINE)
+        # Extract search values that originally had single or double quotes before YAML parsing
+        # This preserves the original quoting style exactly
+        single_quoted_searches = set()
+        for match in re.finditer(r"search:\s*'([^']*)'", content_str):
+            single_quoted_searches.add(match.group(1))
+        double_quoted_searches = set()
+        for match in re.finditer(r'search:\s*"([^"]*)"', content_str):
+            double_quoted_searches.add(match.group(1))
+
+        # Temporarily quote unquoted search strings with colons so YAML can parse them
+        # This doesn't affect the output - we restore original quoting when writing
+        content_str = re.sub(r'(\s+search:\s+)([^"\'\n]+:)(\s*$)', r'\1"\2"\3', content_str, flags=re.MULTILINE)
 
         try:
             content = yaml.safe_load(content_str)
@@ -672,16 +681,11 @@ def sort_specref_yaml(yaml_file):
                                         output_lines.append(f"    - file: {source.get('file', '')}")
                                         if 'search' in source:
                                             search_val = source['search']
-                                            # Only quote if:
-                                            # 1. Contains a colon followed by space or end of string (YAML mapping issue)
-                                            # 2. Not already quoted
-                                            # 3. Doesn't contain internal quotes (like regex patterns)
-                                            if ((':' in search_val or search_val.endswith(':')) and
-                                                not (search_val.startswith('"') and search_val.endswith('"')) and
-                                                '"' not in search_val):
-                                                # Only quote simple strings with colons, not complex patterns
-                                                if not any(char in search_val for char in ['\\', '*', '|', '[', ']', '(', ')']):
-                                                    search_val = f'"{search_val}"'
+                                            # Preserve original quoting style exactly
+                                            if search_val in single_quoted_searches:
+                                                search_val = f"'{search_val}'"
+                                            elif search_val in double_quoted_searches:
+                                                search_val = f'"{search_val}"'
                                             output_lines.append(f"      search: {search_val}")
                                         if 'regex' in source:
                                             # Keep boolean values lowercase for consistency
@@ -888,6 +892,18 @@ def add_missing_entries_to_yaml(yaml_file, new_entries):
     if not new_entries:
         return
 
+    # Extract search values that originally had single or double quotes before YAML parsing
+    # This preserves the original quoting style exactly
+    single_quoted_searches = set()
+    double_quoted_searches = set()
+    if os.path.exists(yaml_file):
+        with open(yaml_file, 'r') as f:
+            content_str = f.read()
+        for match in re.finditer(r"search:\s*'([^']*)'", content_str):
+            single_quoted_searches.add(match.group(1))
+        for match in re.finditer(r'search:\s*"([^"]*)"', content_str):
+            double_quoted_searches.add(match.group(1))
+
     # Load existing entries
     existing_entries = load_yaml_entries(yaml_file)
 
@@ -931,7 +947,13 @@ def add_missing_entries_to_yaml(yaml_file, new_entries):
                         if isinstance(source, dict):
                             f.write(f'    - file: {source.get("file", "")}\n')
                             if 'search' in source:
-                                f.write(f'      search: {source["search"]}\n')
+                                search_val = source["search"]
+                                # Preserve original quoting style exactly
+                                if search_val in single_quoted_searches:
+                                    search_val = f"'{search_val}'"
+                                elif search_val in double_quoted_searches:
+                                    search_val = f'"{search_val}"'
+                                f.write(f'      search: {search_val}\n')
                             if 'regex' in source:
                                 f.write(f'      regex: {source["regex"]}\n')
                         else:
@@ -1690,6 +1712,17 @@ def update_entry_names_in_yaml_files(project_dir, specrefs_files):
         if not os.path.exists(yaml_path):
             continue
 
+        # Extract search values that originally had single or double quotes before YAML parsing
+        # This preserves the original quoting style exactly
+        single_quoted_searches = set()
+        double_quoted_searches = set()
+        with open(yaml_path, 'r') as f:
+            content_str = f.read()
+        for match in re.finditer(r"search:\s*'([^']*)'", content_str):
+            single_quoted_searches.add(match.group(1))
+        for match in re.finditer(r'search:\s*"([^"]*)"', content_str):
+            double_quoted_searches.add(match.group(1))
+
         # Load existing entries
         existing_entries = load_yaml_entries(yaml_path)
         if not existing_entries:
@@ -1737,7 +1770,13 @@ def update_entry_names_in_yaml_files(project_dir, specrefs_files):
                                 if isinstance(source, dict):
                                     f.write(f'    - file: {source.get("file", "")}\n')
                                     if 'search' in source:
-                                        f.write(f'      search: {source["search"]}\n')
+                                        search_val = source["search"]
+                                        # Preserve original quoting style exactly
+                                        if search_val in single_quoted_searches:
+                                            search_val = f"'{search_val}'"
+                                        elif search_val in double_quoted_searches:
+                                            search_val = f'"{search_val}"'
+                                        f.write(f'      search: {search_val}\n')
                                     if 'regex' in source:
                                         f.write(f'      regex: {source["regex"]}\n')
                                 else:
@@ -1853,28 +1892,15 @@ def add_missing_spec_items_to_yaml_files(project_dir, config, specrefs_files):
                 # Calculate hash of current version
                 hash_value = hashlib.sha256(spec_content.encode('utf-8')).hexdigest()[:8]
 
-                # For multiple versions after the first, use diff style
-                if use_fork_suffix and idx > 0:
-                    # Get previous version for diff
-                    prev_fork, _, prev_spec_content = versions[idx - 1]
-
-                    # Generate diff
-                    diff_content = diff(prev_fork, strip_comments(prev_spec_content), fork, strip_comments(spec_content))
-
-                    # Build spec tag with style="diff"
-                    spec_tag = f'<spec {spec_attr}="{item_name}" fork="{fork}" style="diff" hash="{hash_value}">'
-                    content = diff_content
-                else:
-                    # Build spec tag without style="diff"
-                    spec_tag = f'<spec {spec_attr}="{item_name}" fork="{fork}" hash="{hash_value}">'
-                    content = spec_content
+                # Build spec tag
+                spec_tag = f'<spec {spec_attr}="{item_name}" fork="{fork}" hash="{hash_value}">'
 
                 # Create entry
                 entry_name = f'{item_name}#{fork}' if use_fork_suffix else item_name
                 entry = {
                     'name': entry_name,
                     'sources': [],
-                    'spec': f'{spec_tag}\n{content}\n</spec>'
+                    'spec': f'{spec_tag}\n{spec_content}\n</spec>'
                 }
                 new_entries.append(entry)
 
@@ -1984,28 +2010,15 @@ def generate_specref_files(output_dir, version="nightly", preset="mainnet"):
                 # Calculate hash of current version
                 hash_value = hashlib.sha256(spec_content.encode('utf-8')).hexdigest()[:8]
 
-                # For multiple versions after the first, use diff style
-                if use_fork_suffix and idx > 0:
-                    # Get previous version for diff
-                    prev_fork, _, prev_spec_content = versions[idx - 1]
-
-                    # Generate diff
-                    diff_content = diff(prev_fork, strip_comments(prev_spec_content), fork, strip_comments(spec_content))
-
-                    # Build spec tag with style="diff"
-                    spec_tag = f'<spec {spec_attr}="{item_name}" fork="{fork}" style="diff" hash="{hash_value}">'
-                    content = diff_content
-                else:
-                    # Build spec tag without style="diff"
-                    spec_tag = f'<spec {spec_attr}="{item_name}" fork="{fork}" hash="{hash_value}">'
-                    content = spec_content
+                # Build spec tag
+                spec_tag = f'<spec {spec_attr}="{item_name}" fork="{fork}" hash="{hash_value}">'
 
                 # Create entry
                 entry_name = f'{item_name}#{fork}' if use_fork_suffix else item_name
                 entry = {
                     'name': entry_name,
                     'sources': [],
-                    'spec': f'{spec_tag}\n{content}\n</spec>'
+                    'spec': f'{spec_tag}\n{spec_content}\n</spec>'
                 }
                 entries.append(entry)
 

{ethspecify-0.3.2 → ethspecify-0.3.4}/ethspecify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethspecify
-Version: 0.3.2
+Version: 0.3.4
 Summary: A utility for processing Ethereum specification tags.
 Home-page: https://github.com/jtraglia/ethspecify
 Author: Justin Traglia

{ethspecify-0.3.2 → ethspecify-0.3.4}/setup.py

@@ -8,7 +8,7 @@ long_description = (this_directory / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="ethspecify",
-    version="0.3.2",
+    version="0.3.4",
     description="A utility for processing Ethereum specification tags.",
     long_description=long_description,
     long_description_content_type="text/markdown",