jpmobile 1.0.12 → 2.0.0.pre.1

data/lib/jpmobile/util.rb

@@ -102,11 +102,9 @@ module Jpmobile
       utf8_str = minus_sign_to_fullwidth_hyphen_minus(utf8_str)
 
       if utf8_str.respond_to?(:encode)
-        utf8_str.
-        gsub(/(\r\n|\r|\n)/, "\r\n").
-        encode(SJIS, :undef => :replace, :replace => '?')
+        utf8_str.encode(SJIS, :crlf_newline => true,:undef => :replace,:replace => '?')
       else
-        NKF.nkf("-m0 -x -W --oc=cp932 --fb-subchar=63", utf8_str).gsub(/(\r\n|\r|\n)/, "\r\n")
+        NKF.nkf("-m0 -x -W --oc=cp932 --fb-subchar=63", utf8_str).gsub(/\n/, "\r\n")
       end
     end
 
@@ -114,7 +112,7 @@ module Jpmobile
       utf8_str = if sjis_str.respond_to?(:encode)
                    sjis_str.encode("UTF-8", :universal_newline => true)
                  else
-                   NKF.nkf("-m0 -x -w --ic=cp932", sjis_str).gsub(/\r\n?/, "\n")
+                   NKF.nkf("-m0 -x -w --ic=cp932", sjis_str).gsub(/\r\n/, "\n")
                  end
 
       # 波ダッシュ対策
@@ -122,15 +120,10 @@ module Jpmobile
     end
 
     def utf8_to_jis(utf8_str)
-      # 波ダッシュ対策
-      utf8_str = fullwidth_tilde_to_wavedash(utf8_str)
-
       if utf8_str.respond_to?(:encode)
-        utf8_str.
-        gsub(/(\r\n|\r|\n)/, "\r\n").
-        encode(JIS, :undef => :replace, :replace => '?')
+        utf8_str.encode(JIS, :crlf_newline => true)
       else
-        NKF.nkf("-m0 -x -Wj --fb-subchar=63", utf8_str).gsub(/(\r\n|\r|\n)/, "\r\n")
+        NKF.nkf("-m0 -x -Wj", utf8_str).gsub(/\n/, "\r\n")
       end
     end
 
@@ -138,7 +131,7 @@ module Jpmobile
       if jis_str.respond_to?(:encode)
         jis_str.encode(UTF8, :universal_newline => true)
       else
-        NKF.nkf("-m0 -x -Jw", jis_str).gsub(/\r\n?/, "\n")
+        NKF.nkf("-m0 -x -Jw", jis_str).gsub(/\r\n/, "\n")
       end
     end
 
@@ -187,21 +180,15 @@ module Jpmobile
     end
 
     def jis_string_regexp
-      Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42")) + "(.+?)" + Regexp.escape(ascii_8bit("\x1b\x28\x42")))
+      Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42")) + "(.+)" + Regexp.escape(ascii_8bit("\x1b\x28\x42")))
     end
 
     def encode(str, charset)
-      if (charset.nil? or charset == "" or str.nil? or str == "")
-        str
-      elsif utf8?(str) and charset.match(/iso-2022-jp/i)
-        utf8_to_jis(str)
-      elsif utf8?(str) and charset.match(/shift_jis/i)
-        utf8_to_sjis(str)
-      elsif utf8?(str) and charset.match(/utf-8/i)
-        str
+      if Object.const_defined?(:Encoding)
+        (charset.nil? or charset == "" or str.nil? or str == "") ? str : str.encode(charset)
       else
-        if Object.const_defined?(:Encoding)
-          str.encode(charset)
+        if str.nil?
+          str
         else
           case charset
           when /iso-2022-jp/i
@@ -379,63 +366,5 @@ module Jpmobile
       end
 
     end
-
-    def invert_table(hash)
-      result = {}
-      hash.keys.each do |key|
-        if result[hash[key]]
-          if !key.kind_of?(Array) and !result[hash[key]].kind_of?(Array) and result[hash[key]] > key
-            result[hash[key]] = key
-          end
-        else
-          result[hash[key]] = key
-        end
-      end
-      result
-    end
-
-    def decode(str, encoding, charset)
-      _str = case encoding
-             when /quoted-printable/i
-               str.unpack('M').first.strip
-             when /base64/i
-               str.unpack('m').first.strip
-             else
-               str
-             end
-
-      _extract_charset = Jpmobile::Util.extract_charset(_str)
-      charset = _extract_charset unless _extract_charset.blank? or _extract_charset == charset
-      Jpmobile::Util.set_encoding(_str, charset)
-    end
-
-    def check_charset(str, charset)
-      if Object.const_defined?(:Encoding)
-        # use NKF.guess
-        ::Encoding.compatible?(NKF.guess(str), ::Encoding.find(charset))
-      else
-        true
-      end
-    end
-
-    def correct_encoding(str)
-      if Object.const_defined?(:Encoding)
-        if str.encoding != ::Encoding::ASCII_8BIT and NKF.guess(str) != str.encoding
-          str.force_encoding(NKF.guess(str))
-        end
-      else
-        str = case NKF.guess(str)
-              when NKF::UTF8
-                NKF.nkf('-w', str)
-              when NKF::JIS
-                pp '1'
-                NKF.nkf('-j', str)
-              when NKF::SJIS
-                NKF.nkf("-s", str)
-              end
-      end
-
-      str
-    end
   end
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -47,7 +47,7 @@ namespace :test do
     # setup jpmobile
     plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile')
     FileUtils.mkdir_p(plugin_path)
