jpmobile 7.1.0 → 7.2.0

data/lib/jpmobile/mail.rb

@@ -2,14 +2,6 @@ require 'mail'
 
 module Mail
   # encoding patch
-  Ruby19.class_eval do
-    # change encoding
-    def self.b_value_encode(str, encoding = nil)
-      str = Jpmobile::Util.encode(str, encoding.to_s)
-      [Ruby19.encode_base64(str), encoding]
-    end
-  end
-
   class Message
     attr_reader :mobile
 
@@ -55,7 +47,9 @@ module Mail
 
     def parse_message_with_jpmobile
       _crlf_raw_source = raw_source.encode(raw_source.encoding, universal_newline: true).encode!(raw_source.encoding, crlf_newline: true)
-      header_part, body_part = _crlf_raw_source.lstrip.split(/#{CRLF}#{CRLF}|#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/mo, 2)
+      header_part, body_part = _crlf_raw_source.lstrip.split(
+        /#{Constants::CRLF}#{Constants::CRLF}|#{Constants::CRLF}#{Constants::WSP}*#{Constants::CRLF}(?!#{Constants::WSP})/mo, 2
+      )
       # header_part, body_part = raw_source.lstrip.split(HEADER_SEPARATOR, 2)
 
       self.header = header_part
@@ -277,9 +271,9 @@ module Mail
     end
 
     def parse_message_with_jpmobile
-      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/mo, 2)
+      header_part, body_part = raw_source.split(/#{Constants::CRLF}#{Constants::WSP}*#{Constants::CRLF}/mo, 2)
 
-      self.header = if header_part && header_part.match(HEADER_LINE)
+      self.header = if header_part && header_part.match(Constants::HEADER_LINE)
                       header_part
                     else
                       "Content-Type: text/plain\r\n"
@@ -321,7 +315,7 @@ module Mail
                         end
           Jpmobile::Util.set_encoding(_raw_source, @mobile.mail_charset(@charset))
         when /quoted-printable/
-          Jpmobile::Util.set_encoding([@mobile.to_mail_body(@raw_source)].pack('M').gsub(/\n/, "\r\n"), @mobile.mail_charset(@charset))
+          Jpmobile::Util.set_encoding([@mobile.to_mail_body(@raw_source)].pack('M').gsub("\n", "\r\n"), @mobile.mail_charset(@charset))
         else
           @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, nil, Jpmobile::Util::UTF8))
         end
@@ -429,6 +423,10 @@ module Mail
     end
   end
 
+  class NamedUnstructuredField
+    attr_accessor :mobile
+  end
+
   class UnstructuredField
     attr_accessor :mobile
   end
@@ -440,7 +438,7 @@ module Mail
   end
 
   # for subject
-  class SubjectField < UnstructuredField
+  class SubjectField < NamedUnstructuredField
     def encoded_with_jpmobile
       if @mobile
         if @mobile.to_mail_subject_encoded?(value)
@@ -482,7 +480,7 @@ module Mail
       match = str.match(/=\?(.+)?\?[Bb]\?(.*)\?=/m)
       if match
         charset = match[1]
-        str = Ruby19.decode_base64(match[2])
+        str = Utilities.decode_base64(match[2])
         @mobile.decode_transfer_encoding(str, charset)
       else
         str
@@ -494,7 +492,7 @@ module Mail
     attr_accessor :mobile
   end
 
-  class FromField < StructuredField
+  class FromField < CommonAddressField
     def initialize_with_jpmobile(value = nil, charset = 'utf-8')
       @jpmobile_raw_text = value
       initialize_without_jpmobile(value, charset)
@@ -516,14 +514,14 @@ module Mail
       if @mobile
         self.charset = @mobile.mail_charset
 
