jpmobile 5.2.3 → 6.1.0

data/lib/jpmobile/filter.rb

@@ -37,6 +37,11 @@ module Jpmobile
       }
     end
 
+    ALLOWED_CONTENT_TYPE_REGEXP = Regexp.union(
+      Regexp.escape('text/html'),
+      Regexp.escape('application/xhtml+xm'),
+    )
+
     class << self
       def hankaku_format(str)
         replace_chars(str, zen_to_han_table)
@@ -90,8 +95,8 @@ module Jpmobile
     end
 
     def apply_outgoing?
-      @controller.request.mobile? and
-        [nil, 'text/html', 'application/xhtml+xml'].include?(@controller.response.content_type)
+      @controller.request.mobile? &&
+        @controller.response.content_type&.match?(ALLOWED_CONTENT_TYPE_REGEXP)
     end
 
     def to_internal(str)

data/lib/jpmobile/hook_action_view.rb

@@ -11,18 +11,12 @@ end
 # :stopdoc:
 # accept-charset に charset を変更できるようにする
 module Jpmobile
-  module ActionView
-    module HtmlOptionsWithAcceptCharset
-      private
-
-      def html_options_for_form(url_for_options, options, *parameters_for_url)
-        super.tap do |o|
-          o['accept-charset'] = (Rails.application.config.jpmobile.form_accept_charset_conversion && request && request.mobile && request.mobile.default_charset) || o['accept-charset']
-        end
+  module HtmlOptionsWithAcceptCharset
+    def html_options_for_form(url_for_options, options)
+      super.tap do |o|
+        o['accept-charset'] = (Rails.application.config.jpmobile.form_accept_charset_conversion && request && request.mobile && request.mobile.default_charset) || o['accept-charset']
       end
     end
   end
 end
-
-::ActionView::Helpers::FormTagHelper.send :prepend, Jpmobile::ActionView::HtmlOptionsWithAcceptCharset
 #:startdoc:

data/lib/jpmobile/hook_test_request.rb

@@ -1,2 +1,2 @@
 require 'action_controller/test_case'
-ActionController::TestRequest.send :include, Jpmobile::RequestWithMobileTesting
+ActionController::TestRequest.include Jpmobile::RequestWithMobileTesting

data/lib/jpmobile/mail.rb

@@ -173,7 +173,7 @@ module Mail
       text_body_part = find_part_by_content_type('text/plain').first
       html_body_part = find_part_by_content_type('text/html').first
       html_body_part.transport_encoding = 'quoted-printable' if html_body_part
-      inline_images  = []
+      inline_images = []
       attached_files = []
       attachments.each do |p|
         if p.content_type.match(%r{^image/}) && p.content_disposition.match(/^inline/)
@@ -579,8 +579,8 @@ module Mail
 
     def get_display_name_with_jpmobile
       get_display_name_without_jpmobile
