webcode-tk 0.7.0__tar.gz → 0.7.1__tar.gz

{webcode_tk-0.7.0 → webcode_tk-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webcode-tk
-Version: 0.7.0
+Version: 0.7.1
 Summary: 
 Home-page: https://github.com/HundredVisionsGuy/webcode-tk
 License: MIT
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: MechanicalSoup (>=1.1.0,<2.0.0)
 Requires-Dist: bs4 (>=0.0.1,<0.0.2)
 Requires-Dist: file-clerk (>=1.0.9,<2.0.0)

{webcode_tk-0.7.0 → webcode_tk-0.7.1}/pyproject.toml

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

{webcode_tk-0.7.0 → webcode_tk-0.7.1}/webcode_tk/__init__.py

@@ -15,4 +15,4 @@ Modules exported by this package:
 - `validator`: sends HTML or CSS code to the W3C Validator to check
           for errors.
 """
-__version__ = "0.7.0"
+__version__ = "0.7.1"

{webcode_tk-0.7.0 → webcode_tk-0.7.1}/webcode_tk/color_keywords.py

@@ -12,7 +12,6 @@ basic_color_keywords = {
     "black": "#000000",
     "silverk": "#C0C0C0",
     "grayk": "#808080",
-    "greyk": "#808080",
     "whitek": "#FFFFFF",
     "maroon": "#800000",
     "red": "#FF0000",
@@ -54,7 +53,6 @@ extended_color_keywords = [
     "darkcyan - #008B8B - rgb(0, 139, 139) - Shades",
     "darkgoldenrod - #B8860B - rgb(184, 134, 11) - Shades",
     "darkgray - #A9A9A9 - rgb(169, 169, 169) - Shades",
-    "darkgrey - #A9A9A9 - rgb(169, 169, 169) - Shades",
     "darkgreen - #006400 - rgb(0, 100, 0) - Shades",
     "darkkhaki - #BDB76B - rgb(189, 183, 107) - Shades",
     "darkmagenta - #8B008B - rgb(139, 0, 139) - Shades",
@@ -66,13 +64,11 @@ extended_color_keywords = [
     "darkseagreen - #8FBC8F - rgb(143, 188, 143) - Shades",
     "darkslateblue - #483D8B - rgb(72, 61, 139) - Shades",
     "darkslategray - #2F4F4F - rgb(47, 79, 79) - Shades",
-    "darkslategrey - #2F4F4F - rgb(47, 79, 79) - Shades",
     "darkturquoise - #00CED1 - rgb(0, 206, 209) - Shades",
     "darkviolet - #9400D3 - rgb(148, 0, 211) - Shades",
     "deeppink - #FF1493 - rgb(255, 20, 147) - Shades",
     "deepskyblue - #00BFFF - rgb(0, 191, 255) - Shades",
     "dimgray - #696969 - rgb(0, 191, 255) - Shades",
-    "dimgrey - #696969 - rgb(0, 191, 255) - Shades",
     "dodgerblue - #1E90FF - rgb(30, 144, 255) - Shades",
     "firebrick - #B22222 - rgb(178, 34, 34) - Shades",
     "floralwhite - #FFFAF0 - rgb(255, 250, 240) - Shades",
@@ -83,7 +79,6 @@ extended_color_keywords = [
     "gold - #FFD700 - rgb(255, 215, 0) - Shades",
     "goldenrod - #DAA520 - rgb(218, 165, 32) - Shades",
     "gray - #7F7F7F - rgb(127, 127, 127) - Shades",
-    "grey - #7F7F7F - rgb(127, 127, 127) - Shades",
     "green - #008000 - rgb(0, 128, 0) - Shades",
     "greenyellow - #ADFF2F - rgb(173, 255, 47) - Shades",
     "honeydew - #F0FFF0 - rgb(240, 255, 240) - Shades",
@@ -107,7 +102,6 @@ extended_color_keywords = [
     "lightseagreen - #20B2AA - rgb(32, 178, 170) - Shades",
     "lightskyblue - #87CEFA - rgb(135, 206, 250) - Shades",
     "lightslategray - #778899 - rgb(119, 136, 153) - Shades",
-    "lightslategrey - #778899 - rgb(119, 136, 153) - Shades",
     "lightsteelblue - #B0C4DE - rgb(176, 196, 222) - Shades",
     "lightyellow - #FFFFE0 - rgb(255, 255, 224) - Shades",
     "lime - #00FF00 - rgb(0, 255, 0) - Shades",
@@ -162,7 +156,6 @@ extended_color_keywords = [
     "skyblue - #87CEEB - rgb(135, 206, 235) - Shades",
     "slateblue - #6A5ACD - rgb(106, 90, 205) - Shades",
     "slategray - #708090 - rgb(112, 128, 144) - Shades",
-    "slategrey - #708090 - rgb(112, 128, 144) - Shades",
     "snow - #FFFAFA - rgb(255, 250, 250) - Shades",
     "springgreen - #00FF7F - rgb(0, 255, 127) - Shades",
     "steelblue - #4682B4 - rgb(70, 130, 180) - Shades",

{webcode_tk-0.7.0 → webcode_tk-0.7.1}/webcode_tk/color_tools.py

@@ -452,11 +452,25 @@ def is_color_value(val: str) -> bool:
         is_valid = True
     elif is_rgb(val):
         is_valid = True
+    elif is_keyword(val):
+        is_valid = True
     else:
         is_valid = False
     return is_valid
 
 
+def is_keyword(val: str) -> bool:
+    """checks to see if a value is a color keyword or not
+
+    Args:
+        val: the CSS value in question.
+
+    Returns:
+        is_keyword: if the value is a color keyword or not."""
+    is_keyword = val in color_keywords.get_all_keywords()
+    return is_keyword
+
+
 def get_relative_luminance(val: int) -> float:
     """Returns the relative brightness of a color channel normalized
     to 0 for black and 1 for all white.

{webcode_tk-0.7.0 → webcode_tk-0.7.1}/webcode_tk/css_tools.py

@@ -508,11 +508,13 @@ class Declaration:
         self.property = ""
         self.value = ""
         self.invalid_message = ""
+        self.is_color = False
         # validate before trying to set the declaration.
         try:
             self.validate_declaration()
             self.is_valid = True
             self.set_declaration()
+            self.is_color_property()
         except ValueError as e:
             self.is_valid = False
             self.invalid_message = str(e)
@@ -632,6 +634,12 @@ class Declaration:
         declaration = self.property + ": " + self.value
         return declaration
 
+    def is_color_property(self):
+        value = self.value
+        if value[-1] == ";":
+            value = value[:-1]
+        self.is_color = color_tools.is_color_value(value)
+
 
 def restore_braces(split: list) -> list:
     """restore the missing braces removed by the .split() method
@@ -1230,7 +1238,7 @@ def get_colors_from_gradient(gradient: str) -> list:
 
 
 def get_color_codes_of_type(color_type: str, gradient: str) -> list:
-    """returns all color codes of a particular type (hsl, rgb, etc.)
+    """returns all color codes of a particular type from a gradient
 
     Args:
         color_type: the type of color code it might be (hex, rgb, hsl,
@@ -1537,6 +1545,96 @@ def adjust_overrides(file_path: str, rules: dict) -> dict:
     return adjusted_rule
 
 
+def get_all_color_rules(stylesheet: Stylesheet) -> list:
+    """Gets all color-based rules from a stylesheet.
+
+    Args:
+        stylesheet: Stylesheet object.
+
+    Returns:
+        rules: a list of color-based rules"""
+    rules = []
+    for ruleset in stylesheet.rulesets:
+        declaration_block = ruleset.declaration_block
+        declarations = declaration_block.declarations
+        for declaration in declarations:
+            property = declaration.property
+            if property == "color" or "background" in property:
+                selector = ruleset.selector
+                value = declaration.value
+                if property == "background":
+                    background_color = get_background_color(declaration)
+                    if not background_color:
+                        continue
+                    else:
+                        value = background_color
+                rules.append((selector, property, value))
+    return rules
+
+
+def get_background_color(declaration: Declaration) -> Union[str, None]:
+    """Returns a color value from a declaration with a property of background
+
+    Args:
+        declaration: the declaration we want to test.
+
+    Returns:
+        color_value: either a valid color value, None, or gradient - if it's a
+            gradient"""
+    color_value = None
+    is_rgb = color_tools.is_rgb(declaration.value)
+    if is_rgb:
+        return declaration.value
+    values = declaration.value.split()
+    for val in values:
+        color = color_tools.is_color_value(val)
+        if color:
+            color_value = val
+            break
+        is_keyword = val in color_tools.color_keywords.get_all_keywords()
+        if is_keyword:
+            color_value = val
+            break
+        gradient = is_gradient(val)
+        if gradient:
+            color_value = "gradient"
+            break
+    return color_value
+
+
+def condense_the_rules(rules):
+    condensed = []
+    for rule in rules:
+        file, sel, prop, val = rule
+        color = {}
+        background = {}
+        declaration = get_bg_or_color(prop)
+        if declaration.get("type") == "color":
+            color = declaration
+        elif declaration.get("type") == "background":
+            background = declaration
+        if not condensed:
+            condensed.append([file, sel, color, background, val])
+        else:
+            for rule in condensed:
+                cur_file, cur_sel, cur_col, cur_bg_col, cur_val = rule
+                if file == cur_file and sel == cur_sel:
+                    # add the property that is missing (if it is missing)
+                    print("It's time to work.")
+    return condensed
+
+
+def get_bg_or_color(prop):
+    declaration = {"type": {}, "declaration": {}}
+    if prop == "color":
+        declaration["type"] = "color"
+        declaration["declaration"] = {"color": prop}
+    if "background" in prop:
+        declaration["type"] = "background"
+        declaration["declaration"] = {"background": prop}
+    return declaration
+
+
 if __name__ == "__main__":
     insane_gradient = """
     -moz-radial-gradient(0% 200%, ellipse cover,