colorize 0.5.7 → 0.5.8

data/CHANGELOG.rdoc

@@ -1,4 +1,8 @@
-== 0.5.7 / 2000-11-24
+== 0.5.8 / 2009-12-02
+  * code cleanups
+  * removed 'ruby -w' warnings
+
+== 0.5.7 / 2009-11-24
   * moved to github/gemcutter
   * 1.9 compatibile
 

data/README.rdoc

@@ -19,13 +19,13 @@ Ruby string class extension. It add some methods to set color, background color
   puts "This is blue".colorize( :blue )
   puts "This is light blue".colorize( :light_blue )
   puts "This is also blue".colorize( :color => :blue )
-  puts "This is blue with red background".colorize( :color => :light_blue, :background => :red )
-  puts "This is blue with red background".colorize( :light_blue ).colorize( :background => :red )
+  puts "This is light blue with red background".colorize( :color => :light_blue, :background => :red )
+  puts "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red )
   puts "This is blue text on red".blue.on_red
   puts "This is red on blue".colorize( :red ).on_blue
-  puts "This is uncolorized".blue.on_red.uncolorize
   puts "This is red on blue and underline".colorize( :red ).on_blue.underline
   puts "This is blue text on red".blue.on_red.blink
+  puts "This is uncolorized".blue.on_red.uncolorize
 
   Class methods:
 

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/colorize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{colorize}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["fazibear"]
-  s.date = %q{2009-11-24}
+  s.date = %q{2009-12-02}
   s.description = %q{Ruby string class extension. It add some methods to set color, background color and text effect on console easier. Uses ANSI escape sequences.}
   s.email = %q{fazibear@gmail.com}
   s.extra_rdoc_files = [

data/lib/colorize.rb

@@ -55,7 +55,7 @@ class String
       nil
     end
   end
-
+  
   public
 
   #
@@ -66,21 +66,21 @@ class String
   #   puts "This is blue".colorize( :blue )
   #   puts "This is light blue".colorize( :light_blue )
   #   puts "This is also blue".colorize( :color => :blue )
-  #   puts "This is blue with red background".colorize( :color => :light_blue, :background => :red )
-  #   puts "This is blue with red background".colorize( :light_blue ).colorize( :background => :red )
+  #   puts "This is light blue with red background".colorize( :color => :light_blue, :background => :red )
+  #   puts "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red )
   #   puts "This is blue text on red".blue.on_red
   #   puts "This is red on blue".colorize( :red ).on_blue
   #   puts "This is red on blue and underline".colorize( :red ).on_blue.underline
   #   puts "This is blue text on red".blue.on_red.blink
+  #   puts "This is uncolorized".blue.on_red.uncolorize
   #
   def colorize( params )
-    
     return self unless STDOUT.isatty
     
     begin
-        require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
+      require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
     rescue LoadError
-        raise 'You must gem install win32console to use color on Windows'
+      raise 'You must gem install win32console to use colorize on Windows'
     end
     
     color_parameters = {}
@@ -93,58 +93,58 @@ class String
       color_parameters[:color] = COLORS[params]
     end
     
-    color_parameters[:color] ||= @color || 9
-    color_parameters[:background] ||= @background || 9
-    color_parameters[:mode] ||= @mode || 0
+    color_parameters[:color] ||= @color ||= COLORS[:default]
+    color_parameters[:background] ||= @background ||= COLORS[:default]
+    color_parameters[:mode] ||= @mode ||= MODES[:default]
 
-    color_parameters[:uncolorized] ||= @uncolorized || self.dup
+    color_parameters[:uncolorized] ||= @uncolorized ||= self.dup
    
     # calculate bright mode
     color_parameters[:color] += 50 if color_parameters[:color] > 10
 
     color_parameters[:background] += 50 if color_parameters[:background] > 10
 
-    return "\033[#{color_parameters[:mode]};#{color_parameters[:color]+30};#{color_parameters[:background]+40}m#{color_parameters[:uncolorized]}\033[0m".set_color_parameters( color_parameters )
+    "\033[#{color_parameters[:mode]};#{color_parameters[:color]+30};#{color_parameters[:background]+40}m#{color_parameters[:uncolorized]}\033[0m".set_color_parameters( color_parameters )
   end
 
-  
   #
   # Return uncolorized string
   #
   def uncolorize
-    return @uncolorized || self
+    @uncolorized || self
   end
   
   #
   # Return true if sting is colorized
   #
   def colorized?
-    return !@uncolorized.nil?
+    !defined?(@uncolorized).nil?
   end
 
   #
   # Make some color and on_color methods
   #
   COLORS.each_key do | key |
-    eval <<-"end_eval"
-      def #{key.to_s}
-        return self.colorize( :color => :#{key.to_s} )
-      end
-      def on_#{key.to_s}
-        return self.colorize( :background => :#{key.to_s} )
-      end
-    end_eval
+    next if key == :default
+
+    define_method key do
+      self.colorize( :color => key )
+    end
+    
+    define_method "on_#{key}" do
+      self.colorize( :background => key )
+    end
   end
 
   #
   # Methods for modes
   #
   MODES.each_key do | key |
-    eval <<-"end_eval"
-      def #{key.to_s}
-        return self.colorize( :mode => :#{key.to_s} )
-      end
-    end_eval
+    next if key == :default
+    
+    define_method key do
+      self.colorize( :mode => key )
+    end
   end
 
   class << self
@@ -185,7 +185,7 @@ class String
       String.colors.reverse.each_with_index do | back, index |
         puts "#{"|".rjust(txt.length)*(size-index)} < #{back}"
       end 
+      ""
     end
   end
-  puts
 end

data/test/test_colorize.rb

@@ -1,11 +1,49 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestColorize < Test::Unit::TestCase
+  def test_blue_symbol
+    assert "This is blue".colorize(:blue) == "\e[0;34;49mThis is blue\e[0m"
+  end
+
+  def test_blue_hash
+    assert "This is also blue".colorize( :color => :blue) == "\e[0;34;49mThis is also blue\e[0m"
+  end
+
+  def test_light_blue_symbol
+    assert "This is light blue".colorize(:light_blue) == "\e[0;94;49mThis is light blue\e[0m"
+  end
+
+  def test_light_blue_with_red_background_hash
+    assert "This is light blue with red background".colorize( :color => :light_blue, :background => :red ) == "\e[0;94;41mThis is light blue with red background\e[0m"
+  end
+ 
+  def test_light_blue_with_red_background_symbol_and_hash
+    assert "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red ) == "\e[0;144;41mThis is light blue with red background\e[0m"
+  end
+ 
+  def test_blue_with_red_background_method
+    assert "This is blue text on red".blue.on_red == "\e[0;34;41mThis is blue text on red\e[0m"
+  end
+
+  def test_red_with_blue_background_symbol_and_method
+    assert "This is red on blue".colorize( :red ).on_blue == "\e[0;31;44mThis is red on blue\e[0m"
+  end
+
+  def test_red_with_blue_background_and_underline_sumbol_and_methods
+   assert "This is red on blue and underline".colorize( :red ).on_blue.underline == "\e[4;31;44mThis is red on blue and underline\e[0m"
+  end
+
+  def test_blue_with_red_background_and_blink_methods
+    assert "This is blue text on red".blue.on_red.blink == "\e[5;34;41mThis is blue text on red\e[0m"
+  end
 
-  def setup
+  def test_uncolorize
+    assert "This is uncolorized".blue.on_red.uncolorize == "This is uncolorized"
   end
-  
-  def test_truth
-    assert true
+
+  def test_colorized?
+    assert "Red".red.colorized? == true
+    assert "Blue".colorized? == false
+    assert "Green".blue.green.uncolorize.colorized? == false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: colorize
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - fazibear
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +01:00
+date: 2009-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: []