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

ethspecify/core.py

@@ -278,58 +278,49 @@ def replace_spec_tags(file_path):
         re.DOTALL
     )
 
+    def rebuild_opening_tag(attributes, hash_value):
+        # Rebuild a fresh opening tag from attributes, overriding any existing hash.
+        new_opening = "<spec"
+        for key, val in attributes.items():
+            if key != "hash":
+                new_opening += f' {key}="{val}"'
+        new_opening += f' hash="{hash_value}">'
+        return new_opening
+
     def replacer(match):
+        # Always use the tag text from whichever group matched:
         if match.group("self") is not None:
-            # Process self-closing tag
-            tag_text = match.group("self")
-            attributes = extract_attributes(tag_text)
-            print(f"spec tag: {attributes}")
-            preset, fork, style = parse_common_attributes(attributes)
-            spec = get_spec(attributes, preset, fork)
-            hash_value = hashlib.sha256(spec.encode('utf-8')).hexdigest()[:8]
-            if 'hash="' in tag_text:
+            original_tag_text = match.group("self")
+        else:
+            original_tag_text = match.group("long")
+
+        attributes = extract_attributes(original_tag_text)
+        print(f"spec tag: {attributes}")
+        preset, fork, style = parse_common_attributes(attributes)
+        spec = get_spec(attributes, preset, fork)
+        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)}',
-                    tag_text
+                    original_tag_text
                 )
             else:
-                # Insert hash attribute before the trailing '/>'
-                updated_tag = tag_text[:-2] + f' hash="{hash_value}"' + tag_text[-2:]
+                updated_tag = re.sub(r'\s*/>$', f' hash="{hash_value}" />', original_tag_text)
             return updated_tag
         else:
-            # Process long (paired) tag
-            tag_text = match.group("long")
-            # Extract the opening tag from the long tag (everything up to the first '>')
-            opening_match = re.match(r'(<spec\b[^>]*>)([\s\S]*)(</spec>)', tag_text, re.DOTALL)
-            if not opening_match:
-                return tag_text
-            opening_tag_full = opening_match.group(1)
-            attributes = extract_attributes(opening_tag_full)
-            print(f"spec tag: {attributes}")
-            preset, fork, style = parse_common_attributes(attributes)
-            spec = get_spec(attributes, preset, fork)
-            hash_value = hashlib.sha256(spec.encode('utf-8')).hexdigest()[:8]
-            if 'hash="' in opening_tag_full:
-                updated_opening = re.sub(
-                    r'(hash=")[^"]*(")',
-                    lambda m: f'{m.group(1)}{hash_value}{m.group(2)}',
-                    opening_tag_full
-                )
-            else:
-                updated_opening = opening_tag_full[:-1] + f' hash="{hash_value}">'
-            if style == "hash":
-                updated_tag = re.sub(r'\s*</spec>\s*$', '', updated_opening)
-                updated_tag = re.sub(r'\s*>$', '', updated_tag) + " />"
-            else:
-                spec_content = get_spec_item(attributes)
-                prefix = content[:match.start()].splitlines()[-1]
-                prefixed_spec = "\n".join(
-                    f"{prefix}{line}" if line.rstrip() else prefix.rstrip()
-                    for line in spec_content.rstrip().split("\n")
-                )
-                long_opening = updated_opening.rstrip(">/") + ">"
-                updated_tag = f"{long_opening}\n{prefixed_spec}\n{prefix}</spec>"
+            # For full/diff styles, always 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]
+            prefixed_spec = "\n".join(
+                f"{prefix}{line}" if line.rstrip() else prefix.rstrip()
+                for line in spec_content.rstrip().split("\n")
+            )
+            updated_tag = f"{new_opening}\n{prefixed_spec}\n{prefix}</spec>"
             return updated_tag
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ethspecify
-Version: 0.1.2
+Version: 0.1.3
 Summary: A utility for processing Ethereum specification tags.
 Home-page: https://github.com/jtraglia/ethspecify
 Author: Justin Traglia
@@ -45,13 +45,13 @@ In your client, add HTML tags like this:
 
 ```
 /*
- * <spec fn="is_fully_withdrawable_validator" fork="deneb">
+ * <spec fn="is_fully_withdrawable_validator" fork="deneb" />
  */
 ```
 
 ```
 /*
- * <spec ssz_object="BeaconState" fork="electra" style="diff">
+ * <spec ssz_object="BeaconState" fork="electra" style="diff" />
  */
 ```
 

ethspecify-0.1.3.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=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,,

ethspecify-0.1.2.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=GHVBP4OjKAy5Rf3z5PIjee9WNhr5-_u7JG3Rt-Zd-4I,12890
-ethspecify-0.1.2.dist-info/LICENSE,sha256=Awxsr73mm9YMBVhBYnzeI7bNdRd-bH6RDtO5ItG0DaM,1071
-ethspecify-0.1.2.dist-info/METADATA,sha256=H1qF9pQTnFTKmnNnEL1oJjUk-GjGwoHv5slOp9qQ5-g,8786
-ethspecify-0.1.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ethspecify-0.1.2.dist-info/entry_points.txt,sha256=09viGkCg9J3h0c9BFRN-BKaJUEaIc4JyULNgBP5EL_g,51
-ethspecify-0.1.2.dist-info/top_level.txt,sha256=0klaMvlVyOkXW09fwZTijJpdybITEp2c9zQKV5v30VM,11
-ethspecify-0.1.2.dist-info/RECORD,,