term-ansicolor 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6c9a92f957cb6c294806caa9b03a2c04445d76a9
-  data.tar.gz: 5eac0662983ec23f174bd5d0af4687120fd49cb9
-SHA512:
-  metadata.gz: e633cda3e9d3b749c7c3a5282012e0f9f0bda78c1674c8de081461b4df16719e7916191c4d7bb57eefa0817c13c7bafc6557a303fdcab8c635c7c786f8598663
-  data.tar.gz: ec810aa236b5ff82b942de368b30f262b82189423afb3abcbc1ade2f6f3673794b29564799008fbf4b2d753f6fe02c20534dff3b530155240f9e52f7b9e55263
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWQ4Yjg1MjdjMDU0NWRiYjAwZmNlOTZmMjRmMWY3NDhjZjA1ODI2MQ==
+  data.tar.gz: !binary |-
+    MGRkYzFmZGQzOTRkMDY0OGQwNjYwZTFhYjZkYWE3MjEyNDE2MTA0Mw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MjU3MmI1YjhhN2NkZjRlNjJmOGY0MWU5NTJhYzZhNjJkYTQwNjdiYTY4NTVj
+    YzM4MzUzZmRmMjI0MjE0YTEzNWI3NjIwOGYwN2UxZTNiNTk3NGY1ODU3ODU0
+    MDllNTdjOWYyNjBjZmExNGYwNmU3ZmJjYWUwNDRmZGQ1OGI4NjM=
+  data.tar.gz: !binary |-
+    ZTc2NDEwODcxNmFiY2M3NTNjOThlMjZhMGFhZTNiMDc3NmNhZWJmMGQ3MmI4
+    MDRiNDI2MWE4MjdkMzU2MjczZTY3OTMwYzUxMGRlYmFiNWE1MjZjYzg1YmVh
+    NDNhMWU2ZTUxYzEwZjM2YmExMjJhNjhiMDhmNGNhMmQ1MWJjZGE=

data/CHANGES

@@ -1,3 +1,6 @@
+2013-03-26 - 1.1.3 * Fix a bug where respond_to could overflow the stack.
+                   * Easier access to color attributes via color(123) or
+                     approximate html colors like color('#336caf').
 2013-03-25 - 1.1.2 * Change the API: color0 - color255 to color(:color0) -
                      color(:color255), and on_color0 to on_color(:color0) -
                      on_color(:color255); the previous way caused some

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/colortab

@@ -6,10 +6,8 @@ class String
   include Term::ANSIColor
 end
 
-$colors = Term::ANSIColor::Attribute.rgb_colors.to_a
-
 def print_color(c)
-  color = $colors[c]
+  color = Term::ANSIColor::Attribute[c]
   text = [
     Term::ANSIColor::Attribute.nearest_rgb_color('#000'),
     Term::ANSIColor::Attribute.nearest_rgb_color('#fff'),

data/lib/term/ansicolor.rb

@@ -161,14 +161,6 @@ module Term
        create_color_method(attribute.name, attribute.code)
     end
 
-    module RespondTo
-      def respond_to?(symbol, include_all = false)
-        term_ansicolor_attributes.include?(symbol) or super
-      end
-    end
-    include RespondTo
-    extend RespondTo
-
     # Regular expression that is used to scan for ANSI-Attributes while
     # uncoloring strings.
     COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9]|[34]8;5;\d{1,3})?m/
@@ -193,8 +185,12 @@ module Term
     # color +name+. If string isn't a string only the escape sequence to switch
     # on the color +name+ is returned.
     def color(name, string = nil, &block)
-      attribute = Attribute.get(name) || Attribute.nearest_rgb(name) or
-        raise ArgumentError, "unknown attribute #{name.inspect}"
+      attribute = Attribute.get(name)
+      attribute ||=
+        name.to_s =~ /\Aon_/ ?
+        Attribute.nearest_rgb_on_color(name) :
+        Attribute.nearest_rgb_color(name)
+      attribute or raise ArgumentError, "unknown attribute #{name.inspect}"
       result = ''
       result << "\e[#{attribute.code}m" if Term::ANSIColor.coloring?
       if block_given?
