jpmobile 6.1.2 → 7.1.0

data/lib/jpmobile/filter.rb

@@ -42,6 +42,8 @@ module Jpmobile
       Regexp.escape('application/xhtml+xm'),
     )
 
+    CONVERT_TARGET_ELEMENTS = %w[submit reset button].freeze
+
     class << self
       def hankaku_format(str)
         replace_chars(str, zen_to_han_table)
@@ -117,7 +119,7 @@ module Jpmobile
         doc = convert_text_content(doc)
 
         html = doc.to_html.gsub("\xc2\xa0", '&nbsp;')
-        html = html.gsub(/charset=[a-z0-9\-]+/i, "charset=#{default_charset}") if default_charset
+        html = html.gsub(/charset=[a-z0-9-]+/i, "charset=#{default_charset}") if default_charset
         html
       else
         filter(:hankaku, str)
@@ -149,7 +151,7 @@ module Jpmobile
             # textarea 以外のテキストなら content を変換
             element.content = filter(:hankaku, element.content)
           end
-        elsif (element.node_name == 'input') && %w[submit reset button].include?(element['type'])
+        elsif (element.node_name == 'input') && CONVERT_TARGET_ELEMENTS.include?(element['type'])
           # テキスト以外でもボタンの value は変換
           element['value'] = filter(:hankaku, element['value'])
         elsif element.children.any?

data/lib/jpmobile/hook_action_view.rb

@@ -1,4 +1,4 @@
-#:stopdoc:
+# :stopdoc:
 # helperを追加
 # ActionView で trans_sid を有効にする
 ActionView::Base.class_eval do
@@ -6,7 +6,7 @@ ActionView::Base.class_eval do
 
   delegate :default_url_options, to: :controller unless respond_to?(:default_url_options)
 end
-#:startdoc:
+# :startdoc:
 
 # :stopdoc:
 # accept-charset に charset を変更できるようにする
@@ -19,4 +19,4 @@ module Jpmobile
     end
   end
 end
-#:startdoc:
+# :startdoc:

data/lib/jpmobile/hook_template_details_requested.rb

@@ -0,0 +1,12 @@
+module Jpmobile
+  module HookTemplateDetailsRequested
+    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

data/lib/jpmobile/mail.rb

