From 232b67d27fdb5dad70ae96c757da3e54f7a7003b Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 16:18:53 +1100
Subject: [PATCH 01/11] Add a stars test

---
 test/test_stars.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 test/test_stars.py

diff --git a/test/test_stars.py b/test/test_stars.py
new file mode 100644
index 0000000..e78b393
--- /dev/null
+++ b/test/test_stars.py
@@ -0,0 +1,39 @@
+from click.testing import CliRunner
+from pathlib import Path
+from PIL import Image, ImageDraw
+
+from ih.cli import main
+from ih.palette import get_palette
+from ih import helpers
+
+
+from test_cli import runner, TEST_OUTPUT
+
+s = 1 #square
+length = 8
+stars_image = "stars_image.png"
+
+def test_stars():
+
+    stars = len(helpers.STARS)
+    w = length + 1
+    h = int(stars/length) + 1
+
+    img = Image.new('RGB', (w, h))
+    draw = ImageDraw.Draw(img)
+
+    # Draw palette from file
+    palette = [tuple(x['rgb']) for x in get_palette("floss")][:(w*h)]
+
+    ct = 0
+    for i in range(0, w):
+        for j in range(0, h):
+            c = palette[ct] #(0, int(255/length * i), int(255/(stars/length) * j))
+            ct += 1
+            draw.polygon([(i,j),(i+s, j), (i, j+s), (i+s, j+s)], fill=c)
+
+    path = Path(TEST_OUTPUT).parent.joinpath("images").joinpath(stars_image)
+    img.save(path)
+    runner(["-p", "floss", "-c", 256], image=str(path))
+
+

From b5bd8060980ad06eea524abce7449e92e80d15ab Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 16:19:14 +1100
Subject: [PATCH 02/11] output stem image name

---
 ih/chart.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ih/chart.py b/ih/chart.py
index bdd90a4..68ef455 100644
--- a/ih/chart.py
+++ b/ih/chart.py
@@ -1,6 +1,7 @@
 import json
 import click
 from textwrap import dedent
+from pathlib import Path
 
 import os
 from tabulate import tabulate
@@ -32,9 +33,14 @@
 def debug_data(image_name, scale, colors, palette_name, chartimage, fileformat="html"):
     import pkg_resources
 
