jpmobile 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3292578aadf3276cb4304224f8b4563fe25244e03b7fa337d2ba7dd3a542f3f1
-  data.tar.gz: 6f472acb84fad3decceaed599afa71397e5dd92d851a0300bb03d595b9f48aef
+  metadata.gz: 1353f6341c914dfadbe29cdf617506304701dafdbdc826e21a7339b8963d7934
+  data.tar.gz: 6007f9958265cae1eb8e73fdf50fb308b6d5ce086452d6986025244d52e525bb
 SHA512:
-  metadata.gz: 0bcc18a422c95df268feb18ddbe7e61d9d94f9481cbacda09edce99990b2cb2f3e909b319a96b411aeeff7e7b995dcc2a794406b80f3c1d2292d991c0bbd72f3
-  data.tar.gz: 802f4a65b7ba13537ec9c548a109eeb13205363ce0afc1bb4f13c0fd228663f33dfc128cf8615f2ca3f6ba6f8f0a3a7a33f05841984d6ada7eb648afe9801bcd
+  metadata.gz: b5623190d12407d9f5f6bd8348faf7fa2f81b206dc773d13898acc2a1da354fac16916564883c56692246fc4ebdcd8f40dc7ddd9f39e1d9974bb22abe5bf5d33
+  data.tar.gz: e873923cfcfcfdd0a80211a1197269117f920c905a886ed22cb0fbcadeeb8d6a3065d7dafde6839a053aff7107fff08e4d913f80c7a4fc948314a670f20588ee

data/.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
   test-job:
     working_directory: ~/jpmobile
     docker:
-      - image: cimg/ruby:3.0-browsers
+      - image: cimg/ruby:3.1-browsers
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3

data/.rubocop.yml

@@ -3,7 +3,7 @@ require: rubocop-performance
 inherit_from: './.onkcop-config.yml'
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 2.7
   Exclude:
     - 'tmp/**/*'
     - 'bin/*'
@@ -194,3 +194,106 @@ Style/OptionalBooleanParameter:
 Metrics/ParameterLists:
   Exclude:
     - 'lib/jpmobile/path_set.rb'
+
+Gemspec/DateAssignment: # new in 1.10
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/DeprecatedConstants: # new in 1.8
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/EndlessMethod: # new in 1.8
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/HashConversion: # new in 1.10
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # new in 1.9
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Performance/AncestorsInclude: # new in 1.7
+  Enabled: true
+Performance/BigDecimalWithNumericArgument: # new in 1.7
+  Enabled: true
+Performance/BlockGivenWithExplicitBlock: # new in 1.9
+  Enabled: true
+Performance/CollectionLiteralInLoop: # new in 1.8
+  Enabled: true
+Performance/ConcurrentMonotonicTime: # new in 1.12
+  Enabled: true
+Performance/ConstantRegexp: # new in 1.9
+  Enabled: true
+Performance/MapCompact: # new in 1.11
+  Enabled: true
+Performance/MethodObjectAsBlock: # new in 1.9
+  Enabled: true
+Performance/RedundantEqualityComparisonBlock: # new in 1.10
+  Enabled: true
+Performance/RedundantSortBlock: # new in 1.7
+  Enabled: true
+Performance/RedundantSplitRegexpArgument: # new in 1.10
+  Enabled: true
+Performance/RedundantStringChars: # new in 1.7
+  Enabled: true
+Performance/ReverseFirst: # new in 1.7
+  Enabled: true
+Performance/SortReverse: # new in 1.7
+  Enabled: true
+Performance/Squeeze: # new in 1.7
+  Enabled: true
+Performance/StringIdentifierArgument: # new in 1.13
+  Enabled: true
+Performance/StringInclude: # new in 1.7
+  Enabled: false
+Performance/Sum: # new in 1.8
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.2

data/Gemfile.lock