-        _value = address_list.addresses.map {|_a|
+        _value = element.addresses.map {|_a|
           if Utilities.blank?(_a.display_name) || _a.display_name.ascii_only?
             _a.to_s
           else
             "#{@mobile.to_mail_subject(_a.display_name)} <#{_a.address}>"
           end
         }.join(', ')
-        @address_list = AddressList.new(_value)
+        @element = AddressList.new(_value)
       end
 
       encoded_without_jpmobile
@@ -533,7 +531,7 @@ module Mail
     alias_method :encoded, :encoded_with_jpmobile
   end
 
-  class ToField < StructuredField
+  class ToField < CommonAddressField
     def initialize_with_jpmobile(value = nil, charset = 'utf-8')
       @jpmobile_raw_text = value
       initialize_without_jpmobile(value, charset)
@@ -555,14 +553,14 @@ module Mail
       if @mobile
         self.charset = @mobile.mail_charset
 
-        _value = address_list.addresses.map {|_a|
+        _value = element.addresses.map {|_a|
           if Utilities.blank?(_a.display_name) || _a.display_name.ascii_only?
             _a.to_s
           else
             "#{@mobile.to_mail_subject(_a.display_name)} <#{_a.address}>"
           end
         }.join(', ')
-        @address_list = AddressList.new(_value)
+        @element = AddressList.new(_value)
       end
 
       encoded_without_jpmobile
@@ -596,7 +594,7 @@ module Mail
   class ContentTypeElement # :nodoc:
     def initialize_with_jpmobile(string)
       if (m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/)) &&
-         m[4].each_byte.detect {|b| (b == 0 || b > 127) }
+         m[4].each_byte.detect {|b| b == 0 || b > 127 }
         name = [m[4]].pack('m').strip
         string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
       end
@@ -610,7 +608,7 @@ module Mail
   class ContentDispositionElement # :nodoc:
     def initialize_with_jpmobile(string)
       if (m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/)) &&
-         m[4].each_byte.detect {|b| (b == 0 || b > 127) }
+         m[4].each_byte.detect {|b| b == 0 || b > 127 }
         name = [m[4]].pack('m').strip
         string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
       end
@@ -624,7 +622,7 @@ module Mail
   class ContentLocationElement # :nodoc:
     def initialize_with_jpmobile(string)
       if (m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/)) &&
-         m[4].each_byte.detect {|b| (b == 0 || b > 127) }
+         m[4].each_byte.detect {|b| b == 0 || b > 127 }
         name = [m[4]].pack('m').strip
         string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
       end
@@ -647,7 +645,7 @@ module Mail
       end
 
       IO.popen("#{path} #{arguments} #{destinations}", 'w+') do |io|
-        io.puts encoded_mail.gsub(/\r\r\n/, "\n").to_lf
+        io.puts encoded_mail.gsub("\r\r\n", "\n").to_lf
         io.flush
       end
     end

data/lib/jpmobile/mailer.rb

@@ -1,14 +1,14 @@
 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 = /\.jp(?:[^a-zA-Z.-]|$)/
 
 module Jpmobile
   module Mailer
     class Base < ActionMailer::Base
       self.prepend_view_path(Jpmobile::Resolver.new(File.join(::Rails.root, 'app/views')))
 
-      def mail(headers = {}, &block)
+      def mail(headers = {}, &)
         tos = headers[:to] || self.default_params[:to]
         tos = tos.split(',')
 
@@ -23,7 +23,7 @@ module Jpmobile
 
         @mobile.decorated = headers.delete(:decorated)
 
-        m = super(headers, &block)
+        m = super
 
         m.mobile = @mobile
 
@@ -39,7 +39,7 @@ module Jpmobile
         def set_payload_for_mail(payload, mail) # :nodoc:
           super
 
-          payload[:mail] = Jpmobile::Util.ascii_8bit(mail.encoded).gsub(/\r\n/, "\n")
+          payload[:mail] = Jpmobile::Util.ascii_8bit(mail.encoded).gsub("\r\n", "\n")
         end
       end
     end

data/lib/jpmobile/method_less_action_support.rb

@@ -1,10 +1,10 @@
 module Jpmobile
   module MethodLessActionSupport
-    def template_exists?(*args, **kwargs, &block)
+    def template_exists?(*, **kwargs, &)
       super(
-        *args,
+        *,
         **kwargs.reverse_merge(mobile: request.mobile&.variants || []),
-        &block
+        &
       )
     end
   end

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -96,11 +96,11 @@ module Jpmobile::Mobile
 
       @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/ && c.to_s !~ /Emoticon/ }.map do |klass|
         klass = klass.to_s.
-                  gsub(/Jpmobile::/, '').
-                  gsub(/AbstractMobile::/, '').
-                  gsub(/Mobile::SmartPhone/, 'smart_phone').
-                  gsub(/Mobile::Tablet/, 'tablet').
-                  gsub(/::/, '_').
+                  gsub('Jpmobile::', '').
+                  gsub('AbstractMobile::', '').
+                  gsub('Mobile::SmartPhone', 'smart_phone').
+                  gsub('Mobile::Tablet', 'tablet').
+                  gsub('::', '_').
                   gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
                   gsub(/([a-z\d])([A-Z])/, '\1_\2').
                   downcase
