jpmobile 7.2.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72981ae235237ef1bab49c5e4113fe1e4ab0c95ba36767b4483513f3cda1505
-  data.tar.gz: 44d93b06f4e3c31f300adcaf411d50992b6d07ea5842a8d66525917c647abb2f
+  metadata.gz: 7734464f89c44e577fb2285001c50878a641db1fd6d2a2950fab678fbe3739eb
+  data.tar.gz: 0cbc7800fa81bb2981e595c4ab57a8081a39653b2682b2948edda737321ea2bd
 SHA512:
-  metadata.gz: 9083c648760665f1a5960474aceda88081fc2c516c7eeeb50860de8b337c08efdf74a20031887ab1842f77d4e1ef58389847429edd51ad5d1bf3f44480f9bd1d
-  data.tar.gz: 397cb3b74428ccde97b84b9b6ba07eb99a0b5f2848bfad091714b72b7ec3367fa25a03a8250c41c28915078f9836eb62b3f24a16af9ee1984f29f95d8d85c70e
+  metadata.gz: 155f14390fe363425eb798aaafa8f686b30b9cc1fb9c8a4b358b45975199b490ac50bdb02742d4cc1a4773f7f76dcb997492803a43bb97afaf17bfc8f4298259
+  data.tar.gz: 7bd15aa282c7e4a0e4ceba3794895f44898186f49866e4eb0d8b5390a39576953f7de0c5f856c76c7e3af676d28aa7284d15f591e511e63bed4cf4fde4e9ceec

data/.ruby-version

@@ -1 +1 @@
-3.3.4
+3.3.6

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 gem 'geokit'
 gem 'git'
 gem 'pry'
-gem 'rails', '~> 7.2.0'
+gem 'rails', '~> 8.0.0'
 gem 'rspec'
 gem 'rspec-its'
 gem 'rspec-rails'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jpmobile (7.1.0)
+    jpmobile (7.2.0)
       mail (~> 2.8.0)
       rexml
       scanf
@@ -9,67 +9,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.0)
-      actionpack (= 7.2.0)
-      activesupport (= 7.2.0)
+    actioncable (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       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)
+    actionmailbox (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.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)
+    actionmailer (8.0.0)
+      actionpack (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activesupport (= 8.0.0)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.0)
-      actionview (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionpack (8.0.0)
+      actionview (= 8.0.0)
+      activesupport (= 8.0.0)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.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)
+    actiontext (8.0.0)
+      actionpack (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.0)
-      activesupport (= 7.2.0)
+    actionview (8.0.0)
+      activesupport (= 8.0.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.0)
-      activesupport (= 7.2.0)
+    activejob (8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.3.6)
-    activemodel (7.2.0)
-      activesupport (= 7.2.0)
-    activerecord (7.2.0)
-      activemodel (= 7.2.0)
-      activesupport (= 7.2.0)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.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)
+    activestorage (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activesupport (= 8.0.0)
       marcel (~> 1.0)
-    activesupport (7.2.0)
+    activesupport (8.0.0)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -79,37 +79,39 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.3.0)
     bigdecimal (3.1.8)
-    builder (3.2.4)
+    builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     date (3.3.4)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     geokit (1.14.0)
-    git (2.1.1)
+    git (2.3.1)
       activesupport (>= 5.0)
       addressable (~> 2.8)
       process_executer (~> 1.1)
       rchardet (~> 1.8)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.13.2)
+    io-console (0.7.2)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.7.2)
+    json (2.7.6)
     language_server-protocol (3.17.0.3)
-    logger (1.4.4)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -122,8 +124,8 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.23.1)
-    net-imap (0.4.14)
+    minitest (5.25.1)
+    net-imap (0.4.17)
       date
       net-protocol
     net-pop (0.1.2)
@@ -132,44 +134,45 @@ GEM
       timeout
     net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.15.6)
-      mini_portile2 (~> 2.8.2)
+    nio4r (2.7.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
-    process_executer (1.1.0)
+    process_executer (1.1.2)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     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)
+    public_suffix (5.1.1)
+    racc (1.8.1)
+    rack (3.1.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.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)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (8.0.0)
+      actioncable (= 8.0.0)
+      actionmailbox (= 8.0.0)
+      actionmailer (= 8.0.0)
+      actionpack (= 8.0.0)
+      actiontext (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activemodel (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       bundler (>= 1.15.0)
-      railties (= 7.2.0)
+      railties (= 8.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -177,62 +180,61 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.2.0)
-      actionpack (= 7.2.0)
-      activesupport (= 7.2.0)
+    railties (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rchardet (1.8.0)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.4.3)
+    reline (0.5.10)
       io-console (~> 0.5)
-    rexml (3.3.2)
+    rexml (3.3.6)
       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-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.0.1)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
       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)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.34.0)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
@@ -242,19 +244,20 @@ GEM
       mini_portile2 (~> 2.8.0)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    stringio (3.0.9)
+    stringio (3.1.1)
     strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
+    uri (0.13.1)
     useragent (0.16.10)