-    FileList["*"].exclude("test").exclude("spec").exclude('vendor').each do |file|
+    FileList["*"].exclude("test").exclude("spec").each do |file|
       FileUtils.cp_r(file, plugin_path)
     end
 

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -7,8 +7,6 @@ describe "絵文字が" do
   include Jpmobile::Util
 
   before(:each) do
-    Jpmobile.config.smart_phone_emoticon_compatibility = true
-
     @docomo_cr          = "";
     @docomo_utf8        = [0xe63e].pack("U")
     @docomo_docomopoint = ""
@@ -18,9 +16,6 @@ describe "絵文字が" do
 
     @softbank_cr        = ""
     @softbank_utf8      = [0xf04a].pack("U")
-
-    @emoticon_yaml   = File.join(File.expand_path(File.dirname(__FILE__)), "../../../tmp/emoticon.yml")
-    @emoticon_images = File.join(File.expand_path(File.dirname(__FILE__)), "../../../tmp/emoticons")
   end
 
   context "PC のとき" do
@@ -50,59 +45,6 @@ describe "絵文字が" do
     end
   end
 
-  context "PC で絵文字を変換するとき" do
-    before(:each) do
-      unless FileTest.exist?(File.join(File.expand_path(File.dirname(__FILE__)), '../../../tmp/emoticon.yaml')) and
-          FileTest.directory?(File.join(File.expand_path(File.dirname(__FILE__)), '../../../tmp/emoticons'))
-        pending "emoticon.yaml and emoticons directory don't exists"
-      end
-
-      @res = Rack::MockRequest.env_for("/", 'Content-Type' => 'text/html; charset=utf-8')
-
-      Jpmobile::Emoticon.pc_emoticon_yaml               = "tmp/emoticon.yaml"
-      Jpmobile::Emoticon.pc_emoticon_image_path = @path = "tmp/emoticons"
-    end
-
-    after(:each) do
-      Jpmobile::Emoticon.pc_emoticon_yaml       = nil
-      Jpmobile::Emoticon.pc_emoticon_image_path = nil
-    end
-
-    it "Jpmobile::Emoticon.pc_emoticon? がtrueになること" do
-      Jpmobile::Emoticon.pc_emoticon?.should be_true
-    end
-
-    it "docomo 絵文字が画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
-    end
-
-    it "docomo 絵文字コードが画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
-    end
-
-    it "au 絵文字が画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
-    end
-
-    it "au 絵文字コードが画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
-    end
-
-    it "softbank 絵文字が画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
-    end
-
-    it "softbank 絵文字コードが画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
-    end
-  end
-
   context "docomo のとき" do
     before(:each) do
       @res = Rack::MockRequest.env_for(
@@ -273,169 +215,4 @@ describe "絵文字が" do
       response_body(res).should == [0xe04a].pack('U')
     end
   end
-
-  context 'for iPhone' do
-    context 'lower iOS 4' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          'HTTP_USER_AGENT' => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0_1 like Mac OS X; ja-jp) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A306 Safari/6531.22.7",
-          'Content-Type' => 'text/html; charset=utf-8')
-      end
-
-      it 'should convert Softbank emoticon' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-        response_body(response).should == [0xe04a].pack('U')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-        response_body(response).should == [0xe04a].pack('U')
-      end
-
-      it "converts query parameters" do
-        query_string = "q=" + URI.encode([0xe04A].pack("U"))
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0_1 like Mac OS X; ja-jp) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A306 Safari/6531.22.7",
-          'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xf04a].pack("U")
-        response_body(res).should == [0xe04a].pack('U')
-      end
-
-      it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
-      end
-    end
-
-    context 'upper iOS 5' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          'HTTP_USER_AGENT' => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Mobile/9A334 Safari/7534.48.3",
-          'Content-Type' => 'text/html; charset=utf-8')
-        @unicode_single = "\342\230\200"
-        @unicode_multi  = "\342\233\205"
-      end
-
-      it "should convert Unicode emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_single))).call(@res)[2]
-        response_body(response).should == [0x2600].pack('U*')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)[2]
-        response_body(response).should == [0x26C5].pack('U*')
-      end
-
-      it "converts query parameters" do
-        query_string = "q=" + URI.encode(@unicode_multi)
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0_1 like Mac OS X; ja-jp) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A306 Safari/6531.22.7",
-          'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0x26C5].pack("U")
-        response_body(res).should == [0x26C5].pack('U')
-      end
-
-      it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
-      end
-    end
-  end
-
-  context 'for Android' do
-    before(:each) do
-      @google_single = "\363\276\200\200"
-      @google_multi  = "\363\276\200\217"
-    end
-
-    context 'mobile' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1',
-          'Content-Type' => 'text/html; charset=utf-8')
-      end
-
-      it "should convert Google emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
-        response_body(response).should == [0xFE000].pack('U*')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
-        response_body(response).should == [0xFE00F].pack('U*')
-      end
-
-      it "converts query parameters irreversibly" do
-        query_string = "q=" + URI.encode(@google_multi)
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1',
-          'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xe63e, 0xe63f].pack("U*")
-        response_body(res).should == [0xfe000, 0xfe001].pack("U*")
-      end
-
-      it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
-      end
-    end
-
-    context 'tablet' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
-          'Content-Type' => 'text/html; charset=utf-8')
-      end
-
-      it "should convert Google emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
-        response_body(response).should == [0xFE000].pack('U*')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
-        response_body(response).should == [0xFE00F].pack('U*')
-      end
-
-      it "converts query parameters irreversibly" do
-        query_string = "q=" + URI.encode(@google_multi)
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
-          'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xe63e, 0xe63f].pack("U*")
-        response_body(res).should == [0xfe000, 0xfe001].pack("U*")
-      end
-
-      it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
-      end
-
-      it 'should convert unsupported emoticon to "〓"' do
-        query_string = "q=" + URI.encode("\xF3\xBE\x93\xA4")
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
-          'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == '〓'
-        response_body(res).should == '〓'
-      end
-    end
-  end
 end