@@ -108,9 +108,9 @@ module Jpmobile::Mobile
       end
 
       if @_variants.include?('tablet')
-        @_variants = @_variants.reject {|v| v == 'mobile' }.map {|v| v.gsub(/mobile_/, 'tablet_') }
+        @_variants = @_variants.reject {|v| v == 'mobile' }.map {|v| v.gsub('mobile_', 'tablet_') }
       elsif @_variants.include?('smart_phone')
-        @_variants = @_variants.reject {|v| v == 'mobile' }.map {|v| v.gsub(/mobile_/, 'smart_phone_') }
+        @_variants = @_variants.reject {|v| v == 'mobile' }.map {|v| v.gsub('mobile_', 'smart_phone_') }
       end
 
       @_variants || []
@@ -253,7 +253,7 @@ module Jpmobile::Mobile
       carrier_class = Jpmobile::Mobile.const_get(carrier)
       next if carrier_class == self
 
-      define_method "#{carrier.downcase}?" do
+      define_method :"#{carrier.downcase}?" do
         self.is_a?(carrier_class)
       end
     end

data/lib/jpmobile/mobile/android.rb

@@ -6,6 +6,6 @@ module Jpmobile::Mobile
     include Jpmobile::Mobile::GoogleEmoticon
 
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /Android/.freeze
+    USER_AGENT_REGEXP = /Android/
   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/.+?)-(.+?) }.freeze
+    USER_AGENT_REGEXP = %r{^(?:KDDI|UP.Browser/.+?)-(.+?) }
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/
     # 簡易位置情報取得に対応していないデバイス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/.freeze
+    USER_AGENT_REGEXP = /BlackBerry/
   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}.freeze
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(DDIPOCKET}
 
     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/.freeze
+    USER_AGENT_REGEXP = /^DoCoMo/
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/
     # メールのデフォルトの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$}.freeze
+    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$}
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@emnet\.ne\.jp/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@emnet\.ne\.jp/
     # 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/.freeze
+    USER_AGENT_REGEXP = /iPad/
   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/.freeze
+    USER_AGENT_REGEXP = /iPhone/
   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)/.freeze
+    USER_AGENT_REGEXP = /^(?:SoftBank|Semulator)/
     # 対応するメールアドレスの正規表現　ディズニーモバイル対応
-    MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/
     # メールのデフォルトの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)/.freeze
+    USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/
 
     # 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}.freeze
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(WILLCOM}
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/
 
     # 位置情報があれば 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/.freeze
+    USER_AGENT_REGEXP = /Windows Phone/
   end
 end

data/lib/jpmobile/path_set.rb

@@ -8,7 +8,7 @@ module Jpmobile
         when Pathname, String
           Jpmobile::Resolver.new path.to_s
         else
-          super(paths)
+          super
         end
       end
     end

data/lib/jpmobile/rack/filter.rb

@@ -43,11 +43,13 @@ module Jpmobile
       if response.respond_to?(:to_str)
         response.to_str
       elsif response.respond_to?(:each)
+        # rubocop:disable Style/MapIntoArray
         body = []
         response.each do |part|
           body << response_to_body(part)
         end
         body.join("\n")
+        # rubocop:enable Style/MapIntoArray
       else
         body
       end

data/lib/jpmobile/resolver.rb

@@ -1,7 +1,7 @@
 module Jpmobile
   class Resolver < ::ActionView::FileSystemResolver
     def initialize(path)
-      super(path)
+      super
 
       @path_parser = Jpmobile::Resolver::PathParser.new
     end

data/lib/jpmobile/session/active_record_store.rb

@@ -1,7 +1,7 @@
 module Jpmobile
   module ActiveRecordStoreRegenerateSessionId
     def destroy_session(env, session_id, options)
-      super(env, session_id, options)
+      super
 
       session_id || Jpmobile::SessionID.generate_sid
     end

data/lib/jpmobile/session/mem_cache_store.rb

@@ -1,7 +1,7 @@
 module Jpmobile
   module MemCacheStoreRegenerateSessionId
     def destroy_session(env, session_id, options)
-      super(env, session_id, options)
+      super
 
       session_id || generate_sid
     end

data/lib/jpmobile/template_details.rb

@@ -28,7 +28,7 @@ module Jpmobile
       attr_reader :mobile, :mobile_idx
 
       def initialize(locale:, handlers:, formats:, variants:, mobile:)
