jpmobile 2.0.8 → 2.0.9

data/lib/jpmobile/emoticon/z_combine.rb

@@ -4,7 +4,8 @@ end
 
 module Jpmobile
   module Emoticon
-    GETA = 0x3013
+    GETA_CODE = 0x3013
+    GETA      = [GETA_CODE].pack('U')
 
     SJIS_TO_UNICODE = {}
     SJIS_TO_UNICODE.update(DOCOMO_SJIS_TO_UNICODE)
@@ -32,5 +33,20 @@ module Jpmobile
 
     SOFTBANK_SJIS_REGEXP = Regexp.union(*SOFTBANK_SJIS_TO_UNICODE.keys.map{|s| Jpmobile::Util.sjis_regexp(s)}).freeze
     AU_EMAILJIS_REGEXP = Regexp.union(*AU_EMAILJIS_TO_UNICODE.keys.map{|s| Jpmobile::Util.jis_regexp(s)})
+
+    # for unicode/google emoticons
+    UNICODE_EMOTICONS = (UNICODE_TO_DOCOMO_UNICODE.keys|UNICODE_TO_AU_UNICODE.keys|UNICODE_TO_SOFTBANK_UNICODE.keys).uniq
+    GOOGLE_EMOTICONS = (GOOGLE_TO_DOCOMO_UNICODE.keys|GOOGLE_TO_AU_UNICODE.keys|GOOGLE_TO_SOFTBANK_UNICODE.keys).uniq
+
+    UNICODE_EMOTICON_REGEXP = Regexp.union(*UNICODE_EMOTICONS.map{|x| x.kind_of?(Array) ? x.pack('UU') : [x].pack('U')}).freeze
+    GOOGLE_EMOTICON_REGEXP = Regexp.union(*GOOGLE_EMOTICONS.map{|x| x.kind_of?(Array) ? x.pack('UU') : [x].pack('U')}).freeze
+
+    UNICODE_EMOTICON_TO_CARRIER_EMOTICON = UNICODE_TO_DOCOMO_UNICODE.merge(UNICODE_TO_AU_UNICODE.merge(UNICODE_TO_SOFTBANK_UNICODE))
+    GOOGLE_EMOTICON_TO_CARRIER_EMOTICON = GOOGLE_TO_SOFTBANK_UNICODE.merge(GOOGLE_TO_AU_UNICODE.merge(GOOGLE_TO_DOCOMO_UNICODE))
+
+    CONVERSION_TABLE_TO_UNICODE_EMOTICON = Jpmobile::Util.invert_table(UNICODE_TO_DOCOMO_UNICODE).merge(
+      Jpmobile::Util.invert_table(UNICODE_TO_AU_UNICODE).merge(Jpmobile::Util.invert_table(UNICODE_TO_SOFTBANK_UNICODE)))
+    CONVERSION_TABLE_TO_GOOGLE_EMOTICON = Jpmobile::Util.invert_table(GOOGLE_TO_SOFTBANK_UNICODE).merge(
+      Jpmobile::Util.invert_table(GOOGLE_TO_AU_UNICODE).merge(Jpmobile::Util.invert_table(GOOGLE_TO_DOCOMO_UNICODE)))
   end
 end

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -80,7 +80,7 @@ module Jpmobile::Mobile
     def variants
       return @_variants if @_variants
 
-      @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/}.map do |klass|
+      @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/ && c.to_s !~ /Emoticon/}.map do |klass|
         klass = klass.to_s.
           gsub(/Jpmobile::/, '').
           gsub(/AbstractMobile::/, '').

data/lib/jpmobile/mobile/android.rb

@@ -6,5 +6,7 @@ module Jpmobile::Mobile
   class Android < SmartPhone
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /Android/
+
+    include Jpmobile::Mobile::GoogleEmoticon
   end
 end

data/lib/jpmobile/mobile/android_tablet.rb

@@ -6,5 +6,7 @@ module Jpmobile::Mobile
   class AndroidTablet < Tablet
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = Regexp.union(/(?!Android.+Mobile)Android/, /Android.+SC-01C/)
+
+    include Jpmobile::Mobile::GoogleEmoticon
   end
 end

data/lib/jpmobile/mobile/black_berry.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# =BlackBerry
+
+module Jpmobile::Mobile
+  # ==BlackBerry
+  class BlackBerry < SmartPhone
+    # 対応するUser-Agentの正規表現
+    USER_AGENT_REGEXP = /BlackBerry/
+  end
+end

data/lib/jpmobile/mobile/google_emoticon.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+module Jpmobile::Mobile
+  module GoogleEmoticon
+    # Jpmobile::Rack::Filter を適用する
+    def apply_filter?
+      Jpmobile.config.smart_phone_emoticon_compatibility
+    end
+
+    # Jpmobile::Rack::ParamsFilter を適用する
+    def apply_params_filter?
+      Jpmobile.config.smart_phone_emoticon_compatibility
+    end
+
+    # 文字コード変換
+    def to_internal(str)
+      # Google絵文字を数値参照に変換
+      str = Jpmobile::Emoticon.external_to_unicodecr_google(Jpmobile::Util.utf8(str))
+      # 数値参照を UTF-8 に変換
+      Jpmobile::Emoticon.unicodecr_to_utf8(str)
+    end
+    def to_external(str, content_type, charset)
+      # UTF-8を数値参照に
+      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
+      str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false)
+
+      [str, charset]
+    end
+  end
+end

