jpmobile 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bab78dead8150c7f549c51a24def0b6d7542773124441f604f44f26c3149471
-  data.tar.gz: d4dfbd95df916aad34e7aef2d2cb49ac2e5e6255252119532f423633b4721ebd
+  metadata.gz: 5d4fa2229a3c13898fc8b6606af673742dab9805d73e18805060a6eb107948a7
+  data.tar.gz: '0518495a8dc82eb71a58aa6623aeb1255920bcc602f0434b0a978f183c43f3ef'
 SHA512:
-  metadata.gz: 8ba8b8c5b09d7fa8ca65841cdd1bf30e495e28acb1b1b4a7fb17efcea063fee036828ce5d2508827adbe0dce760d4ecb74d9a5462389f93ae3e9f058ebf68b24
-  data.tar.gz: f9438f49c04aae66db70c2839f91ab0fe307fef8e17b74259ae74cfb01f7c5b62fa6819485ea150b96d80d2fd93ff8c998a7f99d1d64628ed34093f66be8c3b7
+  metadata.gz: 0f7102eefe118ccfb639a7f914b2fae3b904450b5a19e33ad3113b86b0fbeaf0be5932cffaae7f5b99d9ab1cdf07175ecc573043ebcf365f68ef97050e765a16
+  data.tar.gz: 13803d46396d2a0aec370b888566168b6399ab0ffc667e6600ce127bd1e9a7b1c6d563f42395c599ec891714d9dbb199ca860463b65c2145339f5c39ebdb635a

data/.onkcop-config.yml

@@ -122,29 +122,6 @@ Metrics/BlockLength:
     - "config/routes/**/*.rb"
     - "*.gemspec"
 
-# 6 は強すぎるので緩める
-Metrics/CyclomaticComplexity:
-  Max: 10
-
-# * 警告 120文字
-# * 禁止 160文字
-# のイメージ
-Layout/LineLength:
-  Max: 160
-  Exclude:
-    - "db/migrate/*.rb"
-
-# 20 行超えるのは migration ファイル以外滅多に無い
-Metrics/MethodLength:
-  Max: 20
-  Exclude:
-    - "db/migrate/*.rb"
-
-# 分岐の数。ガード句を多用しているとデフォルト 7 だと厳しい
-Metrics/PerceivedComplexity:
-  Max: 8
-
-
 #################### Naming ################################
 
 # has_ から始まるメソッドは許可する
@@ -202,10 +179,6 @@ Style/BlockDelimiters:
   Exclude:
     - "spec/**/*_spec.rb"
 
-# option 等、明示的にハッシュにした方が分かりやすい場合もある
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 # scope が違うとか親 module の存在確認が必要とかデメリットはあるが、
 # namespace 付きのクラスはかなり頻繁に作るので簡単に書きたい。
 Style/ClassAndModuleChildren:

data/.rubocop.yml

@@ -3,7 +3,7 @@ require: rubocop-performance
 inherit_from: './.onkcop-config.yml'
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 2.5
   Exclude:
     - 'tmp/**/*'
     - 'bin/*'
@@ -64,16 +64,20 @@ Metrics/AbcSize:
     - 'lib/jpmobile/fallback_view_selector.rb'
     - 'lib/jpmobile/resolver.rb'
     - 'lib/jpmobile/rack/filter.rb'
+    - 'lib/jpmobile/trans_sid.rb'
 
 Metrics/CyclomaticComplexity:
+  Max: 10
   Exclude:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/helpers.rb'
     - 'lib/jpmobile/mail.rb'
     - 'lib/jpmobile/mobile/au.rb'
     - 'lib/jpmobile/mobile/docomo.rb'
+    - 'lib/jpmobile/mobile/abstract_mobile.rb'
 
 Metrics/PerceivedComplexity:
+  Max: 8
   Exclude:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/helpers.rb'
@@ -81,8 +85,12 @@ Metrics/PerceivedComplexity:
     - 'lib/jpmobile/mobile/au.rb'
     - 'lib/jpmobile/mobile/docomo.rb'
     - 'lib/jpmobile/trans_sid.rb'
