Changeset 2294 for lang/ruby/ssb

Timestamp:

12/02/07 19:39:24 (13 months ago)

Author:

tokuhirom

Message:

lang/ruby/ssb: added utf8 binary pictogram support.

Location:

lang/ruby/ssb/trunk

Files:

• dat/docomo-table.yaml (added)
• libs/ssb.rb (modified) (3 diffs)
• libs/ssb/emoji.rb (modified) (2 diffs)
• test/emoji_test.rb (modified) (2 diffs)

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

@@ -146 +146 @@
       end
 
-      page = SSB::Application.filter_html(page, request_uri, term, ssb)
+      page = SSB::Application.filter_html(page, request_uri, term, ssb, response)
 
       page = NKF::nkf('-w', page)
@@ -175 +175 @@
     end
 
-    def self.filter_html(page, request_uri, term, ssb)
+    def self.filter_html(page, request_uri, term, ssb, response)
       # <?xml をけす。IEのバグ対応
       page.gsub!(/<\?([^\?]+)\?>/) { |s|
@@ -211 +211 @@
 
       # 絵文字を <img> に変換
-      page = Emoji::emoji_conv(term, page)
+      is_utf8 = response.respond_to?(:header) && (response.header['Content-Type'] =~ /utf-?8/i)
+      page = Emoji::emoji_conv(term, page, is_utf8)
 
       page

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

@@ -26 +26 @@
     end
 
-    def self.emoji_conv(term, str)
+    def self.docomo_uni2sjis(uni)
+      table = YAML.load_file(File.join(SSB::CONFIG[:dat_dir], 'docomo-table.yaml'))
+      table.each {|x|
+        if x['unicode'] == uni
+          return x['sjis']
+        end
+      }
+      nil
+    end
+
+    def self.emoji_conv(term, str, is_utf8=false)
       ret = str
-      # SJIS HEX Binary
+
+      # SJIS Binary
       ret.gsub!(RE_IMODE_SJIS) do |s|
         orig_match = $1
@@ -35 +46 @@
         else
           orig_match
+        end
+      end
+
+      # UTF8 BINARY
+      if term.get_carrier == KtaiSpec::CARRIER_DOCOMO and is_utf8
+        ret.gsub!(/./) do |c|
+          sjis = SSB::Emoji.docomo_uni2sjis(sprintf "%X", c.unpack("U")[0])
+          sjis ? sprintf('<img class="emoji" src="emoji/docomo/%s.gif" />', sjis) : c
         end
       end

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

@@ -13 +13 @@
 
 unit_tests do
-  def conv(carrier, str)
-    SSB::Emoji.emoji_conv(Term.new(carrier), str)
+  def conv(carrier, str, is_utf8=false)
+    SSB::Emoji.emoji_conv(Term.new(carrier), str, is_utf8)
   end
   
@@ -28 +28 @@
   test 'docomo cref hex extension' do
     assert_equal(conv(SSB::KtaiSpec::CARRIER_DOCOMO, "&#xE70C;"), "<img class=\"emoji\" src=\"emoji/docomo/F9B1.gif\" />")
+  end
+
+  test 'docomo utf8 binary' do
+    assert_equal(conv(SSB::KtaiSpec::CARRIER_DOCOMO, "\xEE\x98\xBE", true), "<img class=\"emoji\" src=\"emoji/docomo/F89F.gif\" />")
   end