jpmobile 6.0.0 → 7.0.0

data/lib/jpmobile/template_details.rb

@@ -0,0 +1,38 @@
+module Jpmobile
+  class TemplateDetails < ActionView::TemplateDetails
+    def initialize(locale, handler, format, variant, mobile)
+      @mobile = mobile
+
+      super(locale, handler, format, variant)
+    end
+
+    def matches?(requested)
+      requested.formats_idx[@format] &&
+        requested.locale_idx[@locale] &&
+        requested.variants_idx[@variant] &&
+        requested.handlers_idx[@handler] &&
+        requested.mobile_idx[@mobile]
+    end
+
+    def sort_key_for(requested)
+      [
+        requested.formats_idx[@format],
+        requested.locale_idx[@locale],
+        requested.variants_idx[@variant],
+        requested.handlers_idx[@handler],
+        requested.mobile_idx[@mobile],
+      ]
+    end
+
+    class Requested < ActionView::TemplateDetails::Requested
+      attr_reader :mobile, :mobile_idx
+
+      def initialize(locale:, handlers:, formats:, variants:, mobile:)
+        super(locale: locale, handlers: handlers, formats: formats, variants: variants)
+
+        @mobile = mobile.map(&:to_sym)
+        @mobile_idx = build_idx_hash(mobile)
+      end
+    end
+  end
+end

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を追加する。
@@ -91,7 +91,7 @@ module Jpmobile
 end
 
 module ActionController
-  class Metal #:nodoc:
+  class Metal # :nodoc:
     class_attribute :trans_sid_mode
 
     class << self

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
@@ -292,12 +291,12 @@ module Jpmobile
     def split_text(str, size = 15)
       return nil if str.nil? || (str == '')
 
-      [str[0..(size - 1)], str[size..-1]]
+      [str[0..(size - 1)], str[size..]]
     end
 
     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

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '6.0.0'.freeze
+  VERSION = '7.0.0'.freeze
 end

data/lib/jpmobile/view_selector.rb

@@ -0,0 +1,25 @@
+module Jpmobile
+  module ViewSelector
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :register_mobile
+
+      self.view_paths = Jpmobile::PathSet.new(self.view_paths.paths.map(&:path))
+    end
+
+    def register_mobile
+      if request.mobile
+        # register mobile
+        self.lookup_context.mobile = request.mobile.variants
+      end
+    end
+
+    def disable_mobile_view!
+      self.lookup_context.mobile = []
+    end
+
+    private :register_mobile, :disable_mobile_view!
+  end
+  Rails::Application::Configuration.include Jpmobile::Configuration::RailsConfiguration
+end

data/lib/jpmobile.rb

@@ -48,9 +48,19 @@ module Jpmobile
     end
 
     def self.carriers=(ary)
+      @all_variants = nil
+
       @carriers = ary
     end
 
+    def self.all_variants
+      return @all_variants if @all_variants
+
+      @all_variants = carriers.map {|carrier|
+        Jpmobile::Mobile.const_get(carrier).new({}, {}).variants
+      }.flatten.uniq
+    end
+
     require 'jpmobile/mobile/abstract_mobile'
   end
 
@@ -63,6 +73,10 @@ module Jpmobile
   autoload :Mailer,   'jpmobile/mailer'
   autoload :Resolver, 'jpmobile/resolver'
 
+  autoload :PathSet,         'jpmobile/path_set'
+  autoload :TemplateDetails, 'jpmobile/template_details'
+
+  autoload :ViewSelector,         'jpmobile/view_selector'
   autoload :FallbackViewSelector, 'jpmobile/fallback_view_selector'
 
   autoload :ParamsOverCookie,    'jpmobile/trans_sid'

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
@@ -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)
@@ -112,12 +112,13 @@ namespace :test do
 
         system 'bundle install'
         system 'bin/rails db:migrate RAILS_ENV=test' unless skip
-        system 'bin/rails spec'
+        system 'bin/rails spec', exception: true
 
         ENV.replace(original_env)
       end
     end
   end
+
   desc 'Run sinatra on jpmobile tests'
   Rake::TestTask.new(:sinatra) do |t|
     t.libs << 'lib'

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/jpmobile/mobile_by_ua_spec.rb

