termcolor 0.2.6 → 0.3.0

data/lib/termcolor.rb

@@ -7,18 +7,14 @@ require 'rexml/parsers/baseparser'
 require 'rexml/streamlistener' 
 
 module TermColor
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
   include REXML
 
-  class ParseError < StandardError; end
-
   class << self
     def parse(text)
       listener = MyListener.new 
       REXML::Parsers::StreamParser.new(text, listener).parse
       listener.result
-    rescue REXML::ParseException => e
-      raise ParseError, e
     end
 
     def escape(text)
@@ -44,6 +40,10 @@ module TermColor
         end
       end
     end
+
+    def prepare_parse(text)
+      text.gsub(/<(\/?)(\d+)>/, '<\1_\2>')
+    end
   end
 
   class MyListener 
@@ -78,8 +78,8 @@ module TermColor
       begin
         esc_seq = HighLine.const_get(name.upcase)
       rescue NameError
-        if name =~ /^\d+$/
-          esc_seq = "\e[#{name}m"
+        if name =~ /^[^0-9]?(\d+)$/
+          esc_seq = "\e[#{$1}m"
         end
       end
       esc_seq

data/spec/termcolor_spec.rb

@@ -31,8 +31,8 @@ module TermColor
     end
 
     it 'should raise Error' do
-      lambda{ TermColor.parse('aaaaa<red>aaaaa</blue>aaaaa') }.should raise_error(TermColor::ParseError)
-      lambda{ TermColor.parse('aaaaa<red>aaaaaaaaaa') }.should_not raise_error(TermColor::ParseError)
+      lambda{ TermColor.parse('aaaaa<red>aaaaa</blue>aaaaa') }.should raise_error(REXML::ParseException)
+      lambda{ TermColor.parse('aaaaa<red>aaaaaaaaaa') }.should_not raise_error(REXML::ParseException)
     end
 
     it 'should escape text' do
@@ -43,6 +43,11 @@ module TermColor
       TermColor.unescape("&lt;&gt;&amp;&quote;&apos;").should == '<>&"\''
     end
 
+    it 'should prepare parse' do
+      TermColor.prepare_parse("<10>10</10>").should == '<_10>10</_10>'
+      TermColor.prepare_parse("<32>10</32>").should == '<_32>10</_32>'
+    end
+
     it 'should convert to escape sequence' do
       listener = TermColor::MyListener.new
       listener.to_esc_seq('red').should == "\e[31m"
@@ -51,6 +56,8 @@ module TermColor
       listener.to_esc_seq('0').should == "\e[0m"
       listener.to_esc_seq('31').should == "\e[31m"
       listener.to_esc_seq('031').should == "\e[031m"
+      listener.to_esc_seq('_0').should == "\e[0m"
+      listener.to_esc_seq('_31').should == "\e[31m"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termcolor
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - jugyo