Compress parser code and add comprehensive unit tests

Co-authored-by: codingjoe <[email protected]>

Author: Copilot

s3file/forms.py

@@ -19,30 +19,21 @@
 
 
 class InputToS3FileRewriter(HTMLParser):
-    """
-    HTML parser that rewrites <input type="file"> tags to <s3-file> custom elements.
-
-    This provides a robust way to transform Django's rendered file input widgets
-    into custom elements, handling various attribute orderings and formats.
-    """
+    """HTML parser that rewrites <input type="file"> to <s3-file> custom elements."""
 
     def __init__(self):
         super().__init__()
         self.output = []
 
-    def _is_file_input(self, attrs):
-        """Check if attributes indicate a file input element."""
-        attrs_dict = dict(attrs)
-        return attrs_dict.get("type") == "file"
-
     def handle_starttag(self, tag, attrs):
-        if tag == "input" and self._is_file_input(attrs):
-            # Replace with s3-file custom element
-            self._write_s3_file_tag(attrs)
-            return
-
-        # For all other tags, preserve as-is
-        self.output.append(self.get_starttag_text())
+        if tag == "input" and dict(attrs).get("type") == "file":
+            self.output.append("<s3-file")
+            for name, value in attrs:
+                if name != "type":
+                    self.output.append(f' {name}="{html.escape(value, quote=True)}"' if value else f" {name}")
+            self.output.append(">")
+        else:
+            self.output.append(self.get_starttag_text())
 
     def handle_endtag(self, tag):
         self.output.append(f"</{tag}>")
@@ -51,32 +42,16 @@ def handle_data(self, data):
         self.output.append(data)
 
     def handle_startendtag(self, tag, attrs):
-        # For self-closing tags
-        if tag == "input" and self._is_file_input(attrs):
-            # Replace with s3-file custom element
-            self._write_s3_file_tag(attrs)
-            return
-
-        self.output.append(self.get_starttag_text())
-
-    def _write_s3_file_tag(self, attrs):
-        """
-        Write the s3-file opening tag with all attributes except type.
-
-        Note: This creates an opening tag that requires a corresponding closing tag.
-        """
-        self.output.append("<s3-file")
-        for name, value in attrs:
-            if name != "type":  # Skip type attribute
-                if value is None:
-                    self.output.append(f" {name}")
-                else:
-                    escaped_value = html.escape(value, quote=True)
-                    self.output.append(f' {name}="{escaped_value}"')
-        self.output.append(">")
+        if tag == "input" and dict(attrs).get("type") == "file":
+            self.output.append("<s3-file")
+            for name, value in attrs:
+                if name != "type":
+                    self.output.append(f' {name}="{html.escape(value, quote=True)}"' if value else f" {name}")
+            self.output.append(">")
+        else:
+            self.output.append(self.get_starttag_text())
 
     def get_html(self):
-        """Return the transformed HTML."""
         return "".join(self.output)
 
 

tests/test_forms.py

@@ -72,6 +72,54 @@ def test_str(self, settings):
         assert str(js) == '<script src="/static/path" type="module"></script>'
 
 
+class TestInputToS3FileRewriter:
+    def test_transforms_file_input(self):
+        parser = forms.InputToS3FileRewriter()
+        parser.feed('<input type="file" name="test">')
+        assert parser.get_html() == '<s3-file name="test">'
+
+    def test_preserves_non_file_input(self):
+        parser = forms.InputToS3FileRewriter()
+        parser.feed('<input type="text" name="test">')
+        assert parser.get_html() == '<input type="text" name="test">'
+
+    def test_handles_attribute_ordering(self):
+        parser = forms.InputToS3FileRewriter()
+        parser.feed('<input name="test" type="file" class="foo">')
+        result = parser.get_html()
+        assert result.startswith('<s3-file')
+        assert 'name="test"' in result
+        assert 'class="foo"' in result
+        assert 'type="file"' not in result
+
+    def test_handles_multiple_attributes(self):
+        parser = forms.InputToS3FileRewriter()
+        parser.feed('<input type="file" name="test" accept="image/*" required multiple>')
+        result = parser.get_html()
+        assert result.startswith('<s3-file')
+        assert 'name="test"' in result
+        assert 'accept="image/*"' in result
+        assert 'required' in result
+        assert 'multiple' in result
+
+    def test_escapes_html_entities(self):
+        parser = forms.InputToS3FileRewriter()
+        parser.feed('<input type="file" name="test" data-value="test&value">')
+        result = parser.get_html()
+        assert 'data-value="test&amp;value"' in result
+
+    def test_handles_self_closing_tag(self):
+        parser = forms.InputToS3FileRewriter()
+        parser.feed('<input type="file" name="test" />')
+        assert parser.get_html() == '<s3-file name="test">'
+
+    def test_preserves_surrounding_elements(self):
+        parser = forms.InputToS3FileRewriter()
+        parser.feed('<p><input type="file" name="test"></p>')
+        result = parser.get_html()
+        assert result == '<p><s3-file name="test"></p>'
+
+
 @contextmanager
 def wait_for_page_load(driver, timeout=30):
     old_page = driver.find_element(By.TAG_NAME, "html")
@@ -186,6 +234,21 @@ def test_render_wraps_in_s3_file_element(self, freeze_upload_folder):
         # Check that the output is the s3-file custom element
         assert html.startswith("<s3-file")
 
+    def test_render_preserves_attributes(self, freeze_upload_folder):
+        widget = ClearableFileInput(attrs={"class": "test-class", "accept": "image/*"})
+        html = widget.render(name="file", value=None)
+        assert html.startswith("<s3-file")
+        assert 'name="file"' in html
+        assert 'class="test-class"' in html
+        assert 'accept="image/*"' in html
+        assert 'type="file"' not in html
+
+    def test_render_excludes_type_attribute(self, freeze_upload_folder):
+        widget = ClearableFileInput()
+        html = widget.render(name="file", value=None)
+        assert 'type="file"' not in html
+        assert html.startswith("<s3-file")
+
     @pytest.mark.selenium
     def test_no_js_error(self, driver, live_server):
         driver.get(live_server + self.create_url)