Merge pull request #531 from essentialkaos/develop

Version 13.15.2
essentialkaos · Dec 16, 2024 · 64709c4 · 64709c4
2 parents bc4546d + 741ae6c
commit 64709c4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/.github/images/card.svg b/.github/images/card.svg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## Changelog
 
-### [13.15.0](https://kaos.sh/ek/13.15.1)
+### [13.15.2](https://kaos.sh/ek/13.15.2)
+
+- `[color]` Improved named colors support
+
+### [13.15.1](https://kaos.sh/ek/13.15.1)
 
 - `[options]` Added method `Argument.Uint64`
 - `[options]` Return type of method `Argument.Uint` set from `uint64` to `uint`

diff --git a/color/color.go b/color/color.go
@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"math"
 	"strconv"
+	"strings"
 
 	"github.com/essentialkaos/ek/v13/mathutil"
 )
@@ -59,8 +60,8 @@ type HSL struct {
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
-// colors is colors keywords
-var colors = map[string]uint32{
+// named is a map of named colors
+var named = map[string]uint32{
 	"aliceblue":            0xf0f8ff,
 	"antiquewhite":         0xfaebd7,
 	"aqua":                 0x00ffff,
@@ -416,8 +417,8 @@ func (c HSL) GoString() string {
 
 // Parse parses color
 func Parse(c string) (Hex, error) {
-	if colors[c] != 0 {
-		return Hex{v: colors[c]}, nil
+	if named[strings.ToLower(c)] != 0 {
+		return Hex{v: named[strings.ToLower(c)]}, nil
 	}
 
 	if c != "" && c[0] == '#' {

diff --git a/color/color_test.go b/color/color_test.go
@@ -28,7 +28,7 @@ var _ = Suite(&ColorSuite{})
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 func (s *ColorSuite) TestParse(c *C) {
-	color, err := Parse("violet")
+	color, err := Parse("vIOlEt")
 	c.Assert(err, IsNil)
 	c.Assert(color.v, Equals, uint32(0xEE82EE))
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/essentialkaos/check v1.4.1
 	github.com/essentialkaos/depsy v1.3.1
 	github.com/essentialkaos/go-linenoise/v3 v3.6.1
-	golang.org/x/crypto v0.30.0
+	golang.org/x/crypto v0.31.0
 	golang.org/x/sys v0.28.0
 )
 

diff --git a/go.sum b/go.sum
@@ -13,7 +13,7 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
diff --git a/version.go b/version.go
@@ -8,4 +8,4 @@ package ek
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // VERSION is current ek package version
-const VERSION = "13.15.1"
+const VERSION = "13.15.2"