Improve Colorize

samples/2048.cr

@@ -3,24 +3,26 @@
 require "colorize"
 
 module Screen
+  alias Color = Colorize::ColorANSI
+
   TILES = {
-        0 => {:white, nil},
-        2 => {:black, :white},
-        4 => {:blue, :white},
-        8 => {:black, :yellow},
-       16 => {:white, :red},
-       32 => {:black, :red},
-       64 => {:white, :magenta},
-      128 => {:red, :yellow},
-      256 => {:magenta, :yellow},
-      512 => {:white, :yellow},
-     1024 => {:white, :yellow},
-     2048 => {:white, :yellow},
-     4096 => {:white, :black},
-     8192 => {:white, :black},
-    16384 => {:white, :black},
-    32768 => {:white, :black},
-    65536 => {:white, :black},
+        0 => {Color::White, nil},
+        2 => {Color::Black, Color::White},
+        4 => {Color::Blue, Color::White},
+        8 => {Color::Black, Color::Yellow},
+       16 => {Color::White, Color::Red},
+       32 => {Color::Black, Color::Red},
+       64 => {Color::White, Color::Magenta},
+      128 => {Color::Red, Color::Yellow},
+      256 => {Color::Magenta, Color::Yellow},
+      512 => {Color::White, Color::Yellow},
+     1024 => {Color::White, Color::Yellow},
+     2048 => {Color::White, Color::Yellow},
+     4096 => {Color::White, Color::Black},
+     8192 => {Color::White, Color::Black},
+    16384 => {Color::White, Color::Black},
+    32768 => {Color::White, Color::Black},
+    65536 => {Color::White, Color::Black},
   }
 
   def self.colorize_for(tile)

spec/std/colorize_spec.cr

@@ -1,8 +1,8 @@
 require "spec"
 require "colorize"
 
-private def colorize(obj, *args)
-  obj.colorize(*args).toggle(true)
+private def colorize(obj)
+  obj.colorize.toggle(true)
 end
 
 private def with_color_wrap(*args)
@@ -42,11 +42,11 @@ describe "colorize" do
   end
 
   it "colorizes foreground with 8-bit color" do
-    colorize("hello").fore(Colorize::Color256.new(123u8)).to_s.should eq("\e[38;5;123mhello\e[0m")
+    colorize("hello").fore(Colorize::Color256.new(123)).to_s.should eq("\e[38;5;123mhello\e[0m")
   end
 
   it "colorizes foreground with true color" do
-    colorize("hello").fore(Colorize::ColorRGB.new(12u8, 34u8, 56u8)).to_s.should eq("\e[38;2;12;34;56mhello\e[0m")
+    colorize("hello").fore(Colorize::ColorRGB.new(12, 34, 56)).to_s.should eq("\e[38;2;12;34;56mhello\e[0m")
   end
 
   it "colorizes background" do
@@ -69,16 +69,15 @@ describe "colorize" do
   end
 
   it "colorizes background with 8-bit color" do
-    colorize("hello").back(Colorize::Color256.new(123u8)).to_s.should eq("\e[48;5;123mhello\e[0m")
+    colorize("hello").back(Colorize::Color256.new(123)).to_s.should eq("\e[48;5;123mhello\e[0m")
   end
 
   it "colorizes background with true color" do
-    colorize("hello").back(Colorize::ColorRGB.new(12u8, 34u8, 56u8)).to_s.should eq("\e[48;2;12;34;56mhello\e[0m")
+    colorize("hello").back(Colorize::ColorRGB.new(12, 34, 56)).to_s.should eq("\e[48;2;12;34;56mhello\e[0m")
   end
 
   it "colorizes mode" do
     colorize("hello").bold.to_s.should eq("\e[1mhello\e[0m")
-    colorize("hello").bright.to_s.should eq("\e[1mhello\e[0m")
     colorize("hello").dim.to_s.should eq("\e[2mhello\e[0m")
     colorize("hello").underline.to_s.should eq("\e[4mhello\e[0m")
     colorize("hello").blink.to_s.should eq("\e[5mhello\e[0m")
@@ -99,34 +98,16 @@ describe "colorize" do
   end
 
   it "colorizes foreground with symbol" do
-    colorize("hello", :red).to_s.should eq("\e[31mhello\e[0m")
+    colorize("hello").fore(:red).to_s.should eq("\e[31mhello\e[0m")
     colorize("hello").fore(:red).to_s.should eq("\e[31mhello\e[0m")
   end
 
   it "colorizes mode with symbol" do
     colorize("hello").mode(:bold).to_s.should eq("\e[1mhello\e[0m")
   end
 
-  it "raises on unknown foreground color" do
-    expect_raises ArgumentError, "Unknown color: brown" do
-      colorize("hello", :brown)
-    end
-  end
-
-  it "raises on unknown background color" do
-    expect_raises ArgumentError, "Unknown color: brown" do
-      colorize("hello").back(:brown)
-    end
-  end
-
-  it "raises on unknown mode" do
-    expect_raises ArgumentError, "Unknown mode: bad" do
-      colorize("hello").mode(:bad)
-    end
-  end
-
   it "inspects" do
-    colorize("hello", :red).inspect.should eq("\e[31m\"hello\"\e[0m")
+    colorize("hello").fore(:red).inspect.should eq("\"\\e[31mhello\\e[0m\"")
   end
 
   it "colorizes with surround" do