+    - 'lib/jpmobile/filter.rb'
+    - 'lib/jpmobile/rack/filter.rb'
+    - 'lib/jpmobile/mobile/abstract_mobile.rb'
 
 Layout/LineLength:
+  Max: 160
   Exclude:
     - '**/*_spec.rb'
     - 'lib/jpmobile/emoticon/z_combine.rb'
@@ -115,6 +123,7 @@ Metrics/ClassLength:
     - 'lib/jpmobile/mobile/docomo.rb'
 
 Metrics/MethodLength:
+  Max: 20
   Exclude:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/helpers.rb'
@@ -131,3 +140,57 @@ Lint/SuppressedException:
 Lint/Void:
   Exclude:
     - 'lib/jpmobile/filter.rb'
+
+Style/StringConcatenation:
+  Enabled: false
+
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+  Exclude:
+    - '**/*_controller.rb'
+    - '**/*_spec.rb'
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+  Exclude:
+    - 'lib/jpmobile/path_set.rb'
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: true
+Style/SwapValues: # (new in 1.1)
+  Enabled: true
+
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/jpmobile/emoticon.rb'
+    - 'lib/jpmobile/path_set.rb'
+
+Metrics/ParameterLists:
+  Exclude:
+    - 'lib/jpmobile/path_set.rb'

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in jpmobile.gemspec
 gemspec
 
-gem 'rubocop', '0.79.0', require: false
-gem 'rubocop-performance', '1.5.2', require: false
+gem 'rubocop', require: false
+gem 'rubocop-performance', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jpmobile (6.0.0)
+    jpmobile (6.1.1)
       mail (~> 2.7.0)
       rexml
       scanf
@@ -96,7 +96,6 @@ GEM
     hpricot (0.8.6)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (2.3.1)
     loofah (2.8.0)
       crass (~> 1.0.2)