-    rescue NoMethodError => ex
-      raise ex unless ex.message.match?(/undefined method `gsub' for nil:NilClass/)
+    rescue NoMethodError => e
+      raise e unless e.message.match?(/undefined method `gsub' for nil:NilClass/)
 
       name = unquote(tree.display_name.text_value.strip.to_s)
       strip_all_comments(name.to_s)

data/lib/jpmobile/mobile/android.rb

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

data/lib/jpmobile/mobile/au.rb

@@ -6,9 +6,9 @@ module Jpmobile::Mobile
   class Au < AbstractMobile
     # 対応するUser-Agentの正規表現
     # User-Agent文字列中に "UP.Browser" を含むVodafoneの端末があるので注意が必要
-    USER_AGENT_REGEXP = %r{^(?:KDDI|UP.Browser/.+?)-(.+?) }
+    USER_AGENT_REGEXP = %r{^(?:KDDI|UP.Browser/.+?)-(.+?) }.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/.freeze
     # 簡易位置情報取得に対応していないデバイスID
     # http://www.au.kddi.com/ezfactory/tec/spec/eznavi.html
     LOCATION_UNSUPPORTED_DEVICE_ID = %w[PT21 TS25 KCTE TST9 KCU1 SYT5 KCTD TST8 TST7 KCTC SYT4 KCTB KCTA TST6 KCT9 TST5 TST4 KCT8 SYT3 KCT7 MIT1 MAT3 KCT6 TST3 KCT5 KCT4 SYT2 MAT1 MAT2 TST2 KCT3 KCT2 KCT1 TST1 SYT1].freeze

data/lib/jpmobile/mobile/black_berry.rb

@@ -4,6 +4,6 @@ module Jpmobile::Mobile
   # ==BlackBerry
   class BlackBerry < SmartPhone
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /BlackBerry/
+    USER_AGENT_REGEXP = /BlackBerry/.freeze
   end
 end

data/lib/jpmobile/mobile/ddipocket.rb

@@ -4,7 +4,7 @@ module Jpmobile::Mobile
   # スーパクラスはWillcom。
   class Ddipocket < Willcom
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(DDIPOCKET}
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(DDIPOCKET}.freeze
 
     MAIL_ADDRESS_REGEXP = nil # DdipocketはEmail判定だとWillcomと判定させたい
   end

data/lib/jpmobile/mobile/docomo.rb

@@ -4,9 +4,9 @@ module Jpmobile::Mobile
   # ==DoCoMo携帯電話
   class Docomo < AbstractMobile
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /^DoCoMo/
+    USER_AGENT_REGEXP = /^DoCoMo/.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/.freeze
     # メールのデフォルトのcharset
     MAIL_CHARSET = 'Shift_JIS'.freeze
     # テキスト部分の content-transfer-encoding

data/lib/jpmobile/mobile/emobile.rb

@@ -3,9 +3,9 @@
 module Jpmobile::Mobile
   # ==EMOBILE携帯電話
   class Emobile < AbstractMobile
-    USER_AGENT_REGEXP = %r{^emobile/|^Mozilla/5.0 \(H11T; like Gecko; OpenBrowser\) NetFront/3.4$|^Mozilla/4.0 \(compatible; MSIE 6.0; Windows CE; IEMobile 7.7\) S11HT$}
+    USER_AGENT_REGEXP = %r{^emobile/|^Mozilla/5.0 \(H11T; like Gecko; OpenBrowser\) NetFront/3.4$|^Mozilla/4.0 \(compatible; MSIE 6.0; Windows CE; IEMobile 7.7\) S11HT$}.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@emnet\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@emnet\.ne\.jp/.freeze
     # EMnet対応端末から通知されるユニークなユーザIDを取得する。
     def em_uid
       @request.env['HTTP_X_EM_UID']

data/lib/jpmobile/mobile/ipad.rb

@@ -6,6 +6,6 @@ module Jpmobile::Mobile
     include Jpmobile::Mobile::UnicodeEmoticon
 
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /iPad/
+    USER_AGENT_REGEXP = /iPad/.freeze
   end
 end

data/lib/jpmobile/mobile/iphone.rb

@@ -6,6 +6,6 @@ module Jpmobile::Mobile
     include Jpmobile::Mobile::UnicodeEmoticon
 
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /iPhone/
+    USER_AGENT_REGEXP = /iPhone/.freeze
   end
 end

data/lib/jpmobile/mobile/softbank.rb

@@ -5,9 +5,9 @@ module Jpmobile::Mobile
   # Vodafoneのスーパクラス。
   class Softbank < AbstractMobile
     # 対応するuser-agentの正規表現
-    USER_AGENT_REGEXP = /^(?:SoftBank|Semulator)/
+    USER_AGENT_REGEXP = /^(?:SoftBank|Semulator)/.freeze
     # 対応するメールアドレスの正規表現　ディズニーモバイル対応
-    MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/
+    MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/.freeze
     # メールのデフォルトのcharset
     MAIL_CHARSET = 'Shift_JIS'.freeze
     # テキスト部分の content-transfer-encoding

data/lib/jpmobile/mobile/vodafone.rb

@@ -4,9 +4,9 @@ module Jpmobile::Mobile
   # スーパクラスはSoftbank。
   class Vodafone < Softbank
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/
+    USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/.freeze
 
     # cookieに対応しているか？
     def supports_cookie?

data/lib/jpmobile/mobile/willcom.rb

@@ -4,9 +4,9 @@ module Jpmobile::Mobile
   # Ddipocketのスーパクラス。
   class Willcom < AbstractMobile
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(WILLCOM}
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(WILLCOM}.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/
+    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/.freeze
 
     # 位置情報があれば Position のインスタンスを返す。無ければ +nil+ を返す。
     def position

data/lib/jpmobile/mobile/windows_phone.rb

@@ -4,6 +4,6 @@ module Jpmobile::Mobile
   # ==WindowsPhone
   class WindowsPhone < SmartPhone
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /Windows Phone/
+    USER_AGENT_REGEXP = /Windows Phone/.freeze
   end
 end

data/lib/jpmobile/rails.rb

@@ -4,24 +4,26 @@ ActiveSupport.on_load(:action_controller) do
   require 'jpmobile/helpers'
   require 'jpmobile/trans_sid'
   require 'jpmobile/hook_test_request'
-  ActionDispatch::Request.send :prepend, Jpmobile::Encoding
-  ActionDispatch::Request.send :include, Jpmobile::RequestWithMobile
-  ActionController::Base.send :prepend, Jpmobile::FallbackViewSelector
-  ActionController::Base.send :prepend, Jpmobile::TransSidRedirecting
+  ActionDispatch::Request.prepend Jpmobile::Encoding
+  ActionDispatch::Request.include Jpmobile::RequestWithMobile
+  ActionController::Base.prepend Jpmobile::FallbackViewSelector
+  ActionController::Base.prepend Jpmobile::TransSidRedirecting
 end
 
 ActiveSupport.on_load(:action_view) do
   require 'jpmobile/hook_action_view'
+
+  self.prepend Jpmobile::HtmlOptionsWithAcceptCharset
 end
 
 ActiveSupport.on_load(:after_initialize) do
   case Rails.application.config.session_store.to_s
   when 'ActionDispatch::Session::MemCacheStore'
     require 'jpmobile/session/mem_cache_store'
-    ActionDispatch::Session::MemCacheStore.send :prepend, Jpmobile::ParamsOverCookie
+    ActionDispatch::Session::MemCacheStore.prepend Jpmobile::ParamsOverCookie
   when 'ActionDispatch::Session::ActiveRecordStore'
     require 'jpmobile/session/active_record_store'
-    ActionDispatch::Session::AbstractStore.send :prepend, Jpmobile::ParamsOverCookie
+    ActionDispatch::Session::AbstractStore.prepend Jpmobile::ParamsOverCookie
   else
     Rails.application.config.jpmobile.mount_session_store
   end

data/lib/jpmobile/resolver.rb

@@ -1,47 +1,14 @@
 module Jpmobile
-  class Resolver < ActionView::FileSystemResolver
+  class Resolver < ::ActionView::FileSystemResolver
     EXTENSIONS = [:locale, :formats, :handlers, :mobile].freeze
     DEFAULT_PATTERN = ':prefix/:action{_:mobile,}{.:locale,}{.:formats,}{+:variants,}{.:handlers,}'.freeze
 
-    def initialize(path, pattern = nil)
+    def initialize(path)
       raise ArgumentError, 'path already is a Resolver class' if path.is_a?(Resolver)
 
-      super(path, pattern || DEFAULT_PATTERN)
+      super
+      @pattern = DEFAULT_PATTERN
       @path = File.expand_path(path)
     end
-
-    private
-
-    def query(path, details, formats, outside_app_allowed)
-      query = build_query(path, details)
-
-      template_paths = find_template_paths(query)
-      template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
-
-      template_paths.map do |template|
-        handler, format, variant = extract_handler_and_format_and_variant(template)
-        contents = File.binread(template)
-
-        virtual_path = if format
-                         if template =~ /.+#{path}(.+)\.#{format.to_sym.to_s}.*$/
-                           path.to_str + Regexp.last_match(1)
-                         else
-                           path.virtual
-                         end
-                       else
-                         path.virtual
-                       end
-
-        ActionView::Template.new(
-          contents,
-          File.expand_path(template),
-          handler,
-          virtual_path: virtual_path,
-          format: format,
-          variant: variant,
-          updated_at: mtime(template),
-        )
-      end
-    end
   end
 end

data/lib/jpmobile/session/active_record_store.rb

@@ -8,4 +8,4 @@ module Jpmobile
   end
 end
 
-ActionDispatch::Session::ActiveRecordStore.send :prepend, Jpmobile::ActiveRecordStoreRegenerateSessionId
+ActionDispatch::Session::ActiveRecordStore.prepend Jpmobile::ActiveRecordStoreRegenerateSessionId

data/lib/jpmobile/session/mem_cache_store.rb

@@ -8,4 +8,4 @@ module Jpmobile
   end
 end
 
-ActionDispatch::Session::MemCacheStore.send :prepend, Jpmobile::MemCacheStoreRegenerateSessionId
+ActionDispatch::Session::MemCacheStore.prepend Jpmobile::MemCacheStoreRegenerateSessionId

data/lib/jpmobile/trans_sid.rb

@@ -51,7 +51,7 @@ module Jpmobile
 
     # session_idを埋め込むためのhidden fieldを出力する。
     def sid_hidden_field_tag
-      "<input type=\"hidden\" name=\"#{CGI.escapeHTML session_key}\" value=\"#{CGI.escapeHTML jpmobile_session_id}\" />"
+      "<input type=\"hidden\" name=\"#{CGI.escapeHTML(session_key.to_s)}\" value=\"#{CGI.escapeHTML(jpmobile_session_id.to_s)}\" />"
     end
 
     # formにsession_idを追加する。

data/lib/jpmobile/util.rb

@@ -312,9 +312,9 @@ module Jpmobile
     def decode(str, encoding, charset)
       _str = case encoding
              when /quoted-printable/i
-               str.unpack('M').first.strip
+               str.unpack1('M').strip
              when /base64/i
-               str.unpack('m').first.strip
+               str.unpack1('m').strip
              else
                str
              end

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '5.2.3'.freeze
+  VERSION = '6.1.0'.freeze
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -33,7 +33,7 @@ namespace :test do
       # generate rails app
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `rails new #{rails_root} --skip-bundle`
+      `rails new #{rails_root} --skip-bundle --skip-bootsnap --skip-webpack-install --skip-git --skip-spring`
     end
 
     # setup jpmobile
@@ -94,8 +94,8 @@ namespace :test do
 
     unless skip
       # add gems for jpmobile spec
-      config_path = File.join(rails_root, 'Gemfile')
-      File.open(config_path, 'a+') do |file|
+      gemfile_path = File.join(rails_root, 'Gemfile')
+      File.open(gemfile_path, 'a+') do |file|
         file.write <<-GEMFILE
         instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
         GEMFILE
@@ -104,7 +104,7 @@ namespace :test do
 
     # run tests in rails
     Dir.chdir(rails_root) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         original_env = ENV.to_hash
 
         ENV.update('RBENV_VERSION' => nil)

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -28,23 +28,23 @@ describe '絵文字が' do
     end
 
     it 'docomo 絵文字が変換されないこと' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)
       expect(response_body(response)).to eq(@docomo_cr)
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)
       expect(response_body(response)).to eq(@docomo_utf8)
     end
 
     it 'au 絵文字が変換されないこと' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)
       expect(response_body(response)).to eq(@au_cr)
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)
       expect(response_body(response)).to eq(@au_utf8)
     end
 
     it 'softbank 絵文字が変換されないこと' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)
       expect(response_body(response)).to eq(@softbank_cr)
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
       expect(response_body(response)).to eq(@softbank_utf8)
     end
   end