@@ -217,7 +213,7 @@ module Term
     class << self
       # Returns an array of all Term::ANSIColor attributes as symbols.
       def term_ansicolor_attributes
-        @term_ansicolor_attributes ||= Term::ANSIColor::ATTRIBUTE_NAMES
+        ::Term::ANSIColor::ATTRIBUTE_NAMES
       end
 
       alias attributes term_ansicolor_attributes

data/lib/term/ansicolor/attribute.rb

@@ -10,6 +10,16 @@ module Term
         result
       end
 
+      def self.[](name)
+        case
+        when self === name                              then name
+        when name.to_s =~ /\A(on_)?(\d+)\z/             then get "#$1color#$2"
+        when name.to_s =~ /\A#([0-9a-f]{3}){1,2}\z/i    then nearest_rgb_color name
+        when name.to_s =~ /\Aon_#([0-9a-f]{3}){1,2}\z/i then nearest_rgb_on_color name
+        else                                            get name
+        end
+      end
+
       def self.get(name)
         @__store__[name.to_sym]
       end
@@ -76,6 +86,8 @@ module Term
           other_rgb = other.to_rgb_triple
         then
           our_rgb.distance_to other_rgb
+        else
+          1 / 0.0
         end
       end
     end

data/lib/term/ansicolor/rgb_triple.rb

@@ -36,7 +36,7 @@ module Term
         case
         when thing.respond_to?(:to_rgb_triple) then thing
         when thing.respond_to?(:to_ary)        then RGBTriple.from_array(thing.to_ary)
-        when thing.respond_to?(:to_str)        then RGBTriple.from_html(thing.to_str)
+        when thing.respond_to?(:to_str)        then RGBTriple.from_html(thing.to_str.sub(/\Aon_/, '')) # XXX somewhat hacky
         when thing.respond_to?(:to_hash)       then RGBTriple.from_hash(thing.to_hash)
         else raise ArgumentError, "cannot convert #{thing.inspect} into #{self}"
         end

data/lib/term/ansicolor/version.rb

@@ -1,6 +1,6 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.1.2'
+  VERSION         = '1.1.3'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/term-ansicolor.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor"
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
@@ -11,14 +11,14 @@ Gem::Specification.new do |s|
   s.email = "flori@ping.de"
   s.executables = ["cdiff", "decolor"]
   s.extra_rdoc_files = ["README.rdoc", "lib/term/ansicolor.rb", "lib/term/ansicolor/attribute.rb", "lib/term/ansicolor/rgb_triple.rb", "lib/term/ansicolor/version.rb"]