@@ -114,7 +113,7 @@ GEM
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -178,13 +177,17 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.10.0)
-    rubocop (0.79.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.7.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
@@ -202,7 +205,7 @@ GEM
     thor (1.0.1)
     tzinfo (2.0.3)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -225,9 +228,9 @@ DEPENDENCIES
   rspec
   rspec-its
   rspec-rails
-  rubocop (= 0.79.0)
-  rubocop-performance (= 1.5.2)
+  rubocop
+  rubocop-performance
   sqlite3-ruby
 
 BUNDLED WITH
-   2.2.2
+   2.2.3

data/jpmobile.gemspec

@@ -16,9 +16,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
+  gem.required_ruby_version = '>= 2.5.0'
+
   gem.add_dependency 'mail', '~> 2.7.0'
-  gem.add_dependency 'scanf'
   gem.add_dependency 'rexml'
+  gem.add_dependency 'scanf'
   gem.add_development_dependency 'capybara-webkit'
   gem.add_development_dependency 'geokit'
   gem.add_development_dependency 'git'

data/lib/jpmobile.rb

@@ -63,6 +63,7 @@ module Jpmobile
   autoload :Mailer,   'jpmobile/mailer'
   autoload :Resolver, 'jpmobile/resolver'
 
+  autoload :ViewSelector,         'jpmobile/view_selector'
   autoload :FallbackViewSelector, 'jpmobile/fallback_view_selector'
 
   autoload :ParamsOverCookie,    'jpmobile/trans_sid'

data/lib/jpmobile/configuration.rb

@@ -2,9 +2,7 @@ module Jpmobile
   class Configuration
     include Singleton
 
-    attr_accessor :form_accept_charset_conversion
-    attr_accessor :smart_phone_emoticon_compatibility
-    attr_accessor :fallback_view_selector
+    attr_accessor :form_accept_charset_conversion, :smart_phone_emoticon_compatibility, :fallback_view_selector
 
     def initialize
       @form_accept_charset_conversion     = false
@@ -23,5 +21,11 @@ module Jpmobile
     def mount_session_store
       @session_store && @session_store.call
     end
+
+    module RailsConfiguration
+      def jpmobile
+        @jpmobile ||= ::Jpmobile.config
+      end
+    end
   end
 end

data/lib/jpmobile/docomo_guid.rb

@@ -30,8 +30,8 @@ module Jpmobile::DocomoGuid #:nodoc:
     return false unless request.mobile.is_a?(Jpmobile::Mobile::Docomo)
     return false if not_apply_guid_user_agent?
 
-    if docomo_guid_mode == :valid_ip
-      return false unless request.mobile.valid_ip?
+    if docomo_guid_mode == :valid_ip && !request.mobile.valid_ip?
+      return false
     end
 
     true

data/lib/jpmobile/email.rb

@@ -20,7 +20,7 @@ module Jpmobile
         Mobile.carriers.each do |const|
           c = Mobile.const_get(const)
           if c::MAIL_ADDRESS_REGEXP &&
-             header.match(/(\S+@[A-Za-z0-9\-\.\_]+)/) &&
+             header.match(/(\S+@[A-Za-z0-9\-._]+)/) &&
              Regexp.last_match(1).match(/^#{c::MAIL_ADDRESS_REGEXP}$/)
             return c
           end
@@ -33,14 +33,12 @@ module Jpmobile
         nil
       end
 
-      attr_writer :japanese_mail_address_regexp
+      attr_writer :japanese_mail_address_regexp, :converting_content_type
 
       def japanese_mail?(header)
         @japanese_mail_address_regexp and header.match(@japanese_mail_address_regexp)
       end
 
-      attr_writer :converting_content_type
-
       def converting_content_type
         @converting_content_type ||= ['text/plain', 'text/html']
       end

data/lib/jpmobile/emoticon.rb

@@ -96,20 +96,15 @@ module Jpmobile
         unicodes = match.unpack('U*')
         unicodes = unicodes.first if unicodes.size == 1
 
-        if (emoticon = UNICODE_EMOTICON_TO_CARRIER_EMOTICON[unicodes]) == GETA_CODE
-          GETA
-        elsif emoticon
-          case emoticon
-          when GETA_CODE
-            GETA
-          when Integer
-            '&#x%04x;' % emoticon
-          when String
-            emoticon
-          end
-        else
-          # 変換できなければ〓に
+        emoticon = UNICODE_EMOTICON_TO_CARRIER_EMOTICON[unicodes]
+        case emoticon
+        when GETA_CODE, nil
+          # 〓が指定されているか変換できなければ〓に
           GETA
+        when Integer
+          '&#x%04x;' % emoticon
+        when String
+          emoticon
         end
       end
     end
@@ -122,15 +117,13 @@ module Jpmobile
 
         emoticon = GOOGLE_EMOTICON_TO_CARRIER_EMOTICON[unicodes]
         case emoticon
-        when GETA_CODE
+        when GETA_CODE, nil
+          # 〓が指定されているか変換できなければ〓に
           GETA
         when Integer
           '&#x%04x;' % emoticon
         when String
           emoticon
-        else
-          # 変換できなければ〓に
-          GETA
         end
       end
     end

data/lib/jpmobile/filter.rb

@@ -54,8 +54,8 @@ module Jpmobile
       private
 
       def replace_chars(str, table)
-        @regexp_cache ||= {}
-        str.gsub(@regexp_cache[table.object_id] ||= Regexp.union(table.keys), table)
+        @regexp_cache ||= {}.compare_by_identity
+        str.gsub(@regexp_cache[table] ||= Regexp.union(table.keys), table)
       end
 
       def han_to_zen_table

data/lib/jpmobile/mail.rb

@@ -456,17 +456,17 @@ module Mail
 
     def decoded_with_jpmobile
       if @mobile
-        return value unless value =~ /\=\?[^?]+\?([QB])\?[^?]*?\?\=/mi
+        return value unless value =~ /=\?[^?]+\?([QB])\?[^?]*?\?=/mi
 
         Encodings.collapse_adjacent_encodings(value).each {|line|
-          line.gsub!(/\=\?[^?]+\?([QB])\?[^?]*?\?\=/mi) do |string|
+          line.gsub!(/=\?[^?]+\?([QB])\?[^?]*?\?=/mi) do |string|
             case Regexp.last_match(1)
             when 'B', 'b' then decode_b_value_for_mobile(string)
             when 'Q', 'q' then Encodings.q_value_decode(string)
             else line
             end
           end
-        }.join('')
+        }.join
       else
         decoded_without_jpmobile
       end
@@ -479,7 +479,7 @@ module Mail
     alias_method :decoded, :decoded_with_jpmobile
 
     def decode_b_value_for_mobile(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
+      match = str.match(/=\?(.+)?\?[Bb]\?(.*)\?=/m)
       if match
         charset = match[1]
         str = Ruby19.decode_base64(match[2])

data/lib/jpmobile/mailer.rb

@@ -1,7 +1,7 @@
 require 'jpmobile/mail'
 require 'jpmobile/lookup_context'
 
-Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z\.\-]|$)/)
+Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z.\-]|$)/)
 
 module Jpmobile
   module Mailer

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -177,7 +177,7 @@ module Jpmobile::Mobile
     end
 
     def to_mail_subject_encoded?(str)