data/lib/jpmobile/mobile/ipad.rb

@@ -6,5 +6,7 @@ module Jpmobile::Mobile
   class Ipad < Tablet
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /iPad/
+
+    include Jpmobile::Mobile::UnicodeEmoticon
   end
 end

data/lib/jpmobile/mobile/iphone.rb

@@ -7,30 +7,6 @@ module Jpmobile::Mobile
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /iPhone/
 
-    # Jpmobile::Rack::Filter を適用する
-    def apply_filter?
-      true
-    end
-
-    # Jpmobile::Rack::ParamsFilter を適用する
-    def apply_params_filter?
-      true
-    end
-
-    # 文字コード変換
-    def to_internal(str)
-      # 絵文字を数値参照に変換
-      str = Jpmobile::Emoticon.external_to_unicodecr_softbank(Jpmobile::Util.utf8(str))
-      # 数値参照を UTF-8 に変換
-      Jpmobile::Emoticon.unicodecr_to_utf8(str)
-    end
-    def to_external(str, content_type, charset)
-      # UTF-8を数値参照に
-      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
-      # 数値参照を絵文字コードに変換
-      str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, false)
-
-      [str, charset]
-    end
+    include Jpmobile::Mobile::UnicodeEmoticon
   end
 end

data/lib/jpmobile/mobile/unicode_emoticon.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+module Jpmobile::Mobile
+  module UnicodeEmoticon
+    # Jpmobile::Rack::Filter を適用する
+    def apply_filter?
+      Jpmobile.config.smart_phone_emoticon_compatibility
+    end
+
+    # Jpmobile::Rack::ParamsFilter を適用する
+    def apply_params_filter?
+      Jpmobile.config.smart_phone_emoticon_compatibility
+    end
+
+    # 文字コード変換
+    def to_internal(str)
+      if unicode_emoticon?
+        # Unicode絵文字を数値参照に変換
+        str = Jpmobile::Emoticon.external_to_unicodecr_unicode60(Jpmobile::Util.utf8(str))
+      else
+        # SoftBank絵文字を数値参照に変換
+        str = Jpmobile::Emoticon.external_to_unicodecr_softbank(Jpmobile::Util.utf8(str))
+      end
+      # 数値参照を UTF-8 に変換
+      Jpmobile::Emoticon.unicodecr_to_utf8(str)
+    end
+    def to_external(str, content_type, charset)
+      # UTF-8を数値参照に
+      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
+      if unicode_emoticon?
+        str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false)
+      else
+        # 数値参照を絵文字コードに変換
+        str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, false)
+      end
+
+      [str, charset]
+    end
+
+    def unicode_emoticon?
+      @request.user_agent.match(/ OS 5_/)
+    end
+  end
+end

data/lib/jpmobile/rack.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'rack/utils'
+require 'singleton'
 
 module Jpmobile
   module Rack
@@ -12,10 +13,14 @@ module Jpmobile
   end
 
   class Configuration
+    include Singleton
+
     attr_accessor :form_accept_charset_conversion
+    attr_accessor :smart_phone_emoticon_compatibility
 
     def initialize
-      @form_accept_charset_conversion = false
+      @form_accept_charset_conversion     = false
+      @smart_phone_emoticon_compatibility = false
     end
 
     def mobile_filter

data/lib/jpmobile/rails.rb

@@ -19,7 +19,7 @@ ActiveSupport.on_load(:before_configuration) do
     class Application
       class Configuration
         def jpmobile
-          @jpmobile ||= ::Jpmobile::Configuration.new
+          @jpmobile ||= ::Jpmobile.config
         end
       end
     end

data/lib/jpmobile/util.rb

@@ -187,7 +187,7 @@ 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)
@@ -379,5 +379,19 @@ 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
   end
 end

data/spec/rack/jpmobile/black_berry_spec.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
+
+describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
+  include Rack::Test::Methods
+
+  context "端末種別で" do
+    it "BlackBerryを判別できること" do
+      res = Rack::MockRequest.env_for(
+        'http://jpmobile-rails.org/',
+        'HTTP_USER_AGENT' => 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220')
+      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+
+      env['rack.jpmobile'].class.should            == Jpmobile::Mobile::BlackBerry
+      env['rack.jpmobile'].position.should         be_nil
+      env['rack.jpmobile'].smart_phone?.should     be_true
+      env['rack.jpmobile'].supports_cookie?.should be_true
+    end
+  end
+end

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -7,6 +7,8 @@ describe "絵文字が" do
   include Jpmobile::Util
 
   before(:each) do
+    Jpmobile.config.smart_phone_emoticon_compatibility = true
+
     @docomo_cr          = "";
     @docomo_utf8        = [0xe63e].pack("U")
     @docomo_docomopoint = ""
@@ -271,4 +273,169 @@ 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