termcolor 1.2.1 → 1.2.2

data/README.rdoc

@@ -1,6 +1,6 @@
 = termcolor
 
-http://wiki.github.com/jugyo/termcolor
+https://github.com/jugyo/termcolor
 
 == DESCRIPTION:
 
@@ -10,25 +10,12 @@ Termcolor is a library for ANSI color formatting like HTML for output in termina
 
 == SYNOPSIS:
 
- TermColor.parse('<blue>Hello</blue> <red>World!</red>')
+ '<blue>Hello</blue> <red>World!</red>'.termcolor
  #=> "\e[34mHello\e[0m \e[31mWorld!\e[0m"
 
-== REQUIREMENTS:
-
-* highline
-
 == INSTALL:
 
- sudo gem install termcolor
-
-or
-
- gem source -a http://gems.github.com
- sudo gem install jugyo-termcolor
-
-== TODO:
-
- for windows...
+ gem install termcolor
 
 == LICENSE:
 

data/Rakefile

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 $:.unshift File.dirname(__FILE__) + '/lib/'
 require 'termcolor'
-require 'spec/rake/spectask'
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-desc 'run all specs'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['-c']
+task :default => :spec
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
 desc 'Generate gemspec'

data/lib/termcolor.rb

@@ -7,7 +7,7 @@ require 'rexml/parsers/baseparser'
 require 'rexml/streamlistener' 
 
 module TermColor
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
   include REXML
 
   class << self
@@ -18,31 +18,36 @@ module TermColor
     end
 
     def escape(text)
-      text.gsub(/[&<>'"]/) do | match |
-        case match
-          when '&' then '&amp;'
-          when '<' then '&lt;'
-          when '>' then '&gt;'
-          when "'" then '&apos;'
-          when '"' then '&quot;'
-        end
-      end
+      escape_or_unescape(:escape, text)
     end
 
     def unescape(text)
-      text.gsub(/&(lt|gt|amp|quot|apos);/) do | match |
-        case match
-          when '&amp;' then '&'
-          when '&lt;' then '<'
-          when '&gt;' then '>'
-          when '&apos;' then "'"
-          when '&quot;' then '"'
-        end
-      end
+      escape_or_unescape(:unescape, text)
+    end
+
+    def escape_or_unescape(dir=:escape, text)
+      h = Hash[*%w(& &amp; < &lt; > &gt; ' &apos; " &quot;)]
+      h = h.invert if dir == :unescape
+      text.gsub(/(#{h.keys.join('|')})/){ h[$1] }
     end
+    private :escape_or_unescape
 
     def prepare_parse(text)
-      text.gsub(/<(\/?)(\d+)>/, '<\1_\2>')
+      tag_separate text.gsub(/<(\/?)(\d+)>/, '<\1_\2>')
+    end
+
+    def tag_separate(text)
+      re = /<(\/*)([^\W_]+)(?:_(on_[^\W_]+))*(?:_with_([^\W_]+))*(?:_and_([^\W_]+))*>/
+      text.gsub(re) do
+        matchs = $~.captures
+        if matchs.shift.empty?
+          tag = ->t{ "<#{t}>" }
+        else
+          matchs.reverse!
+          tag = ->t{ "</#{t}>" }
+        end
+        matchs.compact.map { |word| tag[word] }.join
+      end
     end
 
     def test(*args)

data/spec/termcolor_spec.rb

@@ -24,19 +24,19 @@ module TermColor
       text.should == "aa\e[34maaaaa<aaa\"aaa>aaa&aaaaa\e[0maaa"
     end
 
-    it 'should parse 3' do
+    it 'should parse 4' do
       text = TermColor.parse('aa<30>bbbbbbb<32>cccc<90>ddd</90>c</32>b</30>aaa')
       puts text
-      text.should == "aa\e[30mbbbbbbb\e[32mcccc\e[90mddd\e[0m\e[32mc\e[0m\e[30mb\e[0maaa"
+      text.should == "aa\e[30mbbbbbbb\e[32mcccc\e[90mddd\e[0m\e[30m\e[32mc\e[0m\e[30mb\e[0maaa"
     end
 
-    it 'should parse 4' do
+    it 'should parse 5' do
       text = TermColor.parse('aa<f123>bbbbbbb<b321>ccccc</b321>b</f123>aaa')
       puts text
       text.should == "aa\e[38;5;67mbbbbbbb\e[48;5;137mccccc\e[0m\e[38;5;67mb\e[0maaa"
     end
 
-    it 'should parse 5' do
+    it 'should parse 6' do
       text = TermColor.parse('aa<f12>bbbbbbb<b6>ccccc</b6>b</f12>aaa')
       puts text
       text.should == "aa\e[38;5;244mbbbbbbb\e[48;5;238mccccc\e[0m\e[38;5;244mb\e[0maaa"
@@ -75,5 +75,19 @@ module TermColor
     it 'should do colorize' do
       TermColor.colorize('test', :green).should == "\e[32mtest\e[0m"
     end
+
+    it 'should make separate tags for combined-style tag' do
+      h = { "<red_on_yellow>hello, world</red_on_yellow>" =>
+                   "<red><on_yellow>hello, world</on_yellow></red>",
+            "<green_with_bold>hello, world</green_with_bold>" =>
+                   "<green><bold>hello, world</bold></green>",
+            "<blue_on_white_with_bold_and_underline>hello</blue_on_white_with_bold_and_underline>" =>
+                   "<blue><on_white><bold><underline>hello</underline></bold></on_white></blue>",
+            "<black_on_white>hello</black_on_white>term<green_with_bold>color</green_with_bold>" =>
+                   "<black><on_white>hello</on_white></black>term<green><bold>color</bold></green>" }
+      h.each_pair do |combined, separated|
+        TermColor.prepare_parse(combined).should == separated
+      end
+    end
   end
 end

metadata

@@ -1,49 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: termcolor
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
+version: !ruby/object:Gem::Version
+  version: 1.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-26 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id001
-description: "Termcolor is a library for ANSI color formatting like HTML for output in terminal. '<red>red</red>'.termcolor #=> \"\e[31mred\e[0m\""
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+description: ! "Termcolor is a library for ANSI color formatting like HTML for output
+  in terminal. '<red>red</red>'.termcolor #=> \"\e[31mred\e[0m\""
 email: jugyo.org@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - History.txt
-files: 
+files:
 - lib/termcolor.rb
 - spec/spec_helper.rb
 - spec/termcolor_spec.rb
@@ -51,42 +43,34 @@ files:
 - README.rdoc
 - History.txt
 - Rakefile
-has_rdoc: true
 homepage: http://github.com/jugyo/termcolor
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --exclude
 - spec
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: termcolor
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Termcolor is a library for ANSI color formatting like HTML for output in terminal.
+summary: Termcolor is a library for ANSI color formatting like HTML for output in
+  terminal.
 test_files: []
-
+has_rdoc: true