-  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "bin/cdiff", "bin/colortab", "bin/decolor", "examples/example.rb", "lib/term/ansicolor.rb", "lib/term/ansicolor/.keep", "lib/term/ansicolor/attribute.rb", "lib/term/ansicolor/rgb_triple.rb", "lib/term/ansicolor/version.rb", "term-ansicolor.gemspec", "tests/ansicolor_test.rb", "tests/rgb_triple_test.rb", "tests/test_helper.rb"]
+  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "bin/cdiff", "bin/colortab", "bin/decolor", "examples/example.rb", "lib/term/ansicolor.rb", "lib/term/ansicolor/.keep", "lib/term/ansicolor/attribute.rb", "lib/term/ansicolor/rgb_triple.rb", "lib/term/ansicolor/version.rb", "term-ansicolor.gemspec", "tests/ansicolor_test.rb", "tests/attribute_test.rb", "tests/rgb_triple_test.rb", "tests/test_helper.rb"]
   s.homepage = "http://flori.github.com/term-ansicolor"
   s.licenses = ["GPL-2"]
   s.rdoc_options = ["--title", "Term-ansicolor - Ruby library that colors strings using ANSI escape sequences", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubygems_version = "2.0.3"
   s.summary = "Ruby library that colors strings using ANSI escape sequences"
-  s.test_files = ["tests/ansicolor_test.rb", "tests/rgb_triple_test.rb", "tests/test_helper.rb"]
+  s.test_files = ["tests/ansicolor_test.rb", "tests/attribute_test.rb", "tests/rgb_triple_test.rb", "tests/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/tests/ansicolor_test.rb

@@ -102,6 +102,7 @@ class ANSIColorTest < Test::Unit::TestCase
       assert_not_equal foo, foo_colored = __send__(a) { foo }
       assert_equal foo, uncolor { foo_colored }
     end
+    assert_equal Term::ANSIColor.attributes, 'foo'.attributes
   end
 
   def test_coloring_string_like
@@ -115,14 +116,4 @@ class ANSIColorTest < Test::Unit::TestCase
     assert string.frozen?
     assert_equal red, string.red
   end
-
-  def test_nearest_rgb_color
-    assert_equal Term::ANSIColor::Attribute.get(:color0).rgb, Term::ANSIColor::Attribute.nearest_rgb_color('#000').rgb
-    assert_equal Term::ANSIColor::Attribute.get(:color15).rgb, Term::ANSIColor::Attribute.nearest_rgb_color('#ffffff').rgb
-  end
-
-  def test_nearest_rgb_color
-    assert_equal Term::ANSIColor::Attribute.get(:on_color0).rgb, Term::ANSIColor::Attribute.nearest_rgb_on_color('#000').rgb
-    assert_equal Term::ANSIColor::Attribute.get(:on_color15).rgb, Term::ANSIColor::Attribute.nearest_rgb_on_color('#ffffff').rgb
-  end
 end

data/tests/attribute_test.rb

@@ -0,0 +1,33 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class AttributeTest < Test::Unit::TestCase
+  include Term::ANSIColor
+
+  def test_cast
+    color = Attribute.get(:color123)
+    on_color = Attribute.get(:on_color123)
+    assert_equal color, Attribute[color]
+    assert_equal color, Attribute[:color123]
+    assert_equal color, Attribute[123]
+    assert_equal color, Attribute['123']
+    assert_equal color, Attribute['#87ffff']
+    assert_equal on_color, Attribute['on_123']
+    assert_equal on_color, Attribute['on_#87ffff']
+  end
+
+  def test_distance_to
+    assert_in_delta 149.685, Attribute.get(:color0).distance_to(Attribute.nearest_rgb_color('#0f0')), 1e-3
+    assert_equal 1 / 0.0, Attribute.get(:color0).distance_to(nil)
+  end
+
+  def test_nearest_rgb_color
+    assert_equal Attribute.get(:color0).rgb, Attribute.nearest_rgb_color('#000').rgb
+    assert_equal Attribute.get(:color15).rgb, Attribute.nearest_rgb_color('#ffffff').rgb
+  end
+
+  def test_nearest_rgb_on_color
+    assert_equal Attribute.get(:on_color0).rgb, Attribute.nearest_rgb_on_color('#000').rgb
+    assert_equal Attribute.get(:on_color15).rgb, Attribute.nearest_rgb_on_color('#ffffff').rgb
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: term-ansicolor
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Florian Frank
@@ -28,14 +28,14 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This library uses ANSI escape sequences to control the attributes of
@@ -71,6 +71,7 @@ files:
 - lib/term/ansicolor/version.rb
 - term-ansicolor.gemspec
 - tests/ansicolor_test.rb
+- tests/attribute_test.rb
 - tests/rgb_triple_test.rb
 - tests/test_helper.rb
 homepage: http://flori.github.com/term-ansicolor
@@ -87,12 +88,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -103,5 +104,6 @@ specification_version: 4
 summary: Ruby library that colors strings using ANSI escape sequences
 test_files:
 - tests/ansicolor_test.rb
+- tests/attribute_test.rb
 - tests/rgb_triple_test.rb
 - tests/test_helper.rb