jpmobile 7.0.4 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8acb3fe12055999174dfcc30d0921aa35a248e22d9fb64540114e41bded0672e
-  data.tar.gz: dba26d765bb314423d84acbad508f79ba7b2d0169a5c58c2e5b2613231ae50b2
+  metadata.gz: d72981ae235237ef1bab49c5e4113fe1e4ab0c95ba36767b4483513f3cda1505
+  data.tar.gz: 44d93b06f4e3c31f300adcaf411d50992b6d07ea5842a8d66525917c647abb2f
 SHA512:
-  metadata.gz: c466981bb59f0bbae858d9c798d6f9376ba55a3d7c614619b9ac8741480f7518c5e6690ba905c7db032d8ed9ee915fdf0ee54ac09211c037517f4b99f022ec43
-  data.tar.gz: 0b20fa2cccb7cdd57c5505029c8300bc8d1e0f0851da5e0251dea95dc34e7c0b6aaf6af4e4f20f7e452888f5f1dd4ecff392469301df644133cc000f83a55daa
+  metadata.gz: 9083c648760665f1a5960474aceda88081fc2c516c7eeeb50860de8b337c08efdf74a20031887ab1842f77d4e1ef58389847429edd51ad5d1bf3f44480f9bd1d
+  data.tar.gz: 397cb3b74428ccde97b84b9b6ba07eb99a0b5f2848bfad091714b72b7ec3367fa25a03a8250c41c28915078f9836eb62b3f24a16af9ee1984f29f95d8d85c70e

data/.circleci/config.yml

@@ -1,11 +1,11 @@
 version: 2.1
 orbs:
-  browser-tools: circleci/browser-tools@1.4.1
+  browser-tools: circleci/browser-tools@1.4.8
 jobs:
   test-job:
     working_directory: ~/jpmobile
     docker:
-      - image: cimg/ruby:3.2-browsers
+      - image: cimg/ruby:3.3-browsers
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3

data/.rubocop.yml

@@ -1,9 +1,10 @@
-require: rubocop-performance
+require:
+  - rubocop-performance
 
 inherit_from: './.onkcop-config.yml'
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
   Exclude:
     - 'tmp/**/*'
     - 'bin/*'
@@ -12,6 +13,7 @@ AllCops:
     - 'tools/**/*'
     - 'test/rails/rails_root/**/*'
     - 'vendor/**/*'
+  NewCops: enable
 
 Style/StringLiterals:
   EnforcedStyle: single_quotes
@@ -366,4 +368,47 @@ Style/MinMaxComparison: # new in 1.42
 Style/OperatorMethodCall: # new in 1.37
   Enabled: true
 Style/RedundantConstantBase: # new in 1.40
-  Enabled: true
+  Enabled: true
+
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Style/DataInheritance: # new in 1.49
+  Enabled: true
+Style/ExactRegexpMatch: # new in 1.51
+  Enabled: true
+Style/MapIntoArray: # new in 1.63
+  Enabled: true
+Style/RedundantArrayConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantFilterChain: # new in 1.52
+  Enabled: true
+Style/RedundantLineContinuation: # new in 1.49
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/RedundantRegexpConstructor: # new in 1.52
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+Performance/MapMethodChain: # new in 1.19
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.3.4

data/Gemfile

@@ -5,14 +5,11 @@ gemspec
 
 gem 'geokit'
 gem 'git'
-gem 'hpricot'
 gem 'pry'
-gem 'rails', '~> 7.0.0'
+gem 'rails', '~> 7.2.0'
 gem 'rspec'
 gem 'rspec-its'
 gem 'rspec-rails'
 gem 'rubocop', require: false
 gem 'rubocop-performance', require: false
-gem 'rubocop-rails', require: false
-gem 'rubocop-rspec', require: false
 gem 'sqlite3-ruby'

data/Gemfile.lock

@@ -1,250 +1,279 @@
 PATH
   remote: .
   specs:
-    jpmobile (7.0.3)
-      mail (~> 2.7.0)
+    jpmobile (7.1.0)
+      mail (~> 2.8.0)
       rexml
       scanf
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actioncable (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.2.0)
+      actionpack (= 7.2.0)
+      activejob (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)
+      mail (>= 2.8.0)
+    actionmailer (7.2.0)
+      actionpack (= 7.2.0)
+      actionview (= 7.2.0)
+      activejob (= 7.2.0)
+      activesupport (= 7.2.0)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.2.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.2)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (7.2.0)
+      actionpack (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionview (7.2.0)
+      activesupport (= 7.2.0)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.2.0)
+      activesupport (= 7.2.0)
       globalid (>= 0.3.6)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activestorage (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activemodel (7.2.0)
+      activesupport (= 7.2.0)
+    activerecord (7.2.0)
+      activemodel (= 7.2.0)
+      activesupport (= 7.2.0)
+      timeout (>= 0.4.0)
+    activestorage (7.2.0)
+      actionpack (= 7.2.0)
+      activejob (= 7.2.0)
+      activerecord (= 7.2.0)
+      activesupport (= 7.2.0)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.4.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.0)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    diff-lcs (1.5.0)
-    digest (3.1.1)
+    date (3.3.4)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
     erubi (1.12.0)
     geokit (1.14.0)
