ansi_chameleon 0.0.2 → 0.1.0

data/Changelog

@@ -1,3 +1,7 @@
+0.1.0 (February 2, 2012)
+  Added support for xterm 256 colors.
+  Made minor code improvements.
+
 0.0.2 (January 30, 2012)
   Fixed a typo in the LICENSE file.
 

data/README.md

@@ -90,7 +90,7 @@ Tag names in a style sheet can be written as either :symbols or "strings".
 * `:foreground_color` (aliases: `:foreground`, `:fg_color`)
 * `:background_color` (aliases: `:background`, `:bg_color`)
 
-    Available color values: `:black`, `:red`, `:green`, `:yellow`, `:blue`, `:magenta`, `:cyan`, `:white`.
+    Available color values: `:black`, `:red`, `:green`, `:yellow`, `:blue`, `:magenta`, `:cyan`, `:white` and a number/string between 0 and 255 that represents a color in xterm 256 color scale.
 
 * `:effect`
 

data/lib/ansi_chameleon/sequence_generator.rb

@@ -1,32 +1,58 @@
 module AnsiChameleon
   module SequenceGenerator
 
-    class UnknownColorName  < ArgumentError; end
-    class UnknownEffectName < ArgumentError; end
+    class InvalidColorValueError  < ArgumentError; end
+    class InvalidEffectValueError < ArgumentError; end
 
     COLORS = [:black, :red, :green, :yellow, :blue, :magenta, :cyan, :white]
     EFFECTS = { :none => 0, :bright => 1, :underline => 4, :blink => 5, :reverse => 7 }
 
-    def self.effect_code(name)
-      EFFECTS[name.to_sym] or raise UnknownEffectName.new("Unknown effect name #{name.inspect}")
+    def self.generate(effect_value, foreground_color_value=nil, background_color_value=nil)
+      if effect_value.to_sym == :reset
+        "\033[0m"
+      else
+        "#{effect_sequence(effect_value)}#{foreground_color_sequence(foreground_color_value)}#{background_color_sequence(background_color_value)}"
+      end
     end
 
-    def self.foreground_color_code(name)
-      index = COLORS.index(name.to_sym) or raise UnknownColorName.new("Unknown foreground color name #{name.inspect}")
-      30 + index
+    def self.effect_sequence(value)
+      if EFFECTS.include?(value.to_sym)
+        "\033[#{EFFECTS[value.to_sym]}m"
+
+      else
+        raise InvalidEffectValueError.new("Invalid effect value #{value.inspect}")
+
+      end
     end
 
-    def self.background_color_code(name)
-      index = COLORS.index(name.to_sym) or raise UnknownColorName.new("Unknown background color name #{name.inspect}")
-      40 + index
+    def self.foreground_color_sequence(value)
+      if number_from_0_to_255?(value)
+        "\033[38;5;#{value}m"
+
+      elsif COLORS.include?(value.to_s.to_sym)
+        "\033[#{COLORS.index(value.to_sym) + 30}m"
+
+      else
+        raise InvalidColorValueError.new("Invalid foreground color value #{value.inspect}")
+
+      end
     end
 
-    def self.generate(effect_name, foreground_color_name=nil, background_color_name=nil)
-      if effect_name.to_sym == :reset
-        "\033[0m"
+    def self.background_color_sequence(value)
+      if number_from_0_to_255?(value)
+        "\033[48;5;#{value}m"
+
+      elsif COLORS.include?(value.to_s.to_sym)
+        "\033[#{COLORS.index(value.to_sym) + 40}m"
+
       else
-        "\033[#{effect_code(effect_name)};#{foreground_color_code(foreground_color_name)};#{background_color_code(background_color_name)}m"
+        raise InvalidColorValueError.new("Invalid background color value #{value.inspect}")
+
       end
     end
+
+    def self.number_from_0_to_255?(value)
+      value.to_s =~ /^\d+$/ && (0..255).member?(value.to_i)
+    end
   end
 end

data/lib/ansi_chameleon/version.rb

@@ -1,3 +1,3 @@
 module AnsiChameleon
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansi_chameleon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80598820 !ruby/object:Gem::Requirement
+  requirement: &79655270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *80598820
+  version_requirements: *79655270
 description: Colorizes text terminal output by converting custom HTML-like tags into
   color ANSI escape sequences.
 email: jacekmikrut.software@gmail.com