jpmobile 5.2.4 → 6.1.1

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

@@ -255,9 +255,8 @@ module Jpmobile
         SJIS
       when ::Encoding::UTF_8
         UTF8
-      when ::Encoding::ASCII_8BIT
-        BINARY
       else
+        # 上記以外はすべて BINARY 扱い
         BINARY
       end
     end
@@ -297,7 +296,7 @@ module Jpmobile
 
     def invert_table(hash)
       result = {}
-      hash.keys.each do |key|
+      hash.each_key do |key|
         if result[hash[key]]
           if !key.is_a?(Array) && !result[hash[key]].is_a?(Array) && result[hash[key]] > key
             result[hash[key]] = key
@@ -312,9 +311,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.4'.freeze
+  VERSION = '6.1.1'.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
 

data/spec/rack_helper.rb

@@ -74,9 +74,7 @@ module Jpmobile::RackHelper
   def response_body(res)
     body = case res
            when Array
-             res[2].body
-           when String
-             res.body
+             res[2]
            else
              res.body
            end
@@ -84,8 +82,6 @@ module Jpmobile::RackHelper
     case body
     when Array
       body.first
-    when String
-      body
     else
       body
     end

data/spec/unit/email_spec.rb

@@ -56,7 +56,7 @@ describe 'Jpmobile::Email' do
 
   describe 'japanese_mail_address_regexp' do
     before do
-      Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z\.\-]|$)/)
+      Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z.\-]|$)/)
     end
 
     it '#detect_from_mail_header should return Jpmobile::Mobile::AbstractMobile when the header contains .jp address' do

data/spec/unit/receive_mail_spec.rb

@@ -7,7 +7,7 @@ describe 'Jpmobile::Mail#receive' do
 
   before(:each) do
     @to = 'info@jpmobile-rails.org'
-    Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z\.\-]/)
+    Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z.\-]/)
   end
 
   describe 'PC mail' do
@@ -84,7 +84,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Docomo' do
       context 'with sjis decomail' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/docomo-gmail-sjis.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -129,7 +129,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'Au' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/au-decomail.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml')).read)
       end
 
       it 'subject should be parsed correctly' do
@@ -151,7 +151,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Softbank' do
       context 'Shift_JIS' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-sjis.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -170,7 +170,7 @@ describe 'Jpmobile::Mail#receive' do
 
       context 'UTF-8' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-utf8.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-utf8.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -304,13 +304,13 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'From au iPhone' do
       it 'charset should be UTF-8' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-message.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
         expect(@mail.mobile).to be_a(Jpmobile::Mobile::Au)
         expect(@mail.charset).to match(/utf-8/i)
       end
 
       it 'should be encoded correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-message.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
         expect(@mail.encoded).to match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
       end
 
@@ -435,7 +435,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'bounced mail' do
     context 'has jp address' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/bounced-jp.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/bounced-jp.eml')).read)
       end
 
       it 'mobile should abstract mobile' do
@@ -447,7 +447,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'non-Japanese mail' do
     context 'us-ascii' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/non-jp.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/non-jp.eml')).read)
       end
 
       it 'mobile should be nil' do
@@ -458,7 +458,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'no From header' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/no-from.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/no-from.eml')).read)
       end
 
       it 'mobile should be nil' do