-    webrick (1.8.1)
+    webrick (1.8.2)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-20
@@ -267,7 +270,7 @@ DEPENDENCIES
   git
   jpmobile!
   pry
-  rails (~> 7.2.0)
+  rails (~> 8.0.0)
   rspec
   rspec-its
   rspec-rails

data/lib/jpmobile/fallback_view_selector.rb

@@ -2,7 +2,7 @@ require 'jpmobile/lookup_context'
 
 module Jpmobile
   module FallbackViewSelector
-    def render_to_body(options)
+    def _render_template(options)
       if Jpmobile.config.fallback_view_selector &&
          lookup_context.mobile.present? && !lookup_context.mobile.empty?
         begin

data/lib/jpmobile/request_with_mobile.rb

@@ -34,7 +34,7 @@ module Jpmobile
       mobile and !mobile.smart_phone?
     end
 
-    # viewの切り替えをするかどうか
+    # スマートフォンであれば +true+を、そうでなければ +false+ を返す。
     def smart_phone?
       mobile and mobile.smart_phone?
     end

data/lib/jpmobile/version.rb

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

data/lib/jpmobile/view_selector.rb

@@ -8,6 +8,8 @@ module Jpmobile
       self.view_paths = Jpmobile::PathSet.new(self.view_paths.paths.map(&:path))
     end
 
+    private
+
     def register_mobile
       if request.mobile
         # register mobile
@@ -18,8 +20,6 @@ module Jpmobile
     def disable_mobile_view!
       self.lookup_context.mobile = []
     end
-
-    private :register_mobile, :disable_mobile_view!
   end
   Rails::Application::Configuration.include Jpmobile::Configuration::RailsConfiguration
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -27,13 +27,13 @@ namespace :test do
     rails_root = 'test/rails/rails_root'
 
     puts 'Running tests in Rails'
-    skip = args.skip == 'true'
+    skip = !args.skip.nil?
 
     unless skip
       # generate rails app
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `rails new #{rails_root} --skip-bundle --skip-bootsnap --skip-webpack-install --skip-git --skip-spring`
+      `bundle exec rails new #{rails_root} --skip-bundle --skip-bootsnap --skip-webpack-install --skip-git --skip-spring`
     end
 
     # setup jpmobile

data/test/rails/overrides/Gemfile.jpmobile

@@ -4,7 +4,7 @@ gem 'jpmobile',             path: './vendor/jpmobile'
 gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
-gem 'activerecord-session_store', git: 'https://github.com/rails/activerecord-session_store.git', ref: 'f188efbc49a522123cc8acc805143824176d01c1'
+gem 'activerecord-session_store'
 
 gem 'pry'
 gem 'pry-byebug'

data/test/rails/overrides/spec/system/filter_spec.rb

@@ -40,7 +40,7 @@ describe 'jpmobile integration spec', type: :feature do
   shared_examples_for '文字コードフィルタが動作しているとき' do
     it 'response.bodyが空のときは文字コードを変更しないこと' do
       visit "/#{controller}/empty"
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
   end
 
@@ -48,13 +48,13 @@ describe 'jpmobile integration spec', type: :feature do
     it 'はShift_JISで携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/Shift_JIS/i)
     end
     it 'はxhtmlでもShift_JISで携帯に送出されること' do
       visit "/#{controller}/abracadabra_xhtml_utf8"
 
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/Shift_JIS/i)
     end
     it 'はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape(utf8_to_sjis("アブラカダブラ"))}"
@@ -72,12 +72,12 @@ describe 'jpmobile integration spec', type: :feature do
     it 'はUTF-8で携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
     it 'はxhtmlでもUTF-8で携帯に送出されること' do
       visit "/#{controller}/abracadabra_xhtml_utf8"
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
     it 'はparamsにUTF-8のまま格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape("アブラカダブラ")}"
@@ -94,7 +94,7 @@ describe 'jpmobile integration spec', type: :feature do
     it 'は半角に変換されShift_JISで携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ') # アブラカダブラ半角,SJIS
-      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/)
+      expect(extract_response_header(page, 'Content-Type')).to match(/Shift_JIS/)
     end
     it 'はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape(utf8_to_sjis("アブラカダブラ"))}"
@@ -112,7 +112,7 @@ describe 'jpmobile integration spec', type: :feature do
     it 'はUTF-8半角で携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ')
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
     it 'はparamsにUTF-8のまま格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape("アブラカダブラ")}"
@@ -223,7 +223,7 @@ describe 'jpmobile integration spec', type: :feature do
 
       it 'Content-Type が UTF-8 であること' do
         visit "/#{controller}/with_charset"
-        expect(page.response_headers['Content-Type']).to match(/UTF-8/i)
+        expect(extract_response_header(page, 'Content-Type')).to match(/UTF-8/i)
       end
     end
   end

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

@@ -1,3 +1,7 @@
 require 'rails_helper'
 
 Dir[File.join(__dir__, 'system/support/**/*.rb')].each {|file| require file }
+
+def extract_response_header(page, header)
+  page.response_headers[header] || page.response_headers[header.downcase]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -356,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Rails plugin for mobile devices in Japan