@@ -72,38 +72,38 @@ describe '絵文字が' do
     end
 
     it 'docomo 絵文字が画像に変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it 'docomo 絵文字コードが画像に変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it 'au 絵文字が画像に変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it 'au 絵文字コードが画像に変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it 'softbank 絵文字が画像に変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it 'softbank 絵文字コードが画像に変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it 'Content-Type が変換できないものである場合には変換しないこと' do
       @res = Rack::MockRequest.env_for('/', 'Content-Type' => 'image/jpeg')
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
       expect(response_body(response)).to eq(@softbank_utf8)
     end
   end
@@ -118,26 +118,26 @@ describe '絵文字が' do
     end
 
     it 'docomo 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
 
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf9\x79"))
     end
 
     it 'au 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
     end
 
     it 'softbank 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
     end
 
@@ -167,26 +167,26 @@ describe '絵文字が' do
     end
 
     it 'docomo 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
 
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)
       expect(response_body(response)).to eq(utf8_to_sjis('［ドコモポイント］'))
     end
 
     it 'au 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
     end
 
     it 'softbank 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
     end
 
@@ -216,26 +216,26 @@ describe '絵文字が' do
     end
 
     it 'docomo 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
 
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)
       expect(response_body(response)).to eq('［ドコモポイント］')
     end
 
     it 'au 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
     it 'softbank 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
