webcode-tk 1.2.9__tar.gz → 1.2.12__tar.gz

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/PKG-INFO

@@ -1,17 +1,16 @@
 Metadata-Version: 2.4
 Name: webcode-tk
-Version: 1.2.9
+Version: 1.2.12
 Summary: A set of tools for inspecting HTML and CSS code
 License: MIT
 License-File: LICENSE.rst
 Keywords: html,validation,css
 Author: hundredvisionsguy
 Author-email: cwinikka@gmail.com
-Requires-Python: >=3.9.0,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -22,6 +21,7 @@ Requires-Dist: file-clerk (>=1.0.9,<2.0.0)
 Requires-Dist: lxml (>=6.0.0,<7.0.0)
 Requires-Dist: mechanicalsoup (>=1.4.0,<2.0.0)
 Requires-Dist: nltk (>=3.8.1,<4.0.0)
+Requires-Dist: pre-commit (>=4.5.0,<5.0.0)
 Requires-Dist: py-readability-metrics (>=1.4.5,<2.0.0)
 Requires-Dist: pytest-mock (>=3.15.1,<4.0.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "webcode-tk"
-version = "1.2.9"
+version = "1.2.12"
 description = "A set of tools for inspecting HTML and CSS code"
 authors = ["hundredvisionsguy <cwinikka@gmail.com>"]
 keywords = ["html", "validation", "css", ]
@@ -16,7 +16,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.9.0,<4.0"
+python = ">=3.10,<4.0"
 bs4 = "^0.0.1"
 file-clerk = "^1.0.9"
 requests = "^2.28.1"
@@ -27,6 +27,7 @@ tinycss2 = "^1.4.0"
 lxml = "^6.0.0"
 mechanicalsoup = "^1.4.0"
 pytest-mock = "^3.15.1"
+pre-commit = "^4.5.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "*"

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/webcode_tk/__init__.py

@@ -40,4 +40,4 @@
 - **`validator_tools`**: sends HTML or CSS code to the W3C Validator to check
           for errors.
 """
-__version__ = "1.2.9"
+__version__ = "1.2.12"

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/webcode_tk/cascade_tools.py

@@ -1539,6 +1539,16 @@ def targets_element_directly(element: Element, selector: str) -> bool:
     elif selector_type == "id_selector":
         attributes = element.attributes
         if attributes:
+            if not isinstance(attributes, dict):
+                try:
+                    attributes = dict(attributes)
+                except Exception:
+                    msg = "This is not a dictionary and cannot be converted"
+                    msg += " into one!"
+                    raise ValueError(msg)
+            else:
+                data_type = str(type(attributes))
+                print(data_type)
             id_attribute = attributes.get("id")
             if id_attribute:
                 targets = selector in attributes.get("id")

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/webcode_tk/color_tools.py

@@ -313,7 +313,7 @@ def has_alpha_channel(code: str) -> bool:
     """
     has_alpha = False
     if "#" in code:
-        if len(code) == 9:
+        if len(code) == 9 or len(code) == 5:
             has_alpha = True
     if "hsla(" in code:
         has_alpha = True
@@ -321,6 +321,10 @@ def has_alpha_channel(code: str) -> bool:
         has_alpha = True
     if "rgba(" in code:
         has_alpha = True
+    if "rgb" in code and "/" in code:
+        has_alpha = True
+    if "transparent" in code:
+        has_alpha = True
     return has_alpha
 
 

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/webcode_tk/contrast_tools.py

@@ -166,20 +166,6 @@ def generate_contrast_report(
     for file in project_files:
         errors = project_files.get(file)
 
-        # Check for global selectors (html, *, or body) and calculate contrast
-        global_color_result = css_tools.get_global_color_report(project_path)
-
-        if isinstance(global_color_result, list):
-            for result in global_color_result:
-                if file in result:
-                    # Always add global color failures
-                    if "fail" in result:
-                        error_msg = result.split(file)[1]
-                        msg = f"fail: in {file}, {error_msg.strip()}"
-                        # Add to errors list if not already there
-                        if msg not in project_files[file]:
-                            project_files[file].append(msg)
-
         # Now append to report
         if errors:
             if "has no CSS" in errors[0]:
@@ -1557,25 +1543,6 @@ def analyze_elements_for_contrast(
             "contrast_analysis"
         )
 
-        # Check if this element inherited both text and background colors
-        text_color_source_type = extract_property_source(
-            element_data["color"]
-        ).get("source_type")
-        bg_color_source_type = extract_property_source(
-            element_data["background-color"]
-        ).get("source_type")
-
-        # Determine if this is a global color failure
-        inherited_text = text_color_source_type in [
-            "inherited",
-            "browser_default",
-        ]
-        inherited_bg = bg_color_source_type in [
-            "visual_inheritance",
-            "browser_default",
-        ]
-        is_global_failure = inherited_text and inherited_bg
-
         if is_large:
             aaa_results = contrast_report.get("Large AAA")
             aa_results = contrast_report.get("Large AA")
@@ -1607,7 +1574,6 @@ def analyze_elements_for_contrast(
             "wcag_aa_pass": aa_results,
             "wcag_aaa_pass": aaa_results,
             "contrast_analysis": contrast_analysis,
-            "global_color_failure": is_global_failure,
         }
 
         # add to results

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/webcode_tk/css_tools.py

@@ -1383,7 +1383,11 @@ def get_global_color_details(rulesets: Union[list, tuple]) -> list:
     global_selectors = ("html", "body", ":root", "*")
     global_rulesets = []
     for ruleset in rulesets:
-        if ruleset.selector in global_selectors:
+        if (
+            ruleset.selector in global_selectors
+            or "html" in ruleset.selector[:4]
+            or "body" in ruleset.selector[:4]
+        ):
             selector = ruleset.selector
             background_color = ""
             color = ""
@@ -1392,10 +1396,6 @@ def get_global_color_details(rulesets: Union[list, tuple]) -> list:
                     background_color = declaration.value
                 elif declaration.property == "color":
                     color = declaration.value
-                    if is_gradient(color):
-                        colors = process_gradient(color)
-                        todo = input("We have colors: " + colors)
-                        print(todo)
                 elif declaration.property == "background":
                     background_color = declaration.value
                     if is_gradient(background_color):
@@ -2452,22 +2452,93 @@ def get_global_color_report(project_dir: str, level="aaa") -> list:
     for data in all_file_data:
         filename = data[0]
         passes = []
+        global_data = {
+            "selector": "",
+            "specificity": "",
+            "bg_color": "",
+            "color": "",
+            "contrast_ratio": 0.0,
+            "passes_normal": False,
+            "passes_large": False,
+        }
         for sheet in data[1]:
             rules = sheet.rulesets
             global_color_data = get_global_color_details(rules)
             if global_color_data:
-                for item in global_color_data:
-                    file, result = get_color_data(filename, item, level)
-                    if "fail" in result:
-                        passes.append(f"fail: {file} {result}")
+                previous_selector = global_data.get("selector")
+                if previous_selector:
+                    previous_data = global_data.copy()
+
+                data = global_color_data[0]
+                current_selector = data.get("selector")
+                global_data["selector"] = current_selector
+
+                current_specificity = get_specificity(current_selector)
+                global_data["specificity"] = current_specificity
+
+                bg_color = data.get("background-color")
+                global_data["bg_color"] = bg_color
+
+                color = data.get("color")
+                global_data["color"] = color
+
+                ratio = data.get("contrast_ratio")
+                global_data["contrast_ratio"] = ratio
+
+                if level == "aaa":
+                    passes_normal = data.get("passes_normal_aaa")
+                    passes_large = data.get("passes_large_aaa")
+                else:
+                    passes_normal = data.get("passes_normal_aa")
+                    passes_large = data.get("passes_large_aa")
+
+                global_data["passes_normal"] = passes_normal
+                global_data["passes_large"] = passes_large
+
+                # If there was a previous selector
+                if previous_selector:
+                    previous_specificity = previous_data.get("specificity")
+
+                    # If previous specificity is higher, we need everything
+                    # from previous
+                    if previous_specificity > current_specificity:
+                        # Keep all from previous data
+                        for key, val in previous_data.items():
+                            if key in ["bg_color", "color"] and val:
+                                global_data[key] = val
                     else:
-                        passes.append(f"pass: {file} {result}")
-        if passes:
-            details = ""
-            for detail in passes:
-                details += detail
+                        # we already overrode everything
+                        # Anything missing? We need to pull from previous data
+                        for key, val in global_data.items():
+                            if not val:
+                                new_val = previous_data.get(key)
+                                if new_val:
+                                    global_data[key] = new_val
+        # reassess color contrast for global_data
+        bg_color = global_data.get("bg_color")
+        color = global_data.get("color")
+        if not bg_color or not color:
+            details = f"fail: {filename} does not apply "
+            if not bg_color and not color:
+                details += "neither background nor text color."
+            elif not bg_color:
+                details += "background color."
+            else:
+                details += "text color."
         else:
-            details = f"fail: {filename} does NOT apply global colors"
+            bg_hex = color_tools.get_hex(bg_color)
+            color_hex = color_tools.get_hex(color)
+            contrast_ratio = color_tools.contrast_ratio(bg_hex, color_hex)
+            normal_level = f"Normal {level.upper()}"
+            passes = color_tools.passes_color_contrast(
+                normal_level, bg_hex, color_hex
+            )
+            if passes:
+                details = f"pass: {filename} applies global colors and passes"
+                details += f" Normal {level.upper()} at a ratio of "
+                details += f"{contrast_ratio}:1."
+            else:
+                details = f"fail: {filename} does NOT apply global colors"
         report.append(details)
     if not report:
         report.append("fail: no html files to apply color styles to")

{webcode_tk-1.2.9 → webcode_tk-1.2.12}/webcode_tk/html_tools.py

@@ -50,6 +50,29 @@ def get_all_html_files(dir_path: str) -> list:
     return html_files
 
 
+def get_image_hotlinks(soup: BeautifulSoup) -> list:
+    """Returns a list of all img src values that are external (hotlinked) URLs.
+
+    Hotlinked images are those with src attributes pointing to external
+    domains rather than local/relative paths. I ask that all students avoid
+    hotlinking images, as it's bad form and generally frowned upon.
+
+    Args:
+        soup: html soupt object.
+
+    Returns:
+        hotlinks: a list of hotlinked image srcs"""
+    hotlinks = []
+    # Get all img urls
+    image_elements = soup.find_all("img")
+    image_srcs = [img["src"] for img in image_elements]
+    for src in image_srcs:
+        if "http" in src[:4]:
+            hotlinks.append(src)
+
+    return hotlinks
+
+
 def get_html(file_path: str) -> BeautifulSoup:
     """Returns an html document (from file_path) as a BeautifulSoup object