jpmobile 6.0.0 → 7.0.0

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

@@ -0,0 +1,106 @@
+require 'system_helper'
+
+describe 'jpmobile integration spec', type: :request do
+  include Jpmobile::Util
+
+  before do
+    page.driver.headers = { 'User-Agent' => user_agent }
+  end
+
+  shared_examples_for '文字コードフィルタが動作しているとき' do
+    it 'はhtml以外は変換しないこと' do
+      get "/#{controller}/rawdata", env: { 'HTTP_USER_AGENT' => user_agent }
+      expect(response.body.encode('UTF-8')).to eq('アブラカダブラ')
+      expect(response.headers['Content-Type']).not_to match(/charset/i)
+    end
+  end
+
+  #
+  # PCからのアクセス
+  #
+  describe FilterController do
+    let(:controller) { 'filter' }
+
+    describe 'PCからのアクセス' do
+      let(:user_agent) do
+        'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'DoCoMo SH902i からのアクセス' do
+      let(:user_agent) do
+        'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'au CA32 からのアクセス' do
+      let(:user_agent) do
+        'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'Vodafone V903T からのアクセス' do
+      let(:user_agent) do
+        'Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'SoftBank 910T からのアクセス' do
+      let(:user_agent) do
+        'SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+  end
+
+  describe HankakuFilterController do
+    let(:controller) { 'hankaku_filter' }
+
+    describe 'PCからのアクセス' do
+      let(:user_agent) do
+        'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'DoCoMo SH902i からのアクセス' do
+      let(:user_agent) do
+        'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'SoftBank 910T からのアクセス' do
+      let(:user_agent) do
+        'SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+  end
+
+  describe HankakuInputFilterController do
+    let(:controller) { 'hankaku_input_filter' }
+
+    describe 'DoCoMo SH902i からのアクセス' do
+      let(:user_agent) do
+        'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'SoftBank 910T からのアクセス' do
+      let(:user_agent) do
+        'SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe TemplatePathController, 'integrated_views', type: :request do
   before do
-    page.driver.header('User-Agent', user_agent)
+    page.driver.headers = { 'User-Agent' => user_agent }
   end
 
   describe 'index' do

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

@@ -27,12 +27,12 @@ describe 'trans_sid functional', type: :request do
     it 'で link_to の自動書き換えが行われない' do
       res = get_with_session(@controller, 'link', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/.+?/link\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/.+?/link">linkto</a>})
     end
     it 'で form の自動書き換えが行われない' do
       res = get_with_session(@controller, 'form', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/.+?/form\".*accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/.+?/form".*accept-charset="#{@charset}"})
     end
     it 'で redirect の自動書き換えが行われない' do
       res = get_with_session(@controller, 'redirect', @user_agent)
