Changeset 2277

Timestamp:

12/02/07 10:49:23 (5 years ago)

Author:

tokuhirom

Message:

lang/ruby/ssb: don't depend to $KCODE.

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb/emoji.rb (modified) (3 diffs)
• test/emoji_test.rb (modified) (1 diff)

lang/ruby/ssb/trunk/libs/ssb/emoji.rb

@@ -6 +6 @@
 # $Id$
 #
-require 'jcode'
 
 module SSB
   module Emoji
-    PATTERN_EMOJI = '[\xF8-\xF9][\x00-\xFF]'
-    RE_EMOJI = Regexp.new(PATTERN_EMOJI, 0, 'n')
+    SJIS_ONE_BYTE  = '[\x00-\x7F\xA1-\xDF]'
+    SJIS_TWO_BYTES = '[\x81-\x9F\xE0-\xFC][\x40-\x7E\x80-\xFC]'
+    SJIS_IMODE_PICTOGRAM = '\xF8[\x9F-\xFC]|\xF9[\x40-\x7E\x80-\xB0]|\xF9[\xB1-\xFC]'
+    RE_IMODE_SJIS = Regexp.new("((#{SJIS_IMODE_PICTOGRAM})|(#{SJIS_ONE_BYTE}|#{SJIS_TWO_BYTES}))")
 
     def self.emoji_conv(term, str)
-      ret = ''
-      # 16進数直接
-      str.each_char do |moji|
-        moji.gsub!(RE_EMOJI) do |s|
-          ch = 0
-          s.each_byte do |c|
-            if ch == 0
-              ch += c << 8
-            else
-              ch += c
-            end
-          end
-          '<img class="emoji" src="emoji/docomo/' + ch.to_s(16).upcase + '.gif" />'
+      ret = str
+      # SJIS HEX Binary
+      ret.gsub!(RE_IMODE_SJIS) do |s|
+        orig_match = $1
+        if not $2.nil?
+          sprintf '<img class="emoji" src="emoji/docomo/%X.gif" />', orig_match.unpack('n')[0]
+        else
+          orig_match
         end
-        ret.concat moji
       end
 
@@ -55 +50 @@
       end
 
+      # KDDI localsrc
       if term.get_carrier == KtaiSpec::CARRIER_KDDI
         ret.gsub!(/ (localsrc)=\"?([^>\" ]+)\"?/im) { |s|
@@ -61 +57 @@
       end
 
+      # Thirdforce
       re_sb_emoji = Regexp.new('\x1B\$(..)\x0F', 0, 'n')
       if term.get_carrier == KtaiSpec::CARRIER_SOFTBANK

lang/ruby/ssb/trunk/test/emoji_test.rb

@@ -23 +23 @@
 
   test 'docomo direct binary' do
-    $KCODE='sjis'
     assert_equal(conv(SSB::KtaiSpec::CARRIER_DOCOMO, "\xF9\x7B"), "<img class=\"emoji\" src=\"emoji/docomo/F97B.gif\" />")
-    $KCODE='utf-8'
   end