+    # format to a nice name
+    if hasattr(image_name, "name"):
+        image_name = image_name.name
+    name = Path(image_name).name
+
     ih_version = pkg_resources.require("ih")[0].version
     data = [
-        f"Image: {image_name}",
+        f"Image: {name}",
         f"Scale: {scale}x",
         f"Image size: {chartimage.height} x {chartimage.width}",
         f"Palette: {palette_name}",

From 51c6a9ccdc037ca55faa5d9e5ea2434f25339187 Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 16:19:51 +1100
Subject: [PATCH 03/11] output colours used, as well as colour param

---
 ih/chart.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ih/chart.py b/ih/chart.py
index 68ef455..1d2ff75 100644
--- a/ih/chart.py
+++ b/ih/chart.py
@@ -30,7 +30,7 @@
 GUIDECOL = (0, 0, 0, 0)
 
 
-def debug_data(image_name, scale, colors, palette_name, chartimage, fileformat="html"):
+def debug_data(image_name, scale, colors, palette_name, chartimage, colorsused, fileformat="html"):
     import pkg_resources
 
     # format to a nice name
@@ -44,7 +44,7 @@ def debug_data(image_name, scale, colors, palette_name, chartimage, fileformat="
         f"Scale: {scale}x",
         f"Image size: {chartimage.height} x {chartimage.width}",
         f"Palette: {palette_name}",
-        f"Colors: {colors}",
+        f"Colors used: {colorsused} (of possible {colors})",
         f"ih version: {ih_version}",
     ]
     if fileformat == "html":
@@ -360,6 +360,7 @@ def chart(
         palette_name=palette_name,
         chartimage=chartimage,
         fileformat=fileformat,
+        colorsused=len(sorted(chartimage.getcolors())),
     )
 
     if fileformat == "html":

From adc5372607ebb1c1e174102a25be84d755c19f4a Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 16:26:40 +1100
Subject: [PATCH 04/11] Fix starclasses to be unique on col

Fixes issue where charts above len(STARS) unique colours would have duplicate listings in legend
---
 ih/chart.py   |  4 ++--
 ih/helpers.py | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ih/chart.py b/ih/chart.py
index 1d2ff75..0a39e86 100644
--- a/ih/chart.py
+++ b/ih/chart.py
@@ -91,7 +91,7 @@ def get_legend(chartimage):
         rgb = x[1]
         h = helpers.rgb2hex(rgb)
         star = STARS[idx % len(STARS)]
-        sclass = helpers.star_class(star)
+        sclass = helpers.col_class(h)
 
         # Choose the best text colour
         if (rgb[0] * 0.299 + rgb[1] * 0.587 + rgb[2] * 0.114) > 186:
@@ -156,7 +156,7 @@ def generate_html_chart(
     if not render:
         html.append(
             '.%s::after { content: "%s" }'
-            % (helpers.star_class(helpers.WHITESTAR), helpers.WHITESTAR)
+            % (helpers.col_class(helpers.WHITECOL), helpers.WHITESTAR)
         )
 
     html.append("</style>")
diff --git a/ih/helpers.py b/ih/helpers.py
index 452333b..80e0137 100644
--- a/ih/helpers.py
+++ b/ih/helpers.py
@@ -36,6 +36,7 @@
 ]
 
 WHITESTAR = "·"
+WHITECOL = "#ffffff"
 
 
 def rgb2hex(pix):
@@ -66,10 +67,10 @@ def color_cell(
     else:
         td = "span"
 
-    if color == "#ffffff":
+    if color == WHITECOL: 
         star = WHITESTAR
 
-    classes = f"s {star_class(star)}"
+    classes = f"s {col_class(color)}"
     if center:
         classes += " center"
     if guide[1]:
@@ -80,8 +81,11 @@ def color_cell(
     return f'<{td} class="{classes}"></{td}>'
 
 
-def star_class(star):
-    return f"u{hex(ord(star))[2:]}"
+#def star_class(star):
+#     return f"u{hex(ord(star))[2:]}"
+
+def col_class(col):
+     return f"u-{col[1:].lower()}"
 
 
 def base_path(path):

From 6312325516271699faee9d01a32aaa20627779b9 Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 16:37:25 +1100
Subject: [PATCH 05/11] ensure completely valid html (self-closed singletons)

---
 ih/chart.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ih/chart.py b/ih/chart.py
index 0a39e86..d33b9f3 100644
--- a/ih/chart.py
+++ b/ih/chart.py
@@ -48,7 +48,7 @@ def debug_data(image_name, scale, colors, palette_name, chartimage, colorsused,
         f"ih version: {ih_version}",
     ]
     if fileformat == "html":
-        return f'<div class="debug">' + "<br>".join(data) + "</div>"
+        return f'<div class="debug">' + "<br />".join(data) + "</div>"
     else:
         return "\n".join(data)
 
@@ -114,7 +114,7 @@ def generate_html_chart(
     data="",
 ):
 
-    html = ['<html><meta charset="UTF-8">']
+    html = ['<html><meta charset="UTF-8" />']
 
     with open(helpers.base_path("styling").joinpath("styling.css")) as s:
         html.append("<style>")

From f0022dbdc259632586c5507f779714155e50d63b Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 17:17:58 +1100
Subject: [PATCH 06/11] Rename file

---
 test/test_html.py  | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 test/test_stars.py | 39 --------------------------
 2 files changed, 68 insertions(+), 39 deletions(-)
 create mode 100644 test/test_html.py
 delete mode 100644 test/test_stars.py

diff --git a/test/test_html.py b/test/test_html.py
new file mode 100644
index 0000000..c9d4786
--- /dev/null
+++ b/test/test_html.py
@@ -0,0 +1,68 @@
+from click.testing import CliRunner
+from pathlib import Path
+from PIL import Image, ImageDraw
+from bs4 import BeautifulSoup as bs
+
+from ih.cli import main
+from ih.palette import get_palette
+from ih import helpers
+
+
+from test_cli import runner, TEST_OUTPUT
+
+s = 1 #square
+length = 8
+stars_image = "stars_image.png"
+
+def test_stars():
+    # Build a unique image, with enough colours to use all stars and then some
+    stars = len(helpers.STARS)
+    w = length + 1
+    h = int(stars/length) + 1
+
+    img = Image.new('RGB', (w, h))
+    draw = ImageDraw.Draw(img)
+
+    # Draw palette from file
+    palette = [tuple(x['rgb']) for x in get_palette("floss")][:(w*h)]
+
+    ct = 0
+    for i in range(0, w):
+        for j in range(0, h):
+            c = palette[ct] 
+            # Random color
+            # c = (0, int(255/length * i), int(255/(stars/length) * j))
+            ct += 1
+            draw.polygon([(i,j),(i+s, j), (i, j+s), (i+s, j+s)], fill=c)
+
+    path = Path(TEST_OUTPUT).parent.joinpath("images").joinpath(stars_image)
+    img.save(path)
+
+    # Generate Chart
+    output = runner(["-p", "floss", "-c", 256], image=str(path))
+
+    # Parse HTML into beautifulsoup
+    html = Path(TEST_OUTPUT).joinpath(output)
+    with open(html) as f:
+        soup = bs(f, "html.parser")
+
+    # Pull legend from HTML
+    rows = soup.find("table", {"class": "legend"}).find_all("tr")
+
+    # Can't compare Tags, so cast and sort
+    def stringy(l):
+        return sorted([str(x) for x in l])
+
+    # Assert all rows in legend unique
+    assert stringy(rows) == stringy(list(set(rows)))
+
+    # Assert all elements in star column are unique
+    stars = [ x.find('td') for x in rows ]
+    assert stringy(stars) == stringy(list(set(stars)))
+
+    # Assert colour count matches expectations
+    starrows = len(rows) - 1 # remove header from counter
+    assert starrows == ct 
+
+    # Assert colour count matches shown
+    assert str(starrows) in soup.find("div", {"class": "debug"}).text
diff --git a/test/test_stars.py b/test/test_stars.py
deleted file mode 100644
index e78b393..0000000
--- a/test/test_stars.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from click.testing import CliRunner
-from pathlib import Path
-from PIL import Image, ImageDraw
-
-from ih.cli import main
-from ih.palette import get_palette
-from ih import helpers
-
-
-from test_cli import runner, TEST_OUTPUT
-
-s = 1 #square
-length = 8
-stars_image = "stars_image.png"
-
-def test_stars():
-
-    stars = len(helpers.STARS)
-    w = length + 1
-    h = int(stars/length) + 1
-
-    img = Image.new('RGB', (w, h))
-    draw = ImageDraw.Draw(img)
-
-    # Draw palette from file
-    palette = [tuple(x['rgb']) for x in get_palette("floss")][:(w*h)]
-
-    ct = 0
-    for i in range(0, w):
-        for j in range(0, h):
-            c = palette[ct] #(0, int(255/length * i), int(255/(stars/length) * j))
-            ct += 1
-            draw.polygon([(i,j),(i+s, j), (i, j+s), (i+s, j+s)], fill=c)
-
-    path = Path(TEST_OUTPUT).parent.joinpath("images").joinpath(stars_image)
-    img.save(path)
-    runner(["-p", "floss", "-c", 256], image=str(path))
-
-

From 64efdfcdfd31a34e9615b6da5ae625b7553e54f2 Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 17:18:25 +1100
Subject: [PATCH 07/11] Format nicename, add title

---
 ih/chart.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/ih/chart.py b/ih/chart.py
index d33b9f3..653283b 100644
--- a/ih/chart.py
+++ b/ih/chart.py
@@ -30,17 +30,19 @@
 GUIDECOL = (0, 0, 0, 0)
 
 
-def debug_data(image_name, scale, colors, palette_name, chartimage, colorsused, fileformat="html"):
-    import pkg_resources
-
-    # format to a nice name
+def nicename(image_name): 
     if hasattr(image_name, "name"):
         image_name = image_name.name
-    name = Path(image_name).name
+    return Path(image_name).name
+
+
+
+def debug_data(image_name, scale, colors, palette_name, chartimage, colorsused, fileformat="html"):
+    import pkg_resources
 
     ih_version = pkg_resources.require("ih")[0].version
     data = [
-        f"Image: {name}",
+        f"Image: {nicename(image_name)}",
         f"Scale: {scale}x",
         f"Image size: {chartimage.height} x {chartimage.width}",
         f"Palette: {palette_name}",
@@ -106,6 +108,7 @@ def get_legend(chartimage):
 
 
 def generate_html_chart(
+    image_name,
     chartimage,
     palette_name,
     pal,
@@ -114,7 +117,8 @@ def generate_html_chart(
     data="",
 ):
 
-    html = ['<html><meta charset="UTF-8" />']
+    html = [f'<html><meta charset="UTF-8" /><title>ih - {nicename(image_name)}</title>']
+    html.append('<link rel="icon" href="data:image/svg+xml,%3csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22%3e%3ctext y=%22.9em%22 font-size=%2290%22%3e%f0%9f%a7%b6%3c/text%3e%3c/svg%3e" />')
 
     with open(helpers.base_path("styling").joinpath("styling.css")) as s:
         html.append("<style>")
@@ -365,7 +369,8 @@ def chart(
 
     if fileformat == "html":
         chart = generate_html_chart(
-            chartimage,
+            image_name=image_name,
+            chartimage=chartimage,
             palette_name=palette_name,
             pal=pal,
             render=render,

From bb7b367761bb91dfaebb369c5716993039119972 Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 17:18:37 +1100
Subject: [PATCH 08/11] misc

---
 .gitignore            | 3 +++
 test/requirements.txt | 1 +
 test/test_cli.py      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 78a43c1..e7ef8c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ venv/*
 .egg*
 dist/*
 *.html
+
+test/images/stars_image.png
+test/output/*
diff --git a/test/requirements.txt b/test/requirements.txt
index ce2bd6b..74c49e4 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -1 +1,2 @@
 pytest-tldr
+beautifulsoup4
diff --git a/test/test_cli.py b/test/test_cli.py
index ba85809..037f3ab 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -26,6 +26,7 @@ def runner(args, print_output=False, image=TEST_PNG, output=None):
         print(result.output)
     assert result.exit_code == 0
     assert output in result.output
+    return output
 
 
 def test_image():

From a778a6dbc7569fc4615fc7638401babffce544a0 Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 17:20:04 +1100
Subject: [PATCH 09/11] try latest python only

---
 .github/workflows/test.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 32311cc..9f83572 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,8 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.8"
-          - "3.9"
+          - "3.x"
 
     steps:
     - uses: actions/checkout@v2

From 2a738bc2ef4110d5d30fce782c30f77f87f3e03b Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 17:28:23 +1100
Subject: [PATCH 10/11] Force VS-15 to make all symbols text version

(should) fix issue where some devices (e.g. android) display emoji symbols on occasion
---
 ih/chart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ih/chart.py b/ih/chart.py
index 653283b..967bb71 100644
--- a/ih/chart.py
+++ b/ih/chart.py
@@ -155,7 +155,7 @@ def generate_html_chart(
 
         html.append(".%s { background-color: %s; color: %s }" % (x, y["bg"], y["c"]))
         if not render:
-            html.append('.%s::after { content: "%s" }' % (x, y["star"]))
+            html.append('.%s::after { content: "%s\ufe0e" }' % (x, y["star"]))
 
     if not render:
         html.append(

From 6c74332e0abfaafc5f515837b81a4209d307a4fe Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Sun, 14 Mar 2021 17:48:23 +1100
Subject: [PATCH 11/11] STAR CHANGE - remove math, add puncutation

attempts to fix issues where symbols don't appear in percy
---
 ih/helpers.py     | 10 +++++++---
 test/test_html.py |  2 --
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ih/helpers.py b/ih/helpers.py
index 80e0137..41be478 100644
--- a/ih/helpers.py
+++ b/ih/helpers.py
@@ -12,8 +12,6 @@
     "◀",
     "♠",
     "✿",
-    "⟘",
-    "⟒",
     "⚉",
     "♣",
     "▷",
@@ -27,12 +25,18 @@
     "❤",
     "⟙",
     "✾",
-    "∀",
     "⊕",
     "♥",
     "⇨",
     "⚇",
     "◼",
+    "⁋",
+    "⬣",
+    "^",
+    "&",
+    "=",
+    "|",
+    "#",
 ]
 
 WHITESTAR = "·"
diff --git a/test/test_html.py b/test/test_html.py
index c9d4786..b542540 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -30,8 +30,6 @@ def test_stars():
     for i in range(0, w):
         for j in range(0, h):
             c = palette[ct] 
-            # Random color
-            # c = (0, int(255/length * i), int(255/(stars/length) * j))
             ct += 1
             draw.polygon([(i,j),(i+s, j), (i, j+s), (i+s, j+s)], fill=c)