Rename replace_attributes to replace_conditionals.

Author: adamghill

src/dj_angles/replacers/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-from dj_angles.replacers.attributes import replace_attributes, replace_values
+from dj_angles.replacers.attributes import replace_conditionals, replace_values
 from dj_angles.replacers.comments import mask_comments
 from dj_angles.replacers.tags import replace_tags
 from dj_angles.replacers.variables import replace_variables
@@ -25,8 +25,8 @@ def convert_template(html: str, *, origin=None) -> str:
 
     (html, comments) = mask_comments(html, initial_tag_regex=initial_tag_regex)
 
-    # 1. Replace attributes, e.g. `<div dj-if="condition">`
-    html = replace_attributes(html)
+    # 1. Replace conditionals, e.g. `<div dj-if="condition">`
+    html = replace_conditionals(html)
 
     # 2. Replace variables, e.g. `{{ foo or bar }}`
     html = replace_variables(html)

src/dj_angles/replacers/attributes.py

@@ -79,7 +79,7 @@ def condition(self) -> str:
         return self.value
 
 
-def replace_attributes(html: str) -> str:
+def replace_conditionals(html: str) -> str:
     """Convert dj-if/elif/else attributes to Django template tags.
 
     Args:

tests/dj_angles/replacers/attributes/test_element.py

@@ -0,0 +1,100 @@
+import re
+
+from dj_angles.replacers.attributes import _find_element
+
+
+def test_find_element_basic():
+    html = '<div dj-value="x">content</div>'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+
+    assert element.tag_name == "div"
+    assert element.tag_start == 0
+    assert element.tag_end == 18
+    assert element.full_end == 31
+    assert element.original_tag == '<div dj-value="x">'
+    assert element.original_full == '<div dj-value="x">content</div>'
+    assert element.is_closing is False
+
+
+def test_find_element_self_closing():
+    html = '<img dj-value="x" />'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+
+    assert element.tag_name == "img"
+    assert element.original_tag == '<img dj-value="x" />'
+    assert element.full_end == element.tag_end
+    assert element.is_closing is False
+
+
+def test_find_element_void():
+    html = '<input dj-value="x">'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+
+    assert element.tag_name == "input"
+    assert element.original_tag == '<input dj-value="x">'
+    assert element.full_end == element.tag_end
+
+
+def test_find_element_closing_tag():
+    html = '</div dj-value="x">'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+
+    assert element.tag_name == "div"
+    assert element.is_closing is True
+
+
+def test_find_element_nested():
+    html = '<div dj-value="outer"><span dj-value="inner"></span></div>'
+    matches = list(re.finditer(r"dj-value=\"[^\"]+\"", html))
+
+    outer = _find_element(html, matches[0], "value")
+    inner = _find_element(html, matches[1], "value")
+
+    assert outer.contains(inner) is True
+    assert inner.contains(outer) is False
+
+
+def test_element_remove_attribute():
+    html = '<div class="foo" dj-value="x">content</div>'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+
+    assert element.remove_attribute() == '<div class="foo">'
+
+
+def test_element_closing_tag():
+    html = '<div dj-value="x">content</div>'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+
+    assert element.closing_tag() == "</div>"
+
+
+def test_element_closing_tag_generated():
+    html = '<img dj-value="x" />'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+
+    assert element.closing_tag() == "</img>"
+
+
+def test_element_type_and_value_fields():
+    html = '<div dj-value="x">content</div>'
+    match = re.search(r"dj-value=\"x\"", html)
+
+    element = _find_element(html, match, "value")
+    element.value = "x"
+
+    assert element.type == "value"
+    assert element.value == "x"

tests/dj_angles/replacers/attributes/test_replace_attributes.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from dj_angles.replacers.attributes import replace_attributes
+from dj_angles.replacers.attributes import replace_conditionals
 
 # Structure to store parameterize data
 Params = namedtuple(
@@ -72,13 +72,13 @@
     ),
 )
 def test_attributes(original, replacement):
-    actual = replace_attributes(original)
+    actual = replace_conditionals(original)
     assert actual == replacement
 
 
 def test_orphaned_else():
     with pytest.raises(AssertionError, match="Invalid use of dj-else attribute"):
-        replace_attributes("<div dj-else>orphaned</div>")
+        replace_conditionals("<div dj-else>orphaned</div>")
 
     with pytest.raises(AssertionError, match="Invalid use of dj-elif attribute"):
-        replace_attributes("<div dj-elif='c'>orphaned</div>")
+        replace_conditionals("<div dj-elif='c'>orphaned</div>")