@@ -265,9 +265,9 @@ describe '絵文字が' do
     end
 
     it 'softbank 絵文字が変換されること' do
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
       expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
@@ -298,9 +298,9 @@ describe '絵文字が' do
       end
 
       it 'should convert Softbank emoticon' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)
         expect(response_body(response)).to eq([0xe04a].pack('U'))
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)
         expect(response_body(response)).to eq([0xe04a].pack('U'))
       end
 
@@ -320,7 +320,7 @@ describe '絵文字が' do
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)
         expect(response_body(response)).to eq('〓')
       end
     end
@@ -337,9 +337,9 @@ describe '絵文字が' do
       end
 
       it 'should convert Unicode emoticon' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@unicode_single))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@unicode_single))).call(@res)
         expect(response_body(response)).to eq([0x2600].pack('U*'))
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)
         expect(response_body(response)).to eq([0x26C5].pack('U*'))
       end
 
@@ -359,7 +359,7 @@ describe '絵文字が' do
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)
         expect(response_body(response)).to eq('〓')
       end
     end
@@ -381,9 +381,9 @@ describe '絵文字が' do
       end
 
       it 'should convert Google emoticon' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_single))).call(@res)
         expect(response_body(response)).to eq([0xFE000].pack('U*'))
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_multi))).call(@res)
         expect(response_body(response)).to eq([0xFE00F].pack('U*'))
       end
 
@@ -403,7 +403,7 @@ describe '絵文字が' do
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)
         expect(response_body(response)).to eq('〓')
       end
     end
@@ -418,9 +418,9 @@ describe '絵文字が' do
       end
 
       it 'should convert Google emoticon' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_single))).call(@res)
         expect(response_body(response)).to eq([0xFE000].pack('U*'))
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_multi))).call(@res)
         expect(response_body(response)).to eq([0xFE00F].pack('U*'))
       end
 
@@ -440,7 +440,7 @@ describe '絵文字が' do
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)
         expect(response_body(response)).to eq('〓')
       end