@@ -55,7 +55,7 @@ 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})/m, 2)
+      header_part, body_part = _crlf_raw_source.lstrip.split(/#{CRLF}#{CRLF}|#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/mo, 2)
       # header_part, body_part = raw_source.lstrip.split(HEADER_SEPARATOR, 2)
 
       self.header = header_part
@@ -202,7 +202,7 @@ module Mail
       end
 
       unless self.header['Content-Type'].sub_type == 'mixed'
-        self.header['Content-Type'] = self.content_type.gsub(/#{self.header['Content-Type'].sub_type}/, 'mixed')
+        self.header['Content-Type'] = self.content_type.gsub(/#{self.header["Content-Type"].sub_type}/, 'mixed')
       end
       self.parts.clear
       self.body = nil
@@ -277,7 +277,7 @@ module Mail
     end
 
     def parse_message_with_jpmobile
-      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
+      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/mo, 2)
 
       self.header = if header_part && header_part.match(HEADER_LINE)
                       header_part

data/lib/jpmobile/mailer.rb

@@ -1,17 +1,16 @@
 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
     class Base < ActionMailer::Base
-      self._view_paths = self._view_paths.dup
-      self.view_paths.unshift(Jpmobile::Resolver.new(File.join(::Rails.root, 'app/views')))
+      self.prepend_view_path(Jpmobile::Resolver.new(File.join(::Rails.root, 'app/views')))
 
       def mail(headers = {}, &block)
         tos = headers[:to] || self.default_params[:to]
-        tos = tos.split(/,/)
+        tos = tos.split(',')
 
         @mobile = if tos.size == 1
                     # for mobile
@@ -37,7 +36,7 @@ module Jpmobile
       class << self
         protected
 
-        def set_payload_for_mail(payload, mail) #:nodoc:
+        def set_payload_for_mail(payload, mail) # :nodoc:
           super
 
           payload[:mail] = Jpmobile::Util.ascii_8bit(mail.encoded).gsub(/\r\n/, "\n")

data/lib/jpmobile/method_less_action_support.rb

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

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -242,7 +242,7 @@ module Jpmobile::Mobile
       end
 
       def ip_address_class
-        Object.const_get("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split(/::/).last}").new
+        Object.const_get("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split("::").last}").new
       rescue
         nil
       end

data/lib/jpmobile/mobile/android_tablet.rb

@@ -6,6 +6,6 @@ module Jpmobile::Mobile
     include Jpmobile::Mobile::GoogleEmoticon
 
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = Regexp.union(/(?!Android.+Mobile)Android/, /Android.+SC-01C/)
+    USER_AGENT_REGEXP = Regexp.union(/^(?!.+Mobile).+(?=Android).+$/, /Android.+SC-01C/)
   end
 end

data/lib/jpmobile/mobile/au.rb

@@ -15,6 +15,8 @@ module Jpmobile::Mobile
     # GPS取得に対応していないデバイスID
     GPS_UNSUPPORTED_DEVICE_ID = %w[PT21 KC26 SN28 SN26 KC23 SA28 TS25 SA25 SA24 SN23 ST14 KC15 SN22 KC14 ST13 SN17 SY15 CA14 HI14 TS14 KC13 SN15 SN16 SY14 ST12 TS13 CA13 MA13 HI13 SN13 SY13 SN12 SN14 ST11 DN11 SY12 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
 
+    TARGET_PARAMS = %w[ver datum unit lat lon alt time smaj smin vert majaa fm].freeze
+
     # EZ番号(サブスクライバID)があれば返す。無ければ +nil+ を返す。
     def subno
       @request.env['HTTP_X_UP_SUBNO']
@@ -27,7 +29,7 @@ module Jpmobile::Mobile
       return @__posotion = nil if params['lat'].nil? || params['lat'] == '' || params['lon'].nil? || params['lon'] == ''
 
       l = Jpmobile::Position.new
-      l.options = params.select {|x, _| %w[ver datum unit lat lon alt time smaj smin vert majaa fm].include?(x) }
+      l.options = params.select {|x, _| TARGET_PARAMS.include?(x) }
       case params['unit']
       when '1'
         l.lat = params['lat'].to_f
@@ -83,11 +85,7 @@ module Jpmobile::Mobile
           'none'
         end
 
-      if protocol.start_with?('https')
-        false
-      else
-        true
-      end
+      !protocol.start_with?('https')
     end
 
     # 文字コード変換

data/lib/jpmobile/mobile/softbank.rb

@@ -13,6 +13,8 @@ module Jpmobile::Mobile
     # テキスト部分の content-transfer-encoding
     MAIL_CONTENT_TRANSFER_ENCODING = '8bit'.freeze
 
+    TARGET_PARAMS = ['pos', 'geo', 'x-acr'].freeze
+
     # 製造番号を返す。無ければ +nil+ を返す。
     def serial_number
       @request.env['HTTP_USER_AGENT'] =~ /SN(.+?) /
@@ -36,7 +38,7 @@ module Jpmobile::Mobile
       l = Jpmobile::Position.new
       l.lat = ((Regexp.last_match(1) == 'N') ? 1 : -1) * Jpmobile::Position.dms2deg(Regexp.last_match(2), Regexp.last_match(3), Regexp.last_match(4))
       l.lon = ((Regexp.last_match(5) == 'E') ? 1 : -1) * Jpmobile::Position.dms2deg(Regexp.last_match(6), Regexp.last_match(7), Regexp.last_match(8))
-      l.options = params.select {|x, _| ['pos', 'geo', 'x-acr'].include?(x) }
+      l.options = params.select {|x, _| TARGET_PARAMS.include?(x) }
 
       @__position = l
     end

data/lib/jpmobile/path_set.rb

@@ -1,41 +1,15 @@
 module Jpmobile
-  class PathSet < Array
-    %w[initialize << concat insert push unshift].each do |method|
-      class_eval <<-METHOD, __FILE__, __LINE__ + 1
-        def #{method}(*args)
-          super
-          typecast!
-        end
-      METHOD
-    end
+  class PathSet < ActionView::PathSet
+    private
 
-    def find(path, prefix = nil, partial = false, details = {}, key = nil)
-      template = find_all(path, prefix, partial, details, key).first
-      raise MissingTemplate.new(self, "#{prefix}/#{path}", details, partial) unless template
-
-      template
-    end
-
-    def find_all(*args)
-      each do |resolver|
-        templates = resolver.find_all(*args)
-        return templates unless templates.empty?
-      end
-      []
-    end
-
-    def exists?(*args)
-      find_all(*args).any?
-    end
-
-    protected
-
-    def typecast!
-      each_with_index do |path, i|
-        path = path.to_s if path.is_a?(Pathname)
-        next unless path.is_a?(String)
-
-        self[i] = Jpmobile::Resolver.new(path)
+    def typecast(paths)
+      paths.map do |path|
+        case path
+        when Pathname, String
+          Jpmobile::Resolver.new path.to_s
+        else
+          super(paths)
+        end
       end
     end
   end

data/lib/jpmobile/position.rb

@@ -10,7 +10,7 @@ end
 module Jpmobile
   # 位置情報
   class Position
-    if Object.const_defined?('GeoKit')
+    if Object.const_defined?(:GeoKit)
       # GeoKitが読み込まれている場合はMappableにする
       include ::GeoKit::Mappable
       def self.acts_as_mappable
@@ -27,17 +27,17 @@ module Jpmobile
         :lng
       end
     end
+    # 度分秒を度に変換する。
+    def self.dms2deg(d, m, s)
+      d.to_i + (m.to_i.to_f / 60) + (s.to_f / 3600)
+    end
+
     def initialize
       @lat = nil
       @lon = nil
       @options = {}
     end
 
-    # 度分秒を度に変換する。
-    def self.dms2deg(d, m, s)
-      d.to_i + m.to_i.to_f / 60 + s.to_f / 3600
-    end
-
     # 日本測地系から世界測地系に変換する。
     def tokyo2wgs84!
       @lat, @lon = DatumConv.tky2jgd(@lat, @lon)

data/lib/jpmobile/rails.rb

@@ -2,18 +2,24 @@ ActiveSupport.on_load(:action_controller) do
   require 'jpmobile/docomo_guid'
   require 'jpmobile/filter'
   require 'jpmobile/helpers'
+  require 'jpmobile/method_less_action_support'
   require 'jpmobile/trans_sid'
-  require 'jpmobile/hook_test_request'
   ActionDispatch::Request.prepend Jpmobile::Encoding
   ActionDispatch::Request.include Jpmobile::RequestWithMobile
   ActionController::Base.prepend Jpmobile::FallbackViewSelector
   ActionController::Base.prepend Jpmobile::TransSidRedirecting
+
+  if Rails.env.test?
+    require 'jpmobile/hook_test_request'
+  end
 end
 
 ActiveSupport.on_load(:action_view) do
   require 'jpmobile/hook_action_view'
+  require 'jpmobile/hook_template_details_requested'
 
   self.prepend Jpmobile::HtmlOptionsWithAcceptCharset
+  ActionView::TemplateDetails::Requested.prepend Jpmobile::HookTemplateDetailsRequested
 end
 
 ActiveSupport.on_load(:after_initialize) do
@@ -31,7 +37,7 @@ end
 
 ActiveSupport.on_load(:before_configuration) do
   # MobileCarrierのみデフォルトで有効
-  config.middleware.insert_after ActionDispatch::Flash, ::Jpmobile::MobileCarrier
+  config.middleware.insert_after ActionDispatch::Flash, Jpmobile::MobileCarrier
 
   Rails::Application::Configuration.include Jpmobile::Configuration::RailsConfiguration
 end

data/lib/jpmobile/resolver.rb

@@ -1,14 +1,55 @@
 module Jpmobile
   class Resolver < ::ActionView::FileSystemResolver
-    EXTENSIONS = [:locale, :formats, :handlers, :mobile].freeze
-    DEFAULT_PATTERN = ':prefix/:action{_:mobile,}{.:locale,}{.:formats,}{+:variants,}{.:handlers,}'.freeze
-
     def initialize(path)
-      raise ArgumentError, 'path already is a Resolver class' if path.is_a?(Resolver)
+      super(path)
+
+      @path_parser = Jpmobile::Resolver::PathParser.new
+    end
 
+    def clear_cache
       super
-      @pattern = DEFAULT_PATTERN
-      @path = File.expand_path(path)
+
+      @path_parser = Jpmobile::Resolver::PathParser.new
+    end
+
+    class PathParser < ::ActionView::Resolver::PathParser
+      def build_path_regex
+        handlers = Regexp.union(::ActionView::Template::Handlers.extensions.map(&:to_s))
+        formats = Regexp.union(::ActionView::Template::Types.symbols.map(&:to_s))
+        available_locales = I18n.available_locales.map(&:to_s)
+        regular_locales = [/[a-z]{2}(?:[-_][A-Z]{2})?/]
+        locales = Regexp.union(available_locales + regular_locales)
+        variants = '[^.]*'
+
+        mobile = Jpmobile::Mobile.all_variants.map {|x| Regexp.escape(x) }.join('|')
+
+        %r{
+          \A
+          (?:(?<prefix>.*)/)?
+          (?<partial>_)?
+          (?<action>.*?)
+          (?:_(?<mobile>#{mobile}))??
+          (?:\.(?<locale>#{locales}))??
+          (?:\.(?<format>#{formats}))??
+          (?:\+(?<variant>#{variants}))??
+          (?:\.(?<handler>#{handlers}))?
+          \z
+        }x
+      end
+
+      def parse(path)
+        @regex ||= build_path_regex
+        match = @regex.match(path)
+        path = ActionView::TemplatePath.build(match[:action], match[:prefix] || '', !!match[:partial])
+        details = Jpmobile::TemplateDetails.new(
+          match[:locale]&.to_sym,
+          match[:handler]&.to_sym,
+          match[:format]&.to_sym,
+          match[:variant]&.to_sym,
+          match[:mobile]&.to_sym,
+        )
+        ParsedPath.new(path, details)
+      end
     end
   end
 end

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.mobile_idx[@mobile],
+        requested.handlers_idx[@handler],
+      ]
+    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

@@ -66,7 +66,7 @@ module Jpmobile
 
   module TransSidRedirecting
     def redirect_to(options = {}, response_status = {})
-      if apply_trans_sid? && jpmobile_session_id && options != :back && options !~ /^\w[\w+.-]*:.*/
+      if apply_trans_sid? && jpmobile_session_id
         case options
         when String
           unless options.match?(/#{session_key}/)
@@ -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

@@ -291,7 +291,7 @@ 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)

data/lib/jpmobile/version.rb

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

data/lib/jpmobile/view_selector.rb

@@ -1,12 +1,11 @@
 module Jpmobile
   module ViewSelector
-    def self.included(base)
-      base.class_eval do
-        before_action :register_mobile
+    extend ActiveSupport::Concern
 
-        self._view_paths = self._view_paths.dup
-        self.view_paths.unshift(*self.view_paths.map {|resolver| Jpmobile::Resolver.new(resolver.to_path) })
-      end
+    included do
+      before_action :register_mobile
+
+      self.view_paths = Jpmobile::PathSet.new(self.view_paths.paths.map(&:path))
     end
 
     def register_mobile

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,9 @@ 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'
 

data/lib/tasks/jpmobile_tasks.rake

@@ -84,12 +84,10 @@ namespace :test do
     unless skip
       # for cookie_only option
       config_path = File.join(rails_root, 'config', 'initializers', 'session_store.rb')
-      File.open(config_path, 'w') do |file|
-        file.write <<-SESSION_CONFIG
+      File.write(config_path, <<-SESSION_CONFIG)
         Rails.application.config.session_store :active_record_store, :key => '_session_id'
         Rails.application.config.session_options = { :cookie_only => false }
-        SESSION_CONFIG
-      end
+      SESSION_CONFIG
     end
 
     unless skip
@@ -112,12 +110,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/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

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

@@ -20,7 +20,7 @@ describe Jpmobile::ParamsFilter do
     context 'Shift_JIS 変換の ' do
       before(:each) do
         @query_string = @query_params.map {|k, v|
-          '%s=%s' % [::Rack::Utils.escape(utf8_to_sjis(k)), ::Rack::Utils.escape(utf8_to_sjis(v))]
+          '%s=%s' % [Rack::Utils.escape(utf8_to_sjis(k)), Rack::Utils.escape(utf8_to_sjis(v))]
         }.join('&')
         @form_string = @form_params.map {|k, v|
           '%s=%s' % [utf8_to_sjis(k), utf8_to_sjis(v)]
@@ -75,7 +75,7 @@ describe Jpmobile::ParamsFilter do
     context 'UTF-8 の' do
       before(:each) do
         @query_string = @query_params.map {|k, v|
-          '%s=%s' % [::Rack::Utils.escape(k), ::Rack::Utils.escape(v)]
+          '%s=%s' % [Rack::Utils.escape(k), Rack::Utils.escape(v)]
         }.join('&')
         @form_string = @form_params.map {|k, v|
           '%s=%s' % [k, v]
@@ -109,7 +109,7 @@ describe Jpmobile::ParamsFilter do
   context '絵文字変換' do
     context 'docomo の場合' do
       it 'Shift_JIS 絵文字がUTF-8に変換されること' do
-        query_string = 'hoge=' + ::Rack::Utils.escape(sjis("\xf8\x9f"))
+        query_string = 'hoge=' + Rack::Utils.escape(sjis("\xf8\x9f"))
         form_string  = 'foo='  + sjis("\xf8\xa1")
 
         res = Rack::MockRequest.env_for(
@@ -131,7 +131,7 @@ describe Jpmobile::ParamsFilter do
 
     context 'au の場合' do
       it 'Shift_JIS 絵文字がUTF-8に変換されること' do
-        query_string = 'hoge=' + ::Rack::Utils.escape(sjis("\xf6\x59"))
+        query_string = 'hoge=' + Rack::Utils.escape(sjis("\xf6\x59"))
         form_string  = 'foo='  + sjis("\xf6\xfb")
 
         res = Rack::MockRequest.env_for(
@@ -153,7 +153,7 @@ describe Jpmobile::ParamsFilter do
 
     context 'Softbank の場合' do
       it 'UTF-8 絵文字がUTF-8に変換されること' do
-        query_string = ascii_8bit('hoge=' + ::Rack::Utils.escape([0xe001].pack('U')))
+        query_string = ascii_8bit('hoge=' + Rack::Utils.escape([0xe001].pack('U')))
         form_string  = ascii_8bit('foo='  + [0xe21c].pack('U'))
 
         res = Rack::MockRequest.env_for(
@@ -178,7 +178,7 @@ describe Jpmobile::ParamsFilter do
     context '値として' do
       it '+ が入ってるものが正確に取得できること(token)' do
         token = 'lm/3Pu6RrY+kp8hsnEWp2xygYLInZIxwsB3UWeksaHQ='
-        form_string = ascii_8bit("foo=#{::Rack::Utils.escape(token)}")
+        form_string = ascii_8bit("foo=#{Rack::Utils.escape(token)}")
 
         res = Rack::MockRequest.env_for(
           '/',

data/spec/unit/decorated_mail_spec.rb

@@ -14,7 +14,7 @@ describe 'decorated mails' do
     @mail.from      = 'ちはやふる <info@jpmobile-rails.org>'
     @mail.to        = 'むすめふさほせ <info+to@jpmobile-rails.org>'
 
-    @photo = File.open(File.join(__dir__, 'email-fixtures/photo.jpg')).read
+    @photo = File.read(File.join(__dir__, 'email-fixtures/photo.jpg'))
     @mail.attachments.inline['photo.jpg'] = @photo
     @inline_url = @mail.attachments['photo.jpg'].url
   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/mail_spec.rb

@@ -285,7 +285,7 @@ describe 'Jpmobile::Mail' do
       @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
       @mail.mobile = @mobile
       @mail.to = 'むすめふさほせ <info+to@jpmobile-rails.org>'
-      @photo = File.open(File.join(__dir__, 'email-fixtures/photo.jpg')).read
+      @photo = File.read(File.join(__dir__, 'email-fixtures/photo.jpg'))
     end
 
     it 'should encodes itself successfully' do
@@ -318,7 +318,7 @@ describe 'Jpmobile::Mail' do
       @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
       @mail.mobile = @mobile
       @mail.to = 'むすめふさほせ <info+to@jpmobile-rails.org>'
-      @photo = File.open(File.join(__dir__, 'email-fixtures/photo.jpg')).read
+      @photo = File.read(File.join(__dir__, 'email-fixtures/photo.jpg'))
     end
 
     it 'wave dash converting correctly' do
@@ -345,8 +345,8 @@ describe 'Jpmobile::Mail' do
       @mail.delivery_method :smtp,
                             {
                               enable_starttls_auto: false,
-                              user_name: ENV['MAILTRAP_USERNAME'],
-                              password: ENV['MAILTRAP_PASSWORD'],
+                              user_name: ENV.fetch('MAILTRAP_USERNAME', nil),
+                              password: ENV.fetch('MAILTRAP_PASSWORD', nil),
                               address: 'smtp.mailtrap.io',
                               domain: 'smtp.mailtrap.io',
                               port: '2525',