termcolor 0.2.5 → 0.2.6

data/lib/termcolor.rb

@@ -7,16 +7,12 @@ require 'rexml/parsers/baseparser'
 require 'rexml/streamlistener' 
 
 module TermColor
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
   include REXML
 
   class ParseError < StandardError; end
 
   class << self
-    def escape(text)
-      CGI.escapeHTML(text)
-    end
-
     def parse(text)
       listener = MyListener.new 
       REXML::Parsers::StreamParser.new(text, listener).parse
@@ -24,6 +20,30 @@ module TermColor
     rescue REXML::ParseException => e
       raise ParseError, e
     end
+
+    def escape(text)
+      text.gsub(/[&<>'"]/) do | match |
+        case match
+          when '&' then '&amp;'
+          when '<' then '&lt;'
+          when '>' then '&gt;'
+          when "'" then '&apos;'
+          when '"' then '&quote;'
+        end
+      end
+    end
+
+    def unescape(text)
+      text.gsub(/&(lt|gt|amp|quote|apos);/) do | match |
+        case match
+          when '&amp;' then '&'
+          when '&lt;' then '<'
+          when '&gt;' then '>'
+          when '&apos;' then "'"
+          when '&quote;' then '"'
+        end
+      end
+    end
   end
 
   class MyListener 

data/spec/termcolor_spec.rb

@@ -36,8 +36,11 @@ module TermColor
     end
 
     it 'should escape text' do
-      text = 'a<foo>&</foo>a'
-      TermColor.escape(text).should == "a&lt;foo&gt;&amp;&lt;/foo&gt;a"
+      TermColor.escape('<>&"\'').should == "&lt;&gt;&amp;&quote;&apos;"
+    end
+
+    it 'should unescape text' do
+      TermColor.unescape("&lt;&gt;&amp;&quote;&apos;").should == '<>&"\''
     end
 
     it 'should convert to escape sequence' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termcolor
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-28 00:00:00 +09:00
+date: 2009-03-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency