Merge pull request #96 from mrf345/testing

Replace go html parser deprecated option
mrf345 · Jun 13, 2024 · b7ce727 · b7ce727
2 parents 4030460 + 9078b8f
commit b7ce727
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/flask_minify/about.py b/flask_minify/about.py
@@ -1,4 +1,4 @@
-__version__ = "0.46"
+__version__ = "0.47"
 __doc__ = "Flask extension to minify html, css, js and less."
 __license__ = "MIT"
 __author__ = "Mohamed Feddad"

diff --git a/flask_minify/parsers.py b/flask_minify/parsers.py
@@ -92,7 +92,7 @@ def executer(self, content, **options):
 class HtmlGo(GoParserMixin):
     runtime_options = _o = {
         "html-keep-comments": False,
-        "html-keep-conditional-comments": True,
+        "html-keep-special-comments": True,
         "html-keep-default-attr-vals": True,
         "html-keep-document-tags": True,
         "html-keep-end-tags": True,
@@ -131,12 +131,16 @@ def __init__(
         self.fail_safe = fail_safe
         self.go = go
 
-        if any(p.go for p in self.parsers.values()) and not minify_go:
+        if self.has_go_parser and not minify_go:
             raise FlaskMinifyException(
                 f"Cannot use any Go parsers without installing "
                 "Go optional dependency: `pip install flask-minify[go]`"
             )
 
+    @property
+    def has_go_parser(self):
+        return any(p.go for p in self.parsers.values())
+
     def update_runtime_options(
         self, html=False, js=False, cssless=False, script_types=[]
     ):

diff --git a/requirements/main.txt b/requirements/main.txt
@@ -5,4 +5,4 @@ htmlminf
 jsmin
 xxhash
 rcssmin
-tdewolff-minify[go]; platform_system == "Linux"
+tdewolff-minify[go]>=2.20.34; platform_system == "Linux"
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 supported_versions = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
-optional_requirements = {"go": 'tdewolff-minify; platform_system == "Linux"'}
+optional_requirements = {"go": 'tdewolff-minify>=2.20.34; platform_system == "Linux"'}
 basedir = path.abspath(path.dirname(__file__))
 long_description = ""
 requirements = []

diff --git a/tests/constants.py b/tests/constants.py
@@ -88,6 +88,20 @@
     ]
 )
 
+HTML_CONDITIONAL_COMMENTS = """
+<html>
+    <header>
+        <!--[if IE]>
+            IE comment!
+        <![endif]-->
+    </header>
+</html>
+"""
+
+MINIFIED_HTML_CONDITIONAL_COMMENTS = (
+    b"<html><header><!--[if IE]>IE comment!<![endif]--></header></html>"
+)
+
 MINIFIED_HTML = b"<html><body><h1> HTML </h1></body></html>"
 MINIFIED_HTML_GO = b"<html><body><h1>HTML</h1></body></html>"
 

diff --git a/tests/integration_go.py b/tests/integration_go.py
@@ -12,6 +12,7 @@
     LESS,
     LESS_RAW,
     MINIFIED_CSS_EDGE_CASES_GO,
+    MINIFIED_HTML_CONDITIONAL_COMMENTS,
     MINIFIED_HTML_EMBEDDED_TAGS_GO,
     MINIFIED_HTML_GO,
     MINIFIED_JS,
@@ -265,3 +266,10 @@ def test_unicode_endpoint(client):
 
     assert resp.status == "200 OK"
     assert resp.data.decode("utf-8") == "–"
+
+
+@pytest.mark.skipif(is_windows, reason=skip_reason)
+def test_go_html_minify_conditional_comments(client):
+    """testing go HTML minify with conditional comments"""
+    resp = client.get("/conditional-comments")
+    assert MINIFIED_HTML_CONDITIONAL_COMMENTS == resp.data
diff --git a/tests/setup.py b/tests/setup.py
@@ -9,6 +9,7 @@
     FALSE_JS,
     FALSE_LESS,
     HTML,
+    HTML_CONDITIONAL_COMMENTS,
     HTML_EMBEDDED_TAGS,
     JS,
     JS_WITH_TYPE,
@@ -94,4 +95,8 @@ def html_embedded():
     def unicode_endpoint():
         return "–"
 
+    @app.route("/conditional-comments")
+    def conditional_comments():
+        return HTML_CONDITIONAL_COMMENTS
+
     return app, store_minify
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ htmlminf @@
     jsmin
     xxhash
     rcssmin
-    tdewolff-minify[go]; platform_system == "Linux"
+    tdewolff-minify[go]>=2.20.34; platform_system == "Linux"