-        super(locale: locale, handlers: handlers, formats: formats, variants: variants)
+        super(locale:, handlers:, formats:, variants:)
 
         @mobile = mobile.map(&:to_sym)
         @mobile_idx = build_idx_hash(mobile)

data/lib/jpmobile/trans_sid.rb

@@ -85,7 +85,7 @@ module Jpmobile
         end
       end
 
-      super(options, response_status)
+      super
     end
   end
 end

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '7.1.0'.freeze
+  VERSION = '7.2.0'.freeze
 end

data/spec/rack_helper.rb

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'rack/test'
 require 'rspec'
 require 'jpmobile'
-require 'nkf'
 
 begin
   require File.dirname(__FILE__) + '/../vendor/jpmobile-ipaddresses/lib/jpmobile-ipaddresses'

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 = /\.jp(?:[^a-zA-Z.-]|$)/
     end
 
     it '#detect_from_mail_header should return Jpmobile::Mobile::AbstractMobile when the header contains .jp address' do
@@ -80,7 +80,7 @@ describe 'Jpmobile::Email' do
     end
 
     it 'return nil when image/jpeg; name="20098calendar01.jpg"' do
-      expect(Jpmobile::Email.convertable?('image/jpeg; name="20098calendar01.jpg"')).to be_nil
+      expect(Jpmobile::Email.convertable?('image/jpeg; name="20098calendar01.jpg"')).to be_falsy
     end
   end
 end

data/spec/unit/is_carrier_spec.rb

@@ -59,7 +59,7 @@ describe 'Jpmobile::Mobile' do
     [%w[Ddipocket ddipocket], true],
   ].each do |carrier, expected|
     it "#{carrier.first}##{carrier.last}? should be return #{expected}" do
-      expect(Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__("#{carrier.last}?")).to eq(expected)
+      expect(Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__(:"#{carrier.last}?")).to eq(expected)
     end
   end
 end

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 = /\.jp[^a-zA-Z.-]/
   end
 
   describe 'PC mail' do

data/spec/unit/util_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'stringio'
-require 'nkf'
 
 describe Jpmobile::Util do
   include Jpmobile::Util

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

@@ -6,7 +6,7 @@ describe HankakuFilterController, type: :controller do
 
     it 'should be successful' do
       request.user_agent = 'DoCoMo/2.0 P05C(c500;TB;W24H16)'
-      get 'index', params: params
+      get('index', params:)
       expect(response).to be_successful
       expect(request.mobile?).to be_truthy
     end

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

@@ -9,7 +9,7 @@ describe LinksController, type: :controller do
   def get_href_and_texts(str)
     results = []
     (Nokogiri::HTML.parse(str) / 'a').each do |link|
-      path, query = link['href'].split(/\?/, 2)
+      path, query = link['href'].split('?', 2)
       params = query.nil? ? nil : Rack::Utils.parse_query(query)
       results << [link.inner_html, link.attributes, path, params]
     end

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

@@ -28,7 +28,9 @@ ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{Rails.root}/spec/fixtures"
+  config.fixture_paths = [
+    "#{Rails.root}/spec/fixtures",
+  ]
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

data/test/rails/overrides/spec/requests/method_less_action_support_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe 'Method-less mobile template only action', type: :request do
   subject do
-    get '/method_less_action_support', headers: headers
+    get '/method_less_action_support', headers:
   end
 
   let(:headers) do

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

@@ -1,3 +1,3 @@
 require 'rails_helper'
 
-Dir[File.join(__dir__, 'system/support/**/*.rb')].sort.each {|file| require file }
+Dir[File.join(__dir__, 'system/support/**/*.rb')].each {|file| require file }

data/test/sinatra/guestbook.rb

@@ -23,7 +23,7 @@ class Guestbook < Jpmobile::Sinatra::Base
   end
 
   def assigns(sym)
-    instance_variable_get("@#{sym}")
+    instance_variable_get(:"@#{sym}")
   end
 
   get '/' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -332,10 +332,7 @@ files:
 - tools/e4u_conv.rb
 - tools/emoji/genregexp.rb
 - tools/emoji4unicode.xml
-- tools/generate_au_emoticon_table.rb
-- tools/generate_docomo_emoticon_table.rb
 - tools/generate_emoticon_conversion_table.rb
-- tools/generate_softbank_emoticon_table.rb
 - tools/list_gps_unsupported_au.rb
 homepage: https://jpmobile-rails.org
 licenses:
@@ -352,14 +349,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Rails plugin for mobile devices in Japan