padrino-support 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc4d6db979b946264882e0875c6c03d2d44b2f0d
-  data.tar.gz: 971d5c0af718f7203519dda9d16d8051f1b3ae39
+  metadata.gz: ac0fd7870851b895d6688bbb53181a50dc53f4ed
+  data.tar.gz: 98f3982588c071db926a14429c855f0a698818f6
 SHA512:
-  metadata.gz: 368b385238ed28df21735451435432800a886e14e8e7b8cde6a01ed17723f2efd919033b241f9ef005f3a5bdff3798d46bf5404e949903dec2fbcd90145dca1a
-  data.tar.gz: f502084320954430461904de2fbcf68294390eb59c692e6e911c93d5c12aa444416019e9575bd822a26930060f14801bbb55a4926a085e9b50b9c5beec99e3fa
+  metadata.gz: a01e7516d21ce28df4f4575229e7da1351d3db13b8ec76ee1cb380668b39568c10765193bee2ef058d1b19d6d298ba8870fec61890242fa93664d695ba0fb7b1
+  data.tar.gz: 3e6ee99b72115ac4db88144b78fbadc4bafba796210abbeabfad4a7f971557852580c044e22c20b74898d301b81613e322d7538c28caf9beb8fb039e08e6850f

data/lib/padrino-support/core_ext/string/colorize.rb

@@ -5,8 +5,13 @@ require 'win32console' if RUBY_PLATFORM =~ /(win|m)32/      # ruby color support
 #
 class String
   # colorize(:red)
-  def colorize(color)
-    Colorizer.send(color, self)
+  def colorize(args)
+    case args
+    when Symbol
+      Colorizer.send(args, self)
+    when Hash
+      Colorizer.send(args[:color], self, args[:mode])
+    end
   end
 
   # Used to colorize strings for the shell
@@ -14,8 +19,7 @@ class String
     # Returns colors integer mapping
     def self.colors
       @_colors ||= {
-        :clear   => 0,
-        :bold    => 1,
+        :default => 9,
         :black   => 30,
         :red     => 31,
         :green   => 32,
@@ -27,12 +31,21 @@ class String
       }
     end
 
+    # Returns modes integer mapping
+    def self.modes
+      @_modes ||= {
+        :default => 0,
+        :bold    => 1
+      }
+    end
+
     # Defines class level color methods
     # i.e  Colorizer.red("hello")
     class << self
       Colorizer.colors.each do |color, value|
-        define_method(color) do |target|
-          "\e[#{value}m" << target << "\e[0m"
+        define_method(color) do |target, mode_name = :default|
+          mode = modes[mode_name] || modes[:default]
+          "\e[#{mode};#{value}m" << target << "\e[0m"
          end
       end
     end

data/test/test_colorize.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "String#colorize" do
+  it "should colorize text correctly" do
+    assert_equal "\e[0;34mHello world\e[0m", "Hello world".colorize(:blue)
+    assert_equal "\e[0;30mHello world\e[0m", "Hello world".colorize(:black)
+    assert_equal "\e[0;31mHello world\e[0m", "Hello world".colorize(:red)
+    assert_equal "\e[0;32mHello world\e[0m", "Hello world".colorize(:green)
+    assert_equal "\e[0;33mHello world\e[0m", "Hello world".colorize(:yellow)
+    assert_equal "\e[0;34mHello world\e[0m", "Hello world".colorize(:blue)
+    assert_equal "\e[0;35mHello world\e[0m", "Hello world".colorize(:magenta)
+    assert_equal "\e[0;36mHello world\e[0m", "Hello world".colorize(:cyan)
+    assert_equal "\e[0;37mHello world\e[0m", "Hello world".colorize(:white)
+  end
+
+  it "should colorize text when using color name method" do
+    assert_equal "\e[0;30mHello world\e[0m", String::Colorizer.black("Hello world")
+    assert_equal "\e[0;31mHello world\e[0m", String::Colorizer.red("Hello world")
+    assert_equal "\e[0;32mHello world\e[0m", String::Colorizer.green("Hello world")
+    assert_equal "\e[0;33mHello world\e[0m", String::Colorizer.yellow("Hello world")
+    assert_equal "\e[0;34mHello world\e[0m", String::Colorizer.blue("Hello world")
+    assert_equal "\e[0;35mHello world\e[0m", String::Colorizer.magenta("Hello world")
+    assert_equal "\e[0;36mHello world\e[0m", String::Colorizer.cyan("Hello world")
+    assert_equal "\e[0;37mHello world\e[0m", String::Colorizer.white("Hello world")
+  end
+
+  it "should be possible to set the mode" do
+    assert_equal "\e[1;34mHello world\e[0m", "Hello world".colorize(:color => :blue, :mode => :bold)
+    assert_equal "\e[1;34mHello world\e[0m", String::Colorizer.blue("Hello world", :bold)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-support
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Padrino Team
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,6 +68,7 @@ files:
 - lib/padrino-support/locale/zh_tw.yml
 - padrino-support.gemspec
 - test/helper.rb
+- test/test_colorize.rb
 - test/test_support_lite.rb
 homepage: http://www.padrinorb.com
 licenses:
@@ -96,5 +97,6 @@ specification_version: 4
 summary: Support for padrino
 test_files:
 - test/helper.rb
+- test/test_colorize.rb
 - test/test_support_lite.rb
 has_rdoc: