ethspecify 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

ethspecify/core.py

@@ -287,12 +287,28 @@ def replace_spec_tags(file_path):
         new_opening += f' hash="{hash_value}">'
         return new_opening
 
+    def rebuild_self_closing_tag(attributes, hash_value):
+        # Build a self-closing tag from attributes, forcing a single space before the slash.
+        new_tag = "<spec"
+        for key, val in attributes.items():
+            if key != "hash":
+                new_tag += f' {key}="{val}"'
+        new_tag += f' hash="{hash_value}" />'
+        return new_tag
+
     def replacer(match):
         # Always use the tag text from whichever group matched:
         if match.group("self") is not None:
             original_tag_text = match.group("self")
         else:
             original_tag_text = match.group("long")
+        # Determine the original opening tag (ignore inner content)
+        if match.group("self") is not None:
+            original_tag_text = match.group("self")
+        else:
+            long_tag_text = match.group("long")
+            opening_tag_match = re.search(r'<spec\b[^>]*>', long_tag_text)
+            original_tag_text = opening_tag_match.group(0) if opening_tag_match else long_tag_text
 
         attributes = extract_attributes(original_tag_text)
         print(f"spec tag: {attributes}")
@@ -301,18 +317,11 @@ def replace_spec_tags(file_path):
         hash_value = hashlib.sha256(spec.encode('utf-8')).hexdigest()[:8]
 
         if style == "hash":
-            # For hash style, output a self-closing tag.
-            if 'hash="' in original_tag_text:
-                updated_tag = re.sub(
-                    r'(hash=")[^"]*(")',
-                    lambda m: f'{m.group(1)}{hash_value}{m.group(2)}',
-                    original_tag_text
-                )
-            else:
-                updated_tag = re.sub(r'\s*/>$', f' hash="{hash_value}" />', original_tag_text)
+            # Rebuild a fresh self-closing tag.
+            updated_tag = rebuild_self_closing_tag(attributes, hash_value)
             return updated_tag
         else:
-            # For full/diff styles, always rebuild as a long (paired) tag.
+            # For full/diff styles, rebuild as a long (paired) tag.
             new_opening = rebuild_opening_tag(attributes, hash_value)
             spec_content = get_spec_item(attributes)
             prefix = content[:match.start()].splitlines()[-1]

{ethspecify-0.1.3.dist-info → ethspecify-0.1.4.dist-info}/METADATA

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

ethspecify-0.1.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+ethspecify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ethspecify/cli.py,sha256=TTKmSGUkuRdYlYS6t-cpVXpdpSKsYCWvmRDy8DcC10E,882
+ethspecify/core.py,sha256=dJnhQpAhNpp_cY_fMj8k_cthXOVW_nagTl2oBZsIDc8,12654
+ethspecify-0.1.4.dist-info/LICENSE,sha256=Awxsr73mm9YMBVhBYnzeI7bNdRd-bH6RDtO5ItG0DaM,1071
+ethspecify-0.1.4.dist-info/METADATA,sha256=bALmnZ4tsQQ4ftX5JlwP06-i-O2jLcXowalbdEHa-2w,8790
+ethspecify-0.1.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ethspecify-0.1.4.dist-info/entry_points.txt,sha256=09viGkCg9J3h0c9BFRN-BKaJUEaIc4JyULNgBP5EL_g,51
+ethspecify-0.1.4.dist-info/top_level.txt,sha256=0klaMvlVyOkXW09fwZTijJpdybITEp2c9zQKV5v30VM,11
+ethspecify-0.1.4.dist-info/RECORD,,

ethspecify-0.1.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-ethspecify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ethspecify/cli.py,sha256=TTKmSGUkuRdYlYS6t-cpVXpdpSKsYCWvmRDy8DcC10E,882
-ethspecify/core.py,sha256=pUybFZnO8nDDQ-7tQjxbUjQHFTV4PEGFWJTyR3gy0hM,12194
-ethspecify-0.1.3.dist-info/LICENSE,sha256=Awxsr73mm9YMBVhBYnzeI7bNdRd-bH6RDtO5ItG0DaM,1071
-ethspecify-0.1.3.dist-info/METADATA,sha256=JI4igGfL54P1EEmtIG-54A1SV5mrhxIbCCOs2WufJmQ,8790
-ethspecify-0.1.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ethspecify-0.1.3.dist-info/entry_points.txt,sha256=09viGkCg9J3h0c9BFRN-BKaJUEaIc4JyULNgBP5EL_g,51
-ethspecify-0.1.3.dist-info/top_level.txt,sha256=0klaMvlVyOkXW09fwZTijJpdybITEp2c9zQKV5v30VM,11
-ethspecify-0.1.3.dist-info/RECORD,,