-      str.match(/\=\?#{mail_charset}\?B.+\?\=/i)
+      str.match(/=\?#{mail_charset}\?B.+\?=/i)
     end
 
     def to_mail_body_encoded?(str)

data/lib/jpmobile/mobile/docomo.rb

@@ -44,9 +44,8 @@ module Jpmobile::Mobile
     # 端末製造番号があれば返す。無ければ +nil+ を返す。
     def serial_number
       case @env['HTTP_USER_AGENT']
-      when /ser([0-9a-zA-Z]{11})$/ # mova
-        Regexp.last_match(1)
-      when /ser([0-9a-zA-Z]{15});/ # FOMA
+      when /ser([0-9a-zA-Z]{11})$/, # mova
+           /ser([0-9a-zA-Z]{15});/ # FOMA
         Regexp.last_match(1)
       else
         nil
@@ -160,9 +159,8 @@ module Jpmobile::Mobile
     # モデル名を返す。
     def model_name
       case @env['HTTP_USER_AGENT']
-      when %r{^DoCoMo/2.0 (.+)\(}
-        Regexp.last_match(1)
-      when %r{^DoCoMo/1.0/(.+?)/}
+      when %r{^DoCoMo/2.0 (.+)\(},
+           %r{^DoCoMo/1.0/(.+?)/}
         Regexp.last_match(1)
       else
         nil

data/lib/jpmobile/rack/params_filter.rb

@@ -10,10 +10,11 @@ module Jpmobile
       if (mobile = env['rack.jpmobile']) && mobile.apply_params_filter?
         # パラメータをkey, valueに分解
         # form_params
-        unless env['REQUEST_METHOD'] == 'GET' || env['REQUEST_METHOD'] == 'HEAD'
-          unless env['CONTENT_TYPE'].match?(%r{application/json|application/xml})
-            env['rack.input'] = StringIO.new(parse_query(env['rack.input'].read, mobile))
-          end
+        if env['REQUEST_METHOD'] != 'GET' &&
+           env['REQUEST_METHOD'] != 'HEAD' &&
+           !env['CONTENT_TYPE'].match?(%r{application/json|application/xml})
+
+          env['rack.input'] = StringIO.new(parse_query(env['rack.input'].read, mobile))
         end
 
         # query_params

data/lib/jpmobile/rails.rb

@@ -33,39 +33,5 @@ ActiveSupport.on_load(:before_configuration) do
   # MobileCarrierのみデフォルトで有効
   config.middleware.insert_after ActionDispatch::Flash, ::Jpmobile::MobileCarrier
 
-  module Rails
-    class Application
-      class Configuration
-        def jpmobile
-          @jpmobile ||= ::Jpmobile.config
-        end
-      end
-    end
-  end
-end
-
-module Jpmobile
-  module ViewSelector
-    def self.included(base)
-      base.class_eval do
-        before_action :register_mobile
-
-        self._view_paths = self._view_paths.dup
-        self.view_paths.unshift(*self.view_paths.map {|resolver| Jpmobile::Resolver.new(resolver.to_path) })
-      end
-    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/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

data/lib/jpmobile/version.rb

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

data/spec/rack_helper.rb

@@ -75,8 +75,6 @@ module Jpmobile::RackHelper
     body = case res
            when Array
              res[2]
-           when String
-             res.body
            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'

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/requests/trans_sid_spec.rb

@@ -27,12 +27,12 @@ describe 'trans_sid functional', type: :request do
     it 'で link_to の自動書き換えが行われない' do
       res = get_with_session(@controller, 'link', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/.+?/link\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/.+?/link">linkto</a>})
     end
     it 'で form の自動書き換えが行われない' do
       res = get_with_session(@controller, 'form', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/.+?/form\".*accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/.+?/form".*accept-charset="#{@charset}"})
     end
     it 'で redirect の自動書き換えが行われない' do
       res = get_with_session(@controller, 'redirect', @user_agent)
@@ -45,16 +45,16 @@ describe 'trans_sid functional', type: :request do
     it 'で link_to の自動書き換えが行われる' do
       res = get_with_session(@controller, 'link', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/.+?/link\?_session_id=[a-zA-Z0-9]{32}\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/.+?/link\?_session_id=[a-zA-Z0-9]{32}">linkto</a>})
     end
     it 'で form内にhiddenが差し込まれる' do
       res = get_with_session(@controller, 'form', @user_agent)
-      expect(res.response.body).to match(/<input type=\"hidden\" name=\".+\" value=\"[a-zA-Z0-9]{32}\"/)
+      expect(res.response.body).to match(/<input type="hidden" name=".+" value="[a-zA-Z0-9]{32}"/)
     end
     it 'で form の自動書き換えが行われる' do
       res = get_with_session(@controller, 'form', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/.+?/form\?_session_id=[a-zA-Z0-9]{32}\".*accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/.+?/form\?_session_id=[a-zA-Z0-9]{32}".*accept-charset="#{@charset}"})
     end
     it 'で redirect の自動書き換えが行われる' do
       res = get_with_session(@controller, 'redirect', @user_agent)
@@ -66,12 +66,12 @@ describe 'trans_sid functional', type: :request do
     it 'で @user の link_to の自動書き換えが行われる' do
       res = get_with_session(@controller, 'link_path', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/users/1\?_session_id=[a-zA-Z0-9]{32}\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/users/1\?_session_id=[a-zA-Z0-9]{32}">linkto</a>})
     end
     it 'で @user の form の自動書き換えが行われる' do
       res = get_with_session(@controller, 'form_path', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/users/1\?_session_id=[a-zA-Z0-9]{32}\".*accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/users/1\?_session_id=[a-zA-Z0-9]{32}".*accept-charset="#{@charset}"})
     end
     it 'で @path の redirect の自動書き換えが行われる' do
       res = get_with_session(@controller, 'redirect_path', @user_agent)
@@ -83,12 +83,12 @@ describe 'trans_sid functional', type: :request do
     it 'で [:admin, @user] の link_to の自動書き換えが行われる' do
       res = get_with_session(@controller, 'link_path_admin', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/admin/users/1\?_session_id=[a-zA-Z0-9]{32}\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/admin/users/1\?_session_id=[a-zA-Z0-9]{32}">linkto</a>})
     end
     it 'で [:admin, @user] の form の自動書き換えが行われる' do
       res = get_with_session(@controller, 'form_path_admin', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/admin/users/1\?_session_id=[a-zA-Z0-9]{32}\".* accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/admin/users/1\?_session_id=[a-zA-Z0-9]{32}".* accept-charset="#{@charset}"})
     end
     it 'で [:admin, @path] の redirect の自動書き換えが行われる' do
       res = get_with_session(@controller, 'redirect_path_admin', @user_agent)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: scanf
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rexml
+  name: scanf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -478,7 +478,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="