From 6a2b428a7f194fefede7c7b0bdf6458c9a79aacf Mon Sep 17 00:00:00 2001
From: Boris Kubiak <kubiakboris@gmail.com>
Date: Sat, 22 Feb 2020 16:33:54 +0100
Subject: [PATCH] Add tests and refactor stuff

---
 card.js              | 22 +++++++++++-----------
 package.json         |  2 +-
 test/render-tests.js | 10 +++++++++-
 test/unit-tests.js   |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/card.js b/card.js
index db42da7..6dc3ace 100644
--- a/card.js
+++ b/card.js
@@ -141,15 +141,15 @@ class RGBLightCard extends HTMLElement {
             return color['color_name'];
         }
         if (color['color_temp'] || color['kelvin']) {
-            // https://git.io/JvRKs
-            let temp = parseInt(color['color_temp'], 10) || 1000000 / parseInt(color['kelvin'], 10);
-            temp = Math.max(154, Math.min(500, temp));
-            const lin = (tr, cr, val) => cr.map(c => ((val - tr[0]) * (c[1] - c[0])) / (tr[1] - tr[0]) + c[0]);
+            let mireds = parseInt(color['color_temp'], 10) || Math.round(1000000 / parseInt(color['kelvin'], 10));
+            mireds = Math.max(154, Math.min(500, mireds));
             const center = (500 + 154) / 2;
-            const miredRange = temp < center ? [154, center] : [center, 500]; // https://git.io/JvRKR
-            // prettier-ignore
-            const rgbRange = temp < center ? [[166, 255], [209, 255], [255, 255]] : [[255, 255], [255, 160], [255, 0]];
-            return `rgb(${lin(miredRange, rgbRange, temp).join(',')})`;
+            const cr = [[166, 209, 255], [255, 255, 255], [255, 160, 0]].slice(mireds < center ? 0 : 1); // prettier-ignore
+            const tr = [154, center, 500].slice(mireds < center ? 0 : 1); // Defined here: https://git.io/JvRKR
+            return `rgb(${[0, 1, 2]
+                .map(i => ((mireds - tr[0]) * (cr[1][i] - cr[0][i])) / (tr[1] - tr[0]) + cr[0][i])
+                .map(Math.round)
+                .join(',')})`;
         }
         if (Array.isArray(color['rgb_color']) && color['rgb_color'].length === 3) {
             return `rgb(${color['rgb_color'].join(',')})`;
@@ -176,8 +176,8 @@ class RGBLightCard extends HTMLElement {
 customElements.define('rgb-light-card', RGBLightCard);
 
 console.info(
-    '\n %c RGB Light Card %c v1.4.1 %c \n',
-    'background-color: #555;color: #fff;padding: 4px 2px 4px 4px;border-radius: 3px 0 0 3px;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)',
-    'background-color: #bc81e0;background-image: linear-gradient(90deg, #b65cff, #11cbfa);color: #fff;padding: 4px 4px 4px 2px;border-radius: 0 3px 3px 0;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)',
+    '\n %c RGB Light Card %c v1.5.0 %c \n',
+    'background-color: #555;color: #fff;padding: 3px 2px 3px 3px;border-radius: 3px 0 0 3px;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)',
+    'background-color: #bc81e0;background-image: linear-gradient(90deg, #b65cff, #11cbfa);color: #fff;padding: 3px 3px 3px 2px;border-radius: 0 3px 3px 0;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)',
     'background-color: transparent'
 );
diff --git a/package.json b/package.json
index adadc41..7521cb5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "rgb-light-card",
     "description": "A Lovelace custom card for RGB lights",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "author": "Boris K",
     "bugs": "https://github.com/bokub/rgb-light-card/issues",
     "devDependencies": {
diff --git a/test/render-tests.js b/test/render-tests.js
index d7270d9..b06f9d4 100644
--- a/test/render-tests.js
+++ b/test/render-tests.js
@@ -20,6 +20,10 @@ colors:
   entity_id: script.night_mode
 - hs_color: [60, 30]
   icon_color: "#fff000"
+- color_temp: 100
+- color_temp: 540
+- color_temp: 360
+- kelvin: 4000
 `,
         result:
             '<style> .wrapper { justify-content: flex-start; margin-bottom: -4px; } .color-circle { width: 32px; height: 32px; margin: 4px 8px 8px; } </style>' +
@@ -28,7 +32,11 @@ colors:
             '<div class="color-circle" style="background: turquoise;"></div>' +
             '<div class="color-circle" style="background: rgb(127, 132, 142);"></div>' +
             '<div class="color-circle" style="background: rgb(127, 132, 142);"></div>' +
-            '<div class="color-circle" style="background: rgb(255, 240, 0);"></div>'
+            '<div class="color-circle" style="background: rgb(255, 240, 0);"></div>' +
+            '<div class="color-circle" style="background: rgb(166, 209, 255);"></div>' +
+            '<div class="color-circle" style="background: rgb(255, 160, 0);"></div>' +
+            '<div class="color-circle" style="background: rgb(255, 237, 206);"></div>' +
+            '<div class="color-circle" style="background: rgb(215, 235, 255);"></div>'
     },
     {
         name: 'Test justify and size options',
diff --git a/test/unit-tests.js b/test/unit-tests.js
index 8940d5c..cbbe6bf 100644
--- a/test/unit-tests.js
+++ b/test/unit-tests.js
@@ -92,7 +92,7 @@ test('Clicking the icons call the right function', t => {
     });
 });
 
-test("Changing HASS creates the card, but doesn't updated it", t => {
+test("Changing HASS creates the card, but doesn't update it", t => {
     const card = new RGBLightCard();
     delete card.content;
     t.falsy(card.content);