@@ -45,16 +45,16 @@ describe 'trans_sid functional', type: :request do
     it 'で link_to の自動書き換えが行われる' do
       res = get_with_session(@controller, 'link', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/.+?/link\?_session_id=[a-zA-Z0-9]{32}\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/.+?/link\?_session_id=[a-zA-Z0-9]{32}">linkto</a>})
     end
     it 'で form内にhiddenが差し込まれる' do
       res = get_with_session(@controller, 'form', @user_agent)
-      expect(res.response.body).to match(/<input type=\"hidden\" name=\".+\" value=\"[a-zA-Z0-9]{32}\"/)
+      expect(res.response.body).to match(/<input type="hidden" name=".+" value="[a-zA-Z0-9]{32}"/)
     end
     it 'で form の自動書き換えが行われる' do
       res = get_with_session(@controller, 'form', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/.+?/form\?_session_id=[a-zA-Z0-9]{32}\".*accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/.+?/form\?_session_id=[a-zA-Z0-9]{32}".*accept-charset="#{@charset}"})
     end
     it 'で redirect の自動書き換えが行われる' do
       res = get_with_session(@controller, 'redirect', @user_agent)
@@ -66,12 +66,12 @@ describe 'trans_sid functional', type: :request do
     it 'で @user の link_to の自動書き換えが行われる' do
       res = get_with_session(@controller, 'link_path', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/users/1\?_session_id=[a-zA-Z0-9]{32}\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/users/1\?_session_id=[a-zA-Z0-9]{32}">linkto</a>})
     end
     it 'で @user の form の自動書き換えが行われる' do
       res = get_with_session(@controller, 'form_path', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/users/1\?_session_id=[a-zA-Z0-9]{32}\".*accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/users/1\?_session_id=[a-zA-Z0-9]{32}".*accept-charset="#{@charset}"})
     end
     it 'で @path の redirect の自動書き換えが行われる' do
       res = get_with_session(@controller, 'redirect_path', @user_agent)
@@ -83,12 +83,12 @@ describe 'trans_sid functional', type: :request do
     it 'で [:admin, @user] の link_to の自動書き換えが行われる' do
       res = get_with_session(@controller, 'link_path_admin', @user_agent)
 
-      expect(res.response.body).to match(%r{<a href=\"/admin/users/1\?_session_id=[a-zA-Z0-9]{32}\">linkto</a>})
+      expect(res.response.body).to match(%r{<a href="/admin/users/1\?_session_id=[a-zA-Z0-9]{32}">linkto</a>})
     end
     it 'で [:admin, @user] の form の自動書き換えが行われる' do
       res = get_with_session(@controller, 'form_path_admin', @user_agent)
 
-      expect(res.response.body).to match(%r{<form.*action=\"/admin/users/1\?_session_id=[a-zA-Z0-9]{32}\".* accept-charset="#{@charset}"})
+      expect(res.response.body).to match(%r{<form.*action="/admin/users/1\?_session_id=[a-zA-Z0-9]{32}".* accept-charset="#{@charset}"})
     end
     it 'で [:admin, @path] の redirect の自動書き換えが行われる' do
       res = get_with_session(@controller, 'redirect_path_admin', @user_agent)

data/test/rails/overrides/spec/{features → system}/admin/top_spec.rb

@@ -1,9 +1,9 @@
-require 'rails_helper'
+require 'system_helper'
 
 describe Admin::TopController, type: :feature do
   describe "GET 'full_path'" do
     before do
-      page.driver.header('user_agent', user_agent)
+      page.driver.headers = { 'User-Agent' => user_agent }
     end
 
     context 'PCからのアクセスの場合' do

data/test/rails/overrides/spec/{features → system}/filter_spec.rb

@@ -1,10 +1,10 @@
-require 'rails_helper'
+require 'system_helper'
 
 describe 'jpmobile integration spec', type: :feature do
   include Jpmobile::Util
 
   before do
-    page.driver.header('User-Agent', user_agent)
+    page.driver.headers = { 'User-Agent' => user_agent }
   end
 
   shared_examples_for 'hankaku_filter input: true のとき' do
@@ -38,11 +38,6 @@ describe 'jpmobile integration spec', type: :feature do
   end
 
   shared_examples_for '文字コードフィルタが動作しているとき' do
-    it 'はhtml以外は変換しないこと' do
-      visit "/#{controller}/rawdata"
-      expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).not_to match(/charset/i)
-    end
     it 'response.bodyが空のときは文字コードを変更しないこと' do
       visit "/#{controller}/empty"
       expect(page.response_headers['Content-Type']).to match(/utf-8/i)

data/test/rails/overrides/spec/system/support/cuprite_setup.rb

@@ -0,0 +1,14 @@
+require 'capybara/cuprite'
+
+Capybara.register_driver(:cuprite) do |app|
+  Capybara::Cuprite::Driver.new(
+    app,
+    **{
+      window_size: [1200, 800],
+      browser_options: {},
+      inspector: true,
+    },
+  )
+end
+
+Capybara.default_driver = Capybara.javascript_driver = :cuprite

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
 - Yoji Shidara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -26,13 +26,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: scanf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -101,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0.alpha2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +218,7 @@ files:
 - lib/jpmobile/filter.rb
 - lib/jpmobile/helpers.rb
 - lib/jpmobile/hook_action_view.rb
+- lib/jpmobile/hook_template_details_requested.rb
 - lib/jpmobile/hook_test_request.rb
 - lib/jpmobile/lookup_context.rb
 - lib/jpmobile/mail.rb
@@ -237,9 +252,11 @@ files:
 - lib/jpmobile/session/active_record_store.rb
 - lib/jpmobile/session/mem_cache_store.rb
 - lib/jpmobile/sinatra.rb
+- lib/jpmobile/template_details.rb
 - lib/jpmobile/trans_sid.rb
 - lib/jpmobile/util.rb
 - lib/jpmobile/version.rb
+- lib/jpmobile/view_selector.rb
 - lib/tasks/jpmobile_tasks.rake
 - spec/rack/jpmobile/android_spec.rb
 - spec/rack/jpmobile/au_spec.rb
@@ -356,7 +373,7 @@ files:
 - test/rails/overrides/app/views/mobile_spec/_partial_view_sample.html.erb
 - test/rails/overrides/app/views/mobile_spec/index.html.erb
 - test/rails/overrides/app/views/mobile_spec/index_mobile.html.erb
-- test/rails/overrides/app/views/mobile_spec/no_mobile.html.erb
+- test/rails/overrides/app/views/mobile_spec/mobile_not_exist.html.erb
 - test/rails/overrides/app/views/normal_mailer/msg.text.erb
 - test/rails/overrides/app/views/template_path/_partial.html.erb
 - test/rails/overrides/app/views/template_path/_partial_mobile.html.erb
@@ -383,16 +400,14 @@ files:
 - test/rails/overrides/config/routes.rb
 - test/rails/overrides/db/migrate/001_add_sessions_table.rb
 - test/rails/overrides/db/migrate/20100824062306_create_users.rb
-- test/rails/overrides/db/migrate/20190419005447_create_active_storage_tables.active_storage.rb
-- test/rails/overrides/db/migrate/20190419005448_create_action_mailbox_tables.action_mailbox.rb
+- test/rails/overrides/db/migrate/20201111033056_create_active_storage_tables.active_storage.rb
+- test/rails/overrides/db/migrate/20201111033057_create_action_mailbox_tables.action_mailbox.rb
 - test/rails/overrides/spec/controllers/docomo_guid_spec.rb
 - test/rails/overrides/spec/controllers/hankaku_filter_controller_spec.rb
 - test/rails/overrides/spec/controllers/helpers_spec.rb
 - test/rails/overrides/spec/controllers/mobile_spec_controller_spec.rb
 - test/rails/overrides/spec/controllers/template_path_spec.rb
 - test/rails/overrides/spec/controllers/trans_sid_controller_spec.rb
-- test/rails/overrides/spec/features/admin/top_spec.rb
-- test/rails/overrides/spec/features/filter_spec.rb
 - test/rails/overrides/spec/fixtures/files/mobile_mailer/au-attached.eml
 - test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml
 - test/rails/overrides/spec/fixtures/files/mobile_mailer/au-emoji.eml
@@ -420,11 +435,16 @@ files:
 - test/rails/overrides/spec/rcov.opts
 - test/rails/overrides/spec/requests/docomo_spec.rb
 - test/rails/overrides/spec/requests/emobile_spec.rb
+- test/rails/overrides/spec/requests/filter_spec.rb
 - test/rails/overrides/spec/requests/pc_spec.rb
 - test/rails/overrides/spec/requests/softbank_emulator_spec.rb
 - test/rails/overrides/spec/requests/template_path_spec.rb
 - test/rails/overrides/spec/requests/trans_sid_spec.rb
 - test/rails/overrides/spec/spec_helper.rb
+- test/rails/overrides/spec/system/admin/top_spec.rb
+- test/rails/overrides/spec/system/filter_spec.rb
+- test/rails/overrides/spec/system/support/cuprite_setup.rb
+- test/rails/overrides/spec/system_helper.rb
 - test/sinatra/config.ru
 - test/sinatra/guestbook.rb
 - test/sinatra/test/filter_test.rb
@@ -442,7 +462,7 @@ homepage: http://jpmobile-rails.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -450,15 +470,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Rails plugin for mobile devices in Japan
 test_files:
@@ -577,7 +597,7 @@ test_files:
 - test/rails/overrides/app/views/mobile_spec/_partial_view_sample.html.erb
 - test/rails/overrides/app/views/mobile_spec/index.html.erb
 - test/rails/overrides/app/views/mobile_spec/index_mobile.html.erb
-- test/rails/overrides/app/views/mobile_spec/no_mobile.html.erb
+- test/rails/overrides/app/views/mobile_spec/mobile_not_exist.html.erb
 - test/rails/overrides/app/views/normal_mailer/msg.text.erb
 - test/rails/overrides/app/views/template_path/_partial.html.erb
 - test/rails/overrides/app/views/template_path/_partial_mobile.html.erb
@@ -604,16 +624,14 @@ test_files:
 - test/rails/overrides/config/routes.rb
 - test/rails/overrides/db/migrate/001_add_sessions_table.rb
 - test/rails/overrides/db/migrate/20100824062306_create_users.rb
-- test/rails/overrides/db/migrate/20190419005447_create_active_storage_tables.active_storage.rb
-- test/rails/overrides/db/migrate/20190419005448_create_action_mailbox_tables.action_mailbox.rb
+- test/rails/overrides/db/migrate/20201111033056_create_active_storage_tables.active_storage.rb
+- test/rails/overrides/db/migrate/20201111033057_create_action_mailbox_tables.action_mailbox.rb
 - test/rails/overrides/spec/controllers/docomo_guid_spec.rb
 - test/rails/overrides/spec/controllers/hankaku_filter_controller_spec.rb
 - test/rails/overrides/spec/controllers/helpers_spec.rb
 - test/rails/overrides/spec/controllers/mobile_spec_controller_spec.rb
 - test/rails/overrides/spec/controllers/template_path_spec.rb
 - test/rails/overrides/spec/controllers/trans_sid_controller_spec.rb
-- test/rails/overrides/spec/features/admin/top_spec.rb
-- test/rails/overrides/spec/features/filter_spec.rb
 - test/rails/overrides/spec/fixtures/files/mobile_mailer/au-attached.eml
 - test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml
 - test/rails/overrides/spec/fixtures/files/mobile_mailer/au-emoji.eml
@@ -641,11 +659,16 @@ test_files:
 - test/rails/overrides/spec/rcov.opts
 - test/rails/overrides/spec/requests/docomo_spec.rb
 - test/rails/overrides/spec/requests/emobile_spec.rb
+- test/rails/overrides/spec/requests/filter_spec.rb
 - test/rails/overrides/spec/requests/pc_spec.rb
 - test/rails/overrides/spec/requests/softbank_emulator_spec.rb
 - test/rails/overrides/spec/requests/template_path_spec.rb
 - test/rails/overrides/spec/requests/trans_sid_spec.rb
 - test/rails/overrides/spec/spec_helper.rb
+- test/rails/overrides/spec/system/admin/top_spec.rb
+- test/rails/overrides/spec/system/filter_spec.rb
+- test/rails/overrides/spec/system/support/cuprite_setup.rb
+- test/rails/overrides/spec/system_helper.rb
 - test/sinatra/config.ru
 - test/sinatra/guestbook.rb
 - test/sinatra/test/filter_test.rb

data/test/rails/overrides/app/views/mobile_spec/no_mobile.html.erb

@@ -1,3 +0,0 @@
-PC no_mobile
-
-<%= render 'partial_view_sample' -%>