@@ -17,6 +17,7 @@ describe Jpmobile::MobileCarrier do
     [Jpmobile::Mobile::Emobile, 'emobile/1.0.0 (H11T; like Gecko; Wireless) NetFront/3.4'],
     [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::Android, 'Mozilla/5.0 (Linux; Android 9; ANE-LX2J Build/HUAWEIANE-LX2J; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/88.0.4324.93 Mobile Safari/537.36 Instagram 172.0.0.21.123 Android (28/9; 480dpi; 1080x2060; HUAWEI; ANE-LX2J; HWANE; hi6250; ja_JP; 269790805)'],
     [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'],

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

data/test/rails/overrides/Gemfile.jpmobile

@@ -4,7 +4,7 @@ gem 'jpmobile',             path: './vendor/jpmobile'
 gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
-gem 'activerecord-session_store', '~> 1.1.1'
+gem 'activerecord-session_store', git: 'https://github.com/rails/activerecord-session_store.git', ref: 'f188efbc49a522123cc8acc805143824176d01c1'
 
 gem 'pry'
 gem 'pry-byebug'
@@ -14,3 +14,7 @@ group :development, :test do
   gem "rspec-rails"
   gem 'rails-controller-testing'
 end
+
+group :test do
+  gem 'cuprite'
+end

data/test/rails/overrides/app/controllers/mobile_spec_controller.rb

@@ -8,6 +8,6 @@ class MobileSpecController < ApplicationController
     render file: File.join(Rails.public_path, '422.html')
   end
 
-  def no_mobile
+  def mobile_not_exist
   end
 end

data/test/rails/overrides/app/controllers/template_path_controller.rb

@@ -10,6 +10,9 @@ class TemplatePathController < ApplicationController
   def show
   end
 
+  def partial
+  end
+
   def optioned_index
     render action: 'index'
   end

data/test/rails/overrides/app/views/mobile_spec/mobile_not_exist.html.erb

@@ -0,0 +1,3 @@
+PC mobile_not_exist
+
+<%= render 'partial_view_sample' -%>

data/test/rails/overrides/config/routes.rb

@@ -61,7 +61,7 @@ RailsRoot::Application.routes.draw do
   %w[
     index
     file_render
-    no_mobile
+    mobile_not_exist
   ].each do |a|
     get "mobile_spec/#{a}", to: "mobile_spec##{a}"
   end

data/test/rails/overrides/db/migrate/{20190419005447_create_active_storage_tables.active_storage.rb → 20201111033056_create_active_storage_tables.active_storage.rb}

@@ -2,13 +2,14 @@
 class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
   def change
     create_table :active_storage_blobs do |t|
-      t.string   :key,        null: false
-      t.string   :filename,   null: false
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
       t.string   :content_type
       t.text     :metadata
-      t.bigint   :byte_size,  null: false
-      t.string   :checksum,   null: false
-      t.datetime :created_at, null: false
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum,     null: false
+      t.datetime :created_at,   null: false
 
       t.index [:key], unique: true
     end
@@ -23,5 +24,13 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
       t.index [:record_type, :record_id, :name, :blob_id], name: 'index_active_storage_attachments_uniqueness', unique: true
       t.foreign_key :active_storage_blobs, column: :blob_id
     end
+
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index %i[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
   end
 end

data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb

@@ -6,7 +6,7 @@ shared_examples_for 'docomo_guid が起動しないとき' do
   it 'で link_to の自動書き換えが行われない' do
     get :link
 
-    expect(response.body).to match(%r{href=\".+/link\"})
+    expect(response.body).to match(%r{href=".+/link"})
   end
 end
 
@@ -14,7 +14,7 @@ shared_examples_for 'docomo_guid が起動するとき' do
   it 'で link_to の自動書き換えが行われる' do
     get :link
 
-    expect(response.body).to match(%r{href=\".+/link\?guid=ON\"})
+    expect(response.body).to match(%r{href=".+/link\?guid=ON"})
   end
 end
 

data/test/rails/overrides/spec/controllers/mobile_spec_controller_spec.rb

@@ -52,7 +52,7 @@ describe MobileSpecController, type: :controller do
     end
   end
 
-  describe "GET 'no_mobile'" do
+  describe "GET 'mobile_not_exist'" do
     around do |example|
       orig_value = Jpmobile.config.fallback_view_selector
       Jpmobile.config.fallback_view_selector = true
@@ -65,7 +65,7 @@ describe MobileSpecController, type: :controller do
     context 'PC access' do
       it 'should be successful' do
         request.user_agent = 'Mozilla'
-        get 'no_mobile'
+        get 'mobile_not_exist'
 
         expect(response).to be_successful
         expect(response.body).not_to match('RailsRoot PC mobile')
@@ -75,7 +75,7 @@ describe MobileSpecController, type: :controller do
     context 'mobile access' do
       it 'should be successful' do
         request.user_agent = 'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
-        get 'no_mobile'
+        get 'mobile_not_exist'
 
         expect(response).to be_successful
         expect(response.body).not_to match('RailsRoot mobile')

data/test/rails/overrides/spec/rails_helper.rb

@@ -48,7 +48,7 @@ RSpec.configure do |config|
   #       # ...
   #     end
   #
-  # The different available types are documented in the features, such as in
+  # The different available types are documented in the system, such as in
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!