rainbow 1.0.3 → 1.0.4

data/lib/rainbow.rb

@@ -1,7 +1,7 @@
 module Sickill
   module Rainbow
-    
-    TERM_COLORS = { 
+
+    TERM_COLORS = {
       :black => 0,
       :red => 1,
       :green => 2,
@@ -12,7 +12,7 @@ module Sickill
       :white => 7,
       :default => 9,
     }
-    
+
     TERM_EFFECTS = {
       :reset => 0,
       :bright => 1,
@@ -22,31 +22,29 @@ module Sickill
       :inverse => 7,
       :hide => 8,
     }
-    
-    # Sets foreground color if this text.
-    def foreground(color)
-      color = color.to_sym
-      validate_color(color)
-      wrap_with_code(TERM_COLORS[color] + 30)
+
+    # Sets foreground color of this text.
+    def foreground(*color)
+      color = color.first if color.size == 1
+      wrap_with_code(get_color_code(color, :foreground))
     end
     alias_method :color, :foreground
     alias_method :colour, :foreground
 
-    
+
     # Sets background color of this text.
-    def background(color)
-      color = color.to_sym
-      validate_color(color)
-      wrap_with_code(TERM_COLORS[color] + 40)
+    def background(*color)
+      color = color.first if color.size == 1
+      wrap_with_code(get_color_code(color, :background))
     end
-    
+
     # Resets terminal to default colors/backgrounds.
     #
     # It shouldn't be needed to use this method because all methods append terminal reset code to end of string.
     def reset
       wrap_with_code(TERM_EFFECTS[:reset])
     end
-    
+
     # Turns on bright/bold for this text.
     def bright
       wrap_with_code(TERM_EFFECTS[:bright])
@@ -56,7 +54,7 @@ module Sickill
     def italic
       wrap_with_code(TERM_EFFECTS[:italic])
     end
-    
+
     # Turns on underline decoration for this text.
     def underline
       wrap_with_code(TERM_EFFECTS[:underline])
@@ -85,7 +83,29 @@ module Sickill
       out.concat("\e[0m") unless out =~ /\e\[0m$/
       out
     end
-    
+
+    def get_color_code(color, type) #:nodoc:
+      case color
+      when Symbol
+        validate_color(color)
+        TERM_COLORS[color] + (type == :foreground ? 30 : 40)
+      when String
+        color = color.gsub("#", "")
+        r, g, b = color[0..1].to_i(16), color[2..3].to_i(16), color[4..5].to_i(16)
+        get_rgb_code(r, g, b, type)
+      when Array
+        raise ArgumentError.new("Bad number of arguments for RGB color definition, should be 3") unless color.size == 3
+        get_rgb_code(color[0], color[1], color[2], type)
+      end
+    end
+
+    def get_rgb_code(r, g, b, type) #:nodoc:
+      raise ArgumentError.new("RGB value outside 0-255 range") if [r, g, b].min < 0 || [r, g, b].max > 255
+      code = { :foreground => 38, :background => 48 }[type]
+      index = 16 + (6 * (r / 256.0)).to_i * 36 + (6 * (g / 256.0)).to_i * 6 + (6 * (b / 256.0)).to_i
+      "#{code};5;#{index}"
+    end
+
     def validate_color(color) #:nodoc:
       raise ArgumentError.new("Unknown color, valid colors: #{TERM_COLORS.keys.join(', ')}") unless TERM_COLORS.keys.include?(color)
     end

data/test/rainbow_test.rb

@@ -2,11 +2,15 @@ require 'test/unit'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/rainbow')
 
 class RainbowTest < Test::Unit::TestCase #:nodoc:
-  def test_color
+  def test_color_by_name
     assert_equal "\e[31mhello\e[0m", "hello".color(:red)
   end
   
-  def test_foreground
+  def test_color_by_rgb
+    assert_equal "\e[38;5;196mhello\e[0m", "hello".color(255, 0, 0)
+  end
+  
+  def test_foreground_alias
     assert_equal "hello".color(:red), "hello".foreground(:red)
   end
 
@@ -14,13 +18,53 @@ class RainbowTest < Test::Unit::TestCase #:nodoc:
     assert_equal "hello".color(:red), "hello".colour(:red)
   end
   
-  def test_background
+  def test_background_by_name
     assert_equal "\e[42mhello\e[0m", "hello".background(:green)
   end
 
+  def test_background_by_rgb
+    assert_equal "\e[48;5;46mhello\e[0m", "hello".background(0, 255, 0)
+  end
+
   def test_color_and_background
     assert_equal "\e[31m\e[42mhello\e[0m", "hello".color(:red).background(:green)
   end
+  
+  def test_hex_color
+    assert_equal "\e[48;5;46mhello\e[0m", "hello".background("#00FF00")
+    assert_equal "\e[48;5;46mhello\e[0m", "hello".background("00FF00")
+    assert_equal "\e[48;5;46mhello\e[0m", "hello".background("00ff00")
+  end
+
+  def test_bad_color_name
+    assert_raises ArgumentError do
+      "hello".background(:baaaad)
+    end
+  end
+
+  def test_rgb_color_with_2_args
+    assert_raises ArgumentError do
+      "hello".background(1, 2)
+    end
+  end
+
+  def test_rgb_color_with_4_args
+    assert_raises ArgumentError do
+      "hello".background(1, 2, 3, 4)
+    end
+  end
+
+  def test_rgb_color_with_values_below_zero
+    assert_raises ArgumentError do
+      "hello".background(-3, 2, 3)
+    end
+  end
+
+  def test_rgb_color_with_values_above_255
+    assert_raises ArgumentError do
+      "hello".background(256, 2, 3)
+    end
+  end
 
   def test_bright
     assert_equal "\e[1mhello\e[0m", "hello".bright

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rainbow
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Marcin Kulik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-26 00:00:00 +02:00
+date: 2009-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -50,8 +50,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: rainbow
-rubygems_version: 1.3.3
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rainbow extends ruby String class enabling coloring text on ANSI terminals