pwim-emoticon 0.0.2 → 0.0.3

data/emoticon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "emoticon"
-  s.version  = "0.0.2"
+  s.version  = "0.0.3"
   s.date     = "2008-11-12"
   s.summary  = "Emoticon (emoji) handling for Japanese mobile phones"
   s.email    = "paul@tokyodev.com"

data/lib/emoticon.rb

@@ -4,8 +4,8 @@ end
 
 module Emoticon
   def self.transcoder_for_carrier(carrier)
-    name = carrier.capitalize
-    if Transcoder.const_defined?(name)
+    name = carrier.to_s.capitalize
+    if !name.empty? && Transcoder.const_defined?(name)
       Transcoder.const_get(name).instance
     else
       Transcoder::Null.instance

data/lib/emoticon/transcoder/docomo.rb

@@ -11,6 +11,13 @@ class Emoticon::Transcoder::Docomo < Emoticon::Transcoder
     end
   end
 
+  def sjiscr_to_unicodecr(s)
+    s.gsub(/&#([0-9]{5});/i) do |match|
+      unicode = DOCOMO_SJIS_TO_UNICODE[$1.to_i].to_s(16).upcase
+      "&#x#{unicode};"
+    end
+  end
+
   private
 
   def to_sjis

data/test/emoticon/transcoder/au_test.rb

@@ -5,7 +5,7 @@ require "emoticon/transcoder/au"
 
 class AuTest < Test::Unit::TestCase
   def setup
-    @transcoder = Emoticon::Transcoder::Au.new
+    @transcoder = Emoticon::Transcoder::Au.instance
   end
 
   def test_internal_to_external

data/test/emoticon/transcoder/docomo_test.rb

@@ -5,7 +5,7 @@ require "emoticon/transcoder/docomo"
 
 class DocomoTest < Test::Unit::TestCase
   def setup
-    @transcoder = Emoticon::Transcoder::Docomo.new
+    @transcoder = Emoticon::Transcoder::Docomo.instance
   end
 
   def test_internal_to_external
@@ -17,4 +17,9 @@ class DocomoTest < Test::Unit::TestCase
     assert_equal "\xf8\x9f", @transcoder.internal_to_external(SOFTBANK_CR)
     assert_equal "\xf8\x9f", @transcoder.internal_to_external(SOFTBANK_UTF8)
   end
+
+  def test_sjiscr_to_unicodecr
+    s = @transcoder.sjiscr_to_unicodecr("<P>&#63647;</P>")
+    assert_equal("<P>&#xE63E;</P>", s)
+  end
 end

data/test/emoticon/transcoder/jphone_test.rb

@@ -5,7 +5,7 @@ require "emoticon/transcoder/jphone"
 
 class JphoneTest < Test::Unit::TestCase
   def setup
-    @transcoder = Emoticon::Transcoder::Jphone.new
+    @transcoder = Emoticon::Transcoder::Jphone.instance
   end
 
   def test_internal_to_external

data/test/emoticon/transcoder/softbank_test.rb

@@ -5,7 +5,7 @@ require "emoticon/transcoder/softbank"
 
 class SoftbankTest < Test::Unit::TestCase
   def setup
-    @transcoder = Emoticon::Transcoder::Softbank.new
+    @transcoder = Emoticon::Transcoder::Softbank.instance
   end
 
   def test_internal_to_external

data/test/emoticon/transcoder/vodafone_test.rb

@@ -5,7 +5,7 @@ require "emoticon/transcoder/vodafone"
 
 class VodafoneTest < Test::Unit::TestCase
   def setup
-    @transcoder = Emoticon::Transcoder::Vodafone.new
+    @transcoder = Emoticon::Transcoder::Vodafone.instance
   end
 
   def test_internal_to_external

data/test/emoticon_test.rb

@@ -10,5 +10,7 @@ class EmoticonTest < Test::Unit::TestCase
     assert_instance_of(Emoticon::Transcoder::Jphone, Emoticon.transcoder_for_carrier("jphone"))
     assert_instance_of(Emoticon::Transcoder::Null, Emoticon.transcoder_for_carrier("emobile"))
     assert_instance_of(Emoticon::Transcoder::Null, Emoticon.transcoder_for_carrier("willcom"))
+    assert_instance_of(Emoticon::Transcoder::Null, Emoticon.transcoder_for_carrier(""))
+    assert_instance_of(Emoticon::Transcoder::Null, Emoticon.transcoder_for_carrier(nil))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pwim-emoticon
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Paul McMahon