-    git (1.18.0)
+    git (2.1.1)
+      activesupport (>= 5.0)
       addressable (~> 2.8)
+      process_executer (~> 1.1)
       rchardet (~> 1.8)
-    globalid (1.0.1)
-      activesupport (>= 5.0)
-    hpricot (0.8.6)
-    i18n (1.12.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    loofah (2.19.1)
+    io-console (0.6.0)
+    irb (1.13.2)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.4.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.2)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
     method_source (1.0.0)
-    mini_mime (1.1.2)
-    minitest (5.18.0)
-    net-imap (0.2.3)
-      digest
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.23.1)
+    net-imap (0.4.14)
+      date
       net-protocol
-      strscan
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2-arm64-darwin)
+    nio4r (2.7.3)
+    nokogiri (1.15.6)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
-      racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
+      racc
+    process_executer (1.1.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.1)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    psych (5.1.2)
+      stringio
+    public_suffix (5.0.5)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4.3)
-      actioncable (= 7.0.4.3)
-      actionmailbox (= 7.0.4.3)
-      actionmailer (= 7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actiontext (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
+    rails (7.2.0)
+      actioncable (= 7.2.0)
+      actionmailbox (= 7.2.0)
+      actionmailer (= 7.2.0)
+      actionpack (= 7.2.0)
+      actiontext (= 7.2.0)
+      actionview (= 7.2.0)
+      activejob (= 7.2.0)
+      activemodel (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)
       bundler (>= 1.15.0)
-      railties (= 7.0.4.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      railties (= 7.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      method_source
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rchardet (1.8.0)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.4.3)
+      io-console (~> 0.5)
+    rexml (3.3.2)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.4)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (6.0.1)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.11)
-      rspec-expectations (~> 3.11)
-      rspec-mocks (~> 3.11)
-      rspec-support (~> 3.11)
-    rspec-support (3.12.0)
-    rubocop (1.48.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
-      rubocop (~> 1.41)
-    rubocop-performance (1.16.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.18.0)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.19.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     scanf (1.0.0)
-    sqlite3 (1.6.1-arm64-darwin)
-    sqlite3 (1.6.1-x86_64-linux)
+    securerandom (0.3.1)
+    sqlite3 (1.6.1)
+      mini_portile2 (~> 2.8.0)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    strscan (3.0.6)
-    thor (1.2.1)
-    timeout (0.3.2)
+    stringio (3.0.9)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    websocket-driver (0.7.5)
+    unicode-display_width (2.5.0)
+    useragent (0.16.10)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
   geokit
   git
-  hpricot
   jpmobile!
   pry
-  rails (~> 7.0.0)
+  rails (~> 7.2.0)
   rspec
   rspec-its
   rspec-rails
   rubocop
   rubocop-performance
-  rubocop-rails
-  rubocop-rspec
   sqlite3-ruby
 
 BUNDLED WITH
-   2.3.15
+   2.5.17

data/jpmobile.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.require_paths = ['lib']
 
-  gem.required_ruby_version = '>= 2.7.0'
+  gem.required_ruby_version = '>= 3.2.0'
 
-  gem.add_dependency 'mail', '~> 2.7.0'
+  gem.add_dependency 'mail', '~> 2.8.0'
   gem.add_dependency 'rexml'
   gem.add_dependency 'scanf'
   gem.metadata['rubygems_mfa_required'] = 'true'

data/lib/jpmobile/email.rb

@@ -50,7 +50,7 @@ module Jpmobile
           end
         end
 
-        nil
+        false
       end
     end
   end

data/lib/jpmobile/emoticon.rb

@@ -1,5 +1,4 @@
 require 'scanf'
-require 'nkf'
 
 module Jpmobile
   # 絵文字関連処理
@@ -288,7 +287,7 @@ module Jpmobile
         begin
           yaml_hash = YAML.load_file(@pc_emoticon_yaml)
           @pc_emoticon_hash = Hash[*(yaml_hash.values.inject([]) {|r, v| r += v.to_a.flatten; r })]
-          @pc_emoticon_image_path.chop if @pc_emoticon_image_path.match?(%r{/$})
+          @pc_emoticon_image_path.chop! if @pc_emoticon_image_path.match?(%r{/$})
 
           return true
         rescue

data/lib/jpmobile/fallback_view_selector.rb

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

data/lib/jpmobile/filter.rb

@@ -133,7 +133,7 @@ module Jpmobile
       before_encoding = str.encoding
       str.force_encoding('UTF-8')
 
-      str = self.class.send("#{method}_format", str)
+      str = self.class.send(:"#{method}_format", str)
 
       # 元に戻す
       if before_encoding

data/lib/jpmobile/helpers.rb

@@ -139,7 +139,7 @@ module Jpmobile
         options[:only_path] = false
         url = url_for(options)
       end
-      url.sub!(/\?/, '&')
+      url.sub!('?', '&')
       "location:#{mode}?url=#{url}"
     end
 

data/lib/jpmobile/hook_template_details_requested.rb

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