webcode-tk 1.0.1__tar.gz → 1.0.4__tar.gz

{webcode_tk-1.0.1 → webcode_tk-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webcode-tk
-Version: 1.0.1
+Version: 1.0.4
 Summary: 
 Home-page: https://github.com/HundredVisionsGuy/webcode-tk
 License: MIT

{webcode_tk-1.0.1 → webcode_tk-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "webcode-tk"
-version = "1.0.1"
+version = "1.0.4"
 description = ""
 authors = ["hundredvisionsguy <cwinikka@gmail.com>"]
 keywords = ["html", "validation", "css", ]

{webcode_tk-1.0.1 → webcode_tk-1.0.4}/webcode_tk/__init__.py

@@ -18,4 +18,4 @@ Modules exported by this package:
 - `validator_tools`: sends HTML or CSS code to the W3C Validator to check
           for errors.
 """
-__version__ = "1.0.1"
+__version__ = "1.0.4"

{webcode_tk-1.0.1 → webcode_tk-1.0.4}/webcode_tk/cascade_tools.py

@@ -1493,7 +1493,7 @@ def update_contrast_results(
 
 
 def get_color_contrast_details(tree: CSSAppliedTree, rating="AAA") -> list:
-    """returns a list of all all failures or a pass based on rating
+    """returns a list of all failures or a pass based on rating
 
     We'll create a recursive inner nested function to traverse the DOM. We will
     target only the styles that are applied directly so as to not overwhelm the
@@ -1567,7 +1567,12 @@ def get_color_contrast_details(tree: CSSAppliedTree, rating="AAA") -> list:
 
     for element in elements:
         check_element(element, rating, filename)
-    if not results:
+    if results:
+        adjusted = []
+        for result in results:
+            adjusted.append("fail: " + result)
+        results = adjusted
+    else:
         # It's a success! Let's let them know
         msg = f"success: {filename} passes color contrast for {rating} Normal"
         msg += " and Large."

{webcode_tk-1.0.1 → webcode_tk-1.0.4}/webcode_tk/css_tools.py

@@ -2312,14 +2312,15 @@ def fonts_applied_report(project_dir: str, min=1, max=2) -> list:
     report = []
     all_file_data = get_styles_by_html_files(project_dir)
     for file in all_file_data:
+        font_families_applied = []
         number_of_fonts = 0
         filename = clerk.get_file_name(file.get("file"))
         stylesheets = file.get("stylesheets")
-        font_styles = []
         for sheet in stylesheets:
             font_details = get_font_families(sheet)
             number_of_fonts += len(font_details)
             for item in font_details:
+                results = None
                 selector = item.get("selector")
                 family = item.get("family")
                 if "," in family:
@@ -2328,22 +2329,36 @@ def fonts_applied_report(project_dir: str, min=1, max=2) -> list:
                     first_font = family
                 first_font = first_font.replace("'", "")
                 first_font = first_font.replace('"', "")
+                if first_font not in font_families_applied:
+                    font_families_applied.append(first_font)
                 if first_font.lower() == "times new roman":
                     results = f"fail: {filename}: {selector} element was set "
                     results += "to the default font"
-                elif number_of_fonts >= min and number_of_fonts <= max:
-                    results = f"pass: {filename}: {selector} element "
-                    results += f"was set to {first_font}"
-                elif number_of_fonts < min:
-                    results = f"fail: {filename} did not apply {min} fonts, "
-                    results += f"instead, it applied {number_of_fonts} fonts."
-                if results not in font_styles:
-                    font_styles.append(results)
-        # We have all font styles applied
-        if not font_styles:
-            report.append(f"fail: {filename} No modified fonts for {filename}")
-        else:
-            report += font_styles
+        num_fonts = len(font_families_applied)
+        if num_fonts >= min and num_fonts <= max:
+            results = f"pass: {filename} applied {num_fonts} "
+            if num_fonts == 1:
+                current_font = font_families_applied[0]
+                results += f"font: {current_font}"
+            else:
+                results += "fonts:"
+                for i in range(num_fonts):
+                    current_font = font_families_applied[i]
+                    if current_font == font_families_applied[-1]:
+                        results += f"and {current_font}"
+                    elif num_fonts > 2:
+                        results += f" {current_font}, "
+                    else:
+                        results += f" {current_font} "
+            results += "."
+        elif num_fonts < min:
+            results = f"fail: {filename} did not apply {min} fonts, "
+            results += f"instead, it applied {num_fonts} fonts."
+        elif num_fonts > max:
+            results = f"fail: {filename} applied too many fonts; "
+            results += f" it applied {num_fonts} fonts."
+        if results and results not in report:
+            report.append(results)
     if not report:
         report.append("fail: no html files to apply font styling to")
     return report

{webcode_tk-1.0.1 → webcode_tk-1.0.4}/webcode_tk/validator_tools.py

@@ -262,6 +262,7 @@ def get_project_validation(project_dir: str, type="html") -> list:
     will return a list of per-files errors
     """
     report = []
+    passing_files = []
     all_files = clerk.get_all_project_files(project_dir)
     for file in all_files:
         errors = []
@@ -274,24 +275,37 @@ def get_project_validation(project_dir: str, type="html") -> list:
                     f"fail: {filename} has {len(errors)} validation errors."
                 )
             else:
-                report.append(f"pass: {filename} passes HTML validation!")
+                passing_files.append(filename)
         else:
-            if file_type == "html":
+            if file_type == "html" and type == "css":
                 style_tag = html.get_elements("style", file)
                 if style_tag:
                     code = html.get_element_content(style_tag)
                     result = validate_css(code)
-                    errors += get_css_errors_list(result)
+                    errors_list = get_css_errors_list(result)
+                    if errors_list:
+                        errors += errors_list
+                    else:
+                        passing_files.append(filename)
             if file_type == "css":
                 code = clerk.file_to_string(file)
                 result = validate_css(code)
-                errors += get_css_errors_list(result)
+                errors_list = get_css_errors_list(result)
+                if errors_list:
+                    errors += errors_list
+                else:
+                    passing_files.append(filename)
             if errors:
                 report.append(
                     f"fail: {filename} has {len(errors)} css errors."
                 )
     if not report:
-        report.append("fail: no files present to validate")
+        if passing_files:
+            for passing_file in passing_files:
+                msg = f"pass: {passing_file} passes {type.upper()} validation"
+                report.append(msg)
+        if not passing_files:
+            report.append("fail: no files present to validate")
     # TODO - make sure this covers all scenarios
     return report