data/spec/rack/jpmobile/mobile_by_ua_spec.rb

@@ -19,12 +19,8 @@ describe Jpmobile::Rack::MobileCarrier do
     [ Jpmobile::Mobile::Iphone       , 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; ja-jp) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16' ],
     [ Jpmobile::Mobile::Android      , 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1' ],
     [ Jpmobile::Mobile::WindowsPhone , 'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)' ],
-    [ Jpmobile::Mobile::BlackBerry, 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220' ],
-    [ Jpmobile::Mobile::Ipad         , 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'],
-    [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'],
-    [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 3.2; ja-jp; Sony Tablet S Build/THMAS11002) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13'],
   ].each do |carrier, user_agent|
-    it "#mobile should return #{carrier} when take #{user_agent} as UserAgent" do
+    it '#mobile should return #{carrier} when take #{user_agent} as UserAgent' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => user_agent)

data/spec/rack/jpmobile/softbank_spec.rb

@@ -70,7 +70,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
-        "REMOTE_ADDR"=>"210.146.7.199")
+        "REMOTE_ADDR"=>"210.175.1.130")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       env['rack.jpmobile'].valid_ip?.should be_true

data/spec/unit/emoticon_spec.rb

@@ -30,38 +30,6 @@ describe Jpmobile::Emoticon do
         Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true).should == [0xe04a, 0xe049].pack('U*')
       end
     end
-
-    it 'should convert docomo unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x2600].pack('U')
-    end
-
-    it 'should convert au unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x26C5].pack('U')
-    end
-
-    it 'should convert Softbank unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x1F466].pack('U')
-    end
-
-    it 'should not convert 〓' do
-      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == '〓'
-    end
-
-    it 'should convert docomo unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE000].pack('U')
-    end
-
-    it 'should convert au unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE00F].pack('U')
-    end
-
-    it 'should convert Softbank unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE19B].pack('U')
-    end
-
-    it 'should not convert 〓' do
-      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == '〓'
-    end
   end
 
   describe "unicodecr_to_utf8" do
@@ -102,34 +70,6 @@ describe Jpmobile::Emoticon do
     it "should not convert docomo encoding of koukai-sjis emoticons to unicodecr" do
       Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\x8c\xf6\x8a\x4a")).should == sjis("\x8c\xf6\x8a\x4a")
     end
-
-    context 'at iPhone emoticon' do
-      it 'should convert iPhone Unicode emoticon to SoftBank emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\230\200").should == ""
-      end
-
-      it 'should convert iPhone Unicode emoticon to multi SoftBank emoticons' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\233\205").should == ","
-      end
-
-      it 'should not convert 〓' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60('〓').should == "〓"
-      end
-    end
-
-    context 'at Android emoticon' do
-      it 'should convert Android Google Unicode emoticon to Docomo emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\200").should == ""
-      end
-
-      it 'should convert Android Google Unicode emoticon to multi Docomo emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\217").should == ""
-      end
-
-      it 'should not convert 〓' do
-        Jpmobile::Emoticon::external_to_unicodecr_google('〓').should == "〓"
-      end
-    end
   end
 
   context "for email" do
@@ -145,10 +85,6 @@ describe Jpmobile::Emoticon do
       it "should not convert ascii string to unicodecr" do
         Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("-------=_NextPart_15793_72254_63179")).should_not match(/e5c2/i)
       end
-
-      it "should not include extra JIS escape sequence between Kanji-code and emoticon" do
-        Jpmobile::Emoticon.unicodecr_to_au_email(utf8_to_jis("掲示板")).should == Jpmobile::Util.ascii_8bit("\x1b\x24\x42\x75\x3a\x37\x47\x3C\x28\x48\x44\x1b\x28\x42")
-      end
     end
   end
 end