@@ -9,67 +9,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
+    actioncable (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionmailbox (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.1)
-      actionpack (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionmailer (7.0.3)
+      actionpack (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activesupport (= 7.0.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.1)
-      actionview (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionpack (7.0.3)
+      actionview (= 7.0.3)
+      activesupport (= 7.0.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.1)
-      actionpack (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    actiontext (7.0.3)
+      actionpack (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.1)
-      activesupport (= 7.0.1)
+    actionview (7.0.3)
+      activesupport (= 7.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.1)
-      activesupport (= 7.0.1)
+    activejob (7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.3.6)
-    activemodel (7.0.1)
-      activesupport (= 7.0.1)
-    activerecord (7.0.1)
-      activemodel (= 7.0.1)
-      activesupport (= 7.0.1)
-    activestorage (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activesupport (= 7.0.1)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activestorage (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activesupport (= 7.0.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.1)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -77,21 +77,20 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
     digest (3.1.0)
     erubi (1.10.0)
     geokit (1.13.1)
-    git (1.10.2)
+    git (1.11.0)
       rchardet (~> 1.8)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hpricot (0.8.6)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    io-wait (0.2.1)
-    loofah (2.13.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -108,50 +107,49 @@ GEM
       digest
       net-protocol
       timeout
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.0-arm64-darwin)
+    nokogiri (1.13.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.0-x86_64-linux)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (7.0.1)
-      actioncable (= 7.0.1)
-      actionmailbox (= 7.0.1)
-      actionmailer (= 7.0.1)
-      actionpack (= 7.0.1)
-      actiontext (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activemodel (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    rails (7.0.3)
+      actioncable (= 7.0.3)
+      actionmailbox (= 7.0.3)
+      actionmailer (= 7.0.3)
+      actionpack (= 7.0.3)
+      actiontext (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activemodel (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       bundler (>= 1.15.0)
-      railties (= 7.0.1)
+      railties (= 7.0.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -159,24 +157,24 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     rchardet (1.8.0)
-    regexp_parser (2.2.0)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (5.0.2)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -184,45 +182,46 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.3)
-    rubocop (1.24.1)
+    rspec-support (3.11.0)
+    rubocop (1.30.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.1)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.13.1)
+    rubocop-rails (2.14.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.7.0)
+    rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     scanf (1.0.0)
     sqlite3 (1.4.2)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    strscan (3.0.1)
+    strscan (3.0.3)
     thor (1.2.1)
-    timeout (0.2.0)
+    timeout (0.3.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -242,4 +241,4 @@ DEPENDENCIES
   sqlite3-ruby
 
 BUNDLED WITH
-   2.2.32
+   2.3.15

data/README.md

@@ -140,7 +140,7 @@ Rack::Request#mobile.position に位置情報が格納されます。
 @longuitude = request.mobile.position.lon
 ```
 
-#### [GeoKit](http://geokit.rubyforge.org) との連携
+#### [GeoKit](https://github.com/geokit/geokit) との連携
 
 vendor/plugins/geokit以下にGeoKitがインストールされていると、Jpmobile::PositionにGeoKit::Mappableがincludeされる。したがって、
 

data/Rakefile

@@ -21,7 +21,7 @@ namespace :test do
       'jpmobile-ipaddresses',
       'jpmobile-terminfo',
     ]
-    github_prefix = 'git://github.com/jpmobile'
+    github_prefix = 'https://github.com/jpmobile'
     vendor_path = Pathname.new(Dir.pwd).join('vendor')
     FileUtils.mkdir_p(vendor_path)
 

data/jpmobile.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'sqlite3-ruby'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/jpmobile/datum_conv.rb

@@ -19,11 +19,11 @@ module DatumConv
     l = l_deg * Deg2Rad
 
     e2 = f * (2 - f)
-    n = a / Math.sqrt(1 - e2 * Math.sin(b)**2)
+    n = a / Math.sqrt(1 - (e2 * (Math.sin(b)**2)))
 
     x = (n + he) * Math.cos(b) * Math.cos(l)
     y = (n + he) * Math.cos(b) * Math.sin(l)
-    z = (n * (1 - e2) + he) * Math.sin(b)
+    z = ((n * (1 - e2)) + he) * Math.sin(b)
     return x, y, z
   end
 
@@ -34,12 +34,12 @@ module DatumConv
     e2 = f * (2 - f)
     l = Math.atan2(y, x)
 
-    p = Math.sqrt(x**2 + y**2)
-    r = Math.sqrt(p**2 + z**2)
-    u = Math.atan2(z * ((1 - f) + e2 * a / r), p)
-    b = Math.atan2(z * (1 - f) + e2 * a * Math.sin(u)**3, (1 - f) * (p - e2 * a * Math.cos(u)**3))
+    p = Math.sqrt((x**2) + (y**2))
+    r = Math.sqrt((p**2) + (z**2))
+    u = Math.atan2(z * ((1 - f) + (e2 * a / r)), p)
+    b = Math.atan2((z * (1 - f)) + (e2 * a * (Math.sin(u)**3)), (1 - f) * (p - (e2 * a * (Math.cos(u)**3))))
 
-    he = p * Math.cos(b) + z * Math.sin(b) - a * Math.sqrt(1 - e2 * Math.sin(b)**2)
+    he = (p * Math.cos(b)) + (z * Math.sin(b)) - (a * Math.sqrt(1 - (e2 * (Math.sin(b)**2))))
 
     b_deg = b / Deg2Rad
     l_deg = l / Deg2Rad

data/lib/jpmobile/email.rb

@@ -10,7 +10,7 @@ module Jpmobile
       def detect(email)
         Mobile.carriers.each do |const|
           c = Mobile.const_get(const)
-          return c if c::MAIL_ADDRESS_REGEXP && email.match(/^#{c::MAIL_ADDRESS_REGEXP}$/)
+          return c if c::MAIL_ADDRESS_REGEXP && email.match(/^#{c::MAIL_ADDRESS_REGEXP}$/) # rubocop:disable Performance/ConstantRegexp
         end
         nil
       end
@@ -21,7 +21,7 @@ module Jpmobile
           c = Mobile.const_get(const)
           if c::MAIL_ADDRESS_REGEXP &&
              header.match(/(\S+@[A-Za-z0-9\-._]+)/) &&
-             Regexp.last_match(1).match(/^#{c::MAIL_ADDRESS_REGEXP}$/)
+             Regexp.last_match(1).match(/^#{c::MAIL_ADDRESS_REGEXP}$/) # rubocop:disable Performance/ConstantRegexp
             return c
           end
         end

data/lib/jpmobile/fallback_view_selector.rb

@@ -8,10 +8,10 @@ module Jpmobile
         begin
           expected_view_file = lookup_context.find_template(options[:template], options[:prefixes])
 
-          _candidates = lookup_context.mobile.map {|variant|
+          _candidates = lookup_context.mobile.filter_map do |variant|
             target_template = options[:template] + '_' + variant
             expected_view_file.virtual_path.match(target_template)
-          }.compact
+          end
 
           if _candidates.empty?
             lookup_context.mobile = []

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)
@@ -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/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
@@ -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

@@ -11,7 +11,7 @@ module Jpmobile
 
       def mail(headers = {}, &block)
         tos = headers[:to] || self.default_params[:to]
-        tos = tos.split(/,/)
+        tos = tos.split(',')
 
         @mobile = if tos.size == 1
                     # for mobile

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.rb

@@ -6,6 +6,6 @@ module Jpmobile::Mobile
     include Jpmobile::Mobile::GoogleEmoticon
 
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /Android/
+    USER_AGENT_REGEXP = /Android/.freeze
   end
 end

data/lib/jpmobile/mobile/au.rb

@@ -6,15 +6,17 @@ module Jpmobile::Mobile
   class Au < AbstractMobile
     # 対応するUser-Agentの正規表現
     # User-Agent文字列中に "UP.Browser" を含むVodafoneの端末があるので注意が必要
-    USER_AGENT_REGEXP = %r{^(?:KDDI|UP.Browser/.+?)-(.+?) }
+    USER_AGENT_REGEXP = %r{^(?:KDDI|UP.Browser/.+?)-(.+?) }.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/.freeze
     # 簡易位置情報取得に対応していないデバイス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
     # 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/black_berry.rb

@@ -4,6 +4,6 @@ module Jpmobile::Mobile
   # ==BlackBerry
   class BlackBerry < SmartPhone
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /BlackBerry/
+    USER_AGENT_REGEXP = /BlackBerry/.freeze
   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}
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(DDIPOCKET}.freeze
 
     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/
+    USER_AGENT_REGEXP = /^DoCoMo/.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/.freeze
     # メールのデフォルトの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$}
+    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
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@emnet\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@emnet\.ne\.jp/.freeze
     # 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/
+    USER_AGENT_REGEXP = /iPad/.freeze
   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/
+    USER_AGENT_REGEXP = /iPhone/.freeze
   end
 end

data/lib/jpmobile/mobile/softbank.rb

@@ -5,14 +5,16 @@ module Jpmobile::Mobile
   # Vodafoneのスーパクラス。
   class Softbank < AbstractMobile
     # 対応するuser-agentの正規表現
-    USER_AGENT_REGEXP = /^(?:SoftBank|Semulator)/
+    USER_AGENT_REGEXP = /^(?:SoftBank|Semulator)/.freeze
     # 対応するメールアドレスの正規表現　ディズニーモバイル対応
-    MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/
+    MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/.freeze
     # メールのデフォルトのcharset
     MAIL_CHARSET = 'Shift_JIS'.freeze
     # テキスト部分の 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/mobile/vodafone.rb

@@ -4,9 +4,9 @@ module Jpmobile::Mobile
   # スーパクラスはSoftbank。
   class Vodafone < Softbank
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/
+    USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/
+    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/.freeze
 
     # 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}
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(WILLCOM}.freeze
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/
+    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/.freeze
 
     # 位置情報があれば 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/
+    USER_AGENT_REGEXP = /Windows Phone/.freeze
   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
@@ -35,7 +35,7 @@ module Jpmobile
 
     # 度分秒を度に変換する。
     def self.dms2deg(d, m, s)
-      d.to_i + m.to_i.to_f / 60 + s.to_f / 3600
+      d.to_i + (m.to_i.to_f / 60) + (s.to_f / 3600)
     end
 
     # 日本測地系から世界測地系に変換する。

data/lib/jpmobile/template_details.rb

@@ -19,8 +19,8 @@ module Jpmobile
         requested.formats_idx[@format],
         requested.locale_idx[@locale],
         requested.variants_idx[@variant],
-        requested.handlers_idx[@handler],
         requested.mobile_idx[@mobile],
+        requested.handlers_idx[@handler],
       ]
     end
 

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '7.0.1'.freeze
+  VERSION = '7.0.2'.freeze
 end

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

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/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

data/spec/unit/receive_mail_spec.rb

@@ -12,7 +12,7 @@ describe 'Jpmobile::Mail#receive' do
 
   describe 'PC mail' do
     before(:each) do
-      @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/pc-mail-single.eml')).read)
+      @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/pc-mail-single.eml')))
     end
 
     it 'subject should be parsed correctly' do
@@ -49,7 +49,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'multipart' do
     describe 'PC mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/pc-mail-multi.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/pc-mail-multi.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -68,7 +68,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'PC mail without subject' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/pc-mail-attached-without-subject.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/pc-mail-attached-without-subject.eml')))
       end
 
       it 'body should be parsed correctly' do
@@ -84,7 +84,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Docomo' do
       context 'with sjis decomail' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/docomo-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/docomo-gmail-sjis.eml')))
         end
 
         it 'subject should be parsed correctly' do
@@ -111,7 +111,7 @@ describe 'Jpmobile::Mail#receive' do
 
       context 'with jis decomail' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/docomo-decomail.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/docomo-decomail.eml')))
         end
 
         it 'does not contain charset within multipart Content-Type' do
@@ -129,7 +129,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'Au' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -151,7 +151,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Softbank' do
       context 'Shift_JIS' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-sjis.eml')))
         end
 
         it 'subject should be parsed correctly' do
@@ -170,7 +170,7 @@ describe 'Jpmobile::Mail#receive' do
 
       context 'UTF-8' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-utf8.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-utf8.eml')))
         end
 
         it 'subject should be parsed correctly' do
@@ -190,7 +190,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'bounced mail' do
       it 'should parse sub-part charset correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/bounce_with_utf8_part.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/bounce_with_utf8_part.eml')))
         expect(@mail.parts.first.charset).to match(/iso-2022-jp/i)
         expect(@mail.parts.last.charset).to  match(/utf-8/i)
       end
@@ -199,7 +199,7 @@ describe 'Jpmobile::Mail#receive' do
 
   describe 'Docomo' do
     before(:each) do
-      @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/docomo-emoji.eml')).read)
+      @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/docomo-emoji.eml')))
     end
 
     it 'subject should be parsed correctly' do
@@ -234,7 +234,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'JIS mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/docomo-jis.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/docomo-jis.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -250,7 +250,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'Au' do
     context 'au-emoji.eml' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-emoji.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-emoji.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -286,36 +286,36 @@ describe 'Jpmobile::Mail#receive' do
 
     it 'should not be raised when parsing incoming email #41' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-email.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-email.eml')))
       }.not_to raise_error
     end
 
     it 'should not be raised when parsing incoming email #45' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-decomail2.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-decomail2.eml')))
       }.not_to raise_error
     end
 
     it 'should not be raised when parsing incoming email - include kigou' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-kigou.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-kigou.eml')))
       }.not_to raise_error
     end
 
     context 'From au iPhone' do
       it 'charset should be UTF-8' do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')))
         expect(@mail.mobile).to be_a(Jpmobile::Mobile::Au)
         expect(@mail.charset).to match(/utf-8/i)
       end
 
       it 'should be encoded correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')))
         expect(@mail.encoded).to match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
       end
 
       it 'should decode cp932-encoded mail correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-cp932.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-cp932.eml')))
         expect(@mail.subject).to eq 'Re: 【NKSC】test'
         expect(@mail.body.to_s).to eq 'テストです。㈱'
       end
@@ -323,20 +323,20 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'From iPad' do
       it 'charset should be UTF-8' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')))
         expect(@mail.mobile).to be_a(Jpmobile::Mobile::AbstractMobile)
         expect(@mail.charset).to match(/utf-8/i)
       end
 
       it 'should be encoded correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')))
         expect(@mail.encoded).to match(/BK\\J82~9T\$J\$7!2#5#1#2J8;z!2/)
       end
     end
 
     it 'should not raise when parsing attached email' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-attached.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-attached.eml')))
         expect(@mail.encoded).to match('/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPQAA')
       }.not_to raise_error
     end
@@ -344,7 +344,7 @@ describe 'Jpmobile::Mail#receive' do
 
   describe 'Softbank' do
     before(:each) do
-      @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/softbank-emoji.eml')).read)
+      @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/softbank-emoji.eml')))
     end
 
     it 'subject should be parsed correctly' do
@@ -379,7 +379,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'blank-mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/softbank-blank.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/softbank-blank.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -395,7 +395,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'iPhone' do
     context 'JIS mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-jis.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-jis.eml')))
       end
 
       it 'body should be parsed correctly' do
@@ -405,7 +405,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'when the mail contains UTF-8 emojis' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-unicode-emoji.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-unicode-emoji.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -419,7 +419,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'when the mail contains circled-numbers' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-circled-numbers-in-jis.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-circled-numbers-in-jis.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -435,7 +435,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'bounced mail' do
     context 'has jp address' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/bounced-jp.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/bounced-jp.eml')))
       end
 
       it 'mobile should abstract mobile' do
@@ -447,7 +447,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'non-Japanese mail' do
     context 'us-ascii' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/non-jp.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/non-jp.eml')))
       end
 
       it 'mobile should be nil' do
@@ -458,7 +458,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'no From header' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/no-from.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/no-from.eml')))
       end
 
       it 'mobile should be nil' do

data/test/rails/overrides/app/mailers/decorated_mailer.rb

@@ -3,7 +3,7 @@ class DecoratedMailer < Jpmobile::Mailer::Base
   default to: 'info@jp.mobile'
 
   def deco_mail(to_mail)
-    attachments.inline['photo.jpg'] = File.open(File.join(Rails.root, 'spec/fixtures/files/mobile_mailer/photo.jpg')).read
+    attachments.inline['photo.jpg'] = File.read(File.join(Rails.root, 'spec/fixtures/files/mobile_mailer/photo.jpg'))
 
     mail(to: to_mail, subject: '題名', decorated: true)
   end

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

@@ -1,3 +1,4 @@
+# rubocop:disable Performance/CollectionLiteralInLoop
 RailsRoot::Application.routes.draw do
   resources :users
   namespace :admin do
@@ -102,3 +103,4 @@ RailsRoot::Application.routes.draw do
     end
   end
 end
+# rubocop:enable Performance/CollectionLiteralInLoop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -461,7 +461,8 @@ files:
 homepage: http://jpmobile-rails.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -477,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Rails plugin for mobile devices in Japan