jpmobile 6.1.0 → 7.0.1

data/lib/jpmobile/util.rb

@@ -255,9 +255,8 @@ module Jpmobile
         SJIS
       when ::Encoding::UTF_8
         UTF8
-      when ::Encoding::ASCII_8BIT
-        BINARY
       else
+        # 上記以外はすべて BINARY 扱い
         BINARY
       end
     end
@@ -292,12 +291,12 @@ module Jpmobile
     def split_text(str, size = 15)
       return nil if str.nil? || (str == '')
 
-      [str[0..(size - 1)], str[size..-1]]
+      [str[0..(size - 1)], str[size..]]
     end
 
     def invert_table(hash)
       result = {}
-      hash.keys.each do |key|
+      hash.each_key do |key|
         if result[hash[key]]
           if !key.is_a?(Array) && !result[hash[key]].is_a?(Array) && result[hash[key]] > key
             result[hash[key]] = key

data/lib/jpmobile/version.rb

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

data/lib/jpmobile/view_selector.rb

@@ -0,0 +1,25 @@
+module Jpmobile
+  module ViewSelector
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :register_mobile
+
+      self.view_paths = Jpmobile::PathSet.new(self.view_paths.paths.map(&:path))
+    end
+
+    def register_mobile
+      if request.mobile
+        # register mobile
+        self.lookup_context.mobile = request.mobile.variants
+      end
+    end
+
+    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/jpmobile.rb

@@ -48,9 +48,19 @@ module Jpmobile
     end
 
     def self.carriers=(ary)
+      @all_variants = nil
+
       @carriers = ary
     end
 
+    def self.all_variants
+      return @all_variants if @all_variants
+
+      @all_variants = carriers.map {|carrier|
+        Jpmobile::Mobile.const_get(carrier).new({}, {}).variants
+      }.flatten.uniq
+    end
+
     require 'jpmobile/mobile/abstract_mobile'
   end
 
@@ -63,6 +73,10 @@ module Jpmobile
   autoload :Mailer,   'jpmobile/mailer'
   autoload :Resolver, 'jpmobile/resolver'
 
+  autoload :PathSet,         'jpmobile/path_set'
+  autoload :TemplateDetails, 'jpmobile/template_details'
+
+  autoload :ViewSelector,         'jpmobile/view_selector'
   autoload :FallbackViewSelector, 'jpmobile/fallback_view_selector'
 
   autoload :ParamsOverCookie,    'jpmobile/trans_sid'

data/lib/tasks/jpmobile_tasks.rake

@@ -112,12 +112,13 @@ namespace :test do
 
         system 'bundle install'
         system 'bin/rails db:migrate RAILS_ENV=test' unless skip
-        system 'bin/rails spec'
+        system 'bin/rails spec', exception: true
 
         ENV.replace(original_env)
       end
     end
   end
+
   desc 'Run sinatra on jpmobile tests'
   Rake::TestTask.new(:sinatra) do |t|
     t.libs << 'lib'

data/spec/rack/jpmobile/mobile_by_ua_spec.rb

@@ -17,6 +17,7 @@ describe Jpmobile::MobileCarrier do
     [Jpmobile::Mobile::Emobile, 'emobile/1.0.0 (H11T; like Gecko; Wireless) NetFront/3.4'],
     [Jpmobile::Mobile::Iphone, 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; ja-jp) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16'],
     [Jpmobile::Mobile::Android, 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1'],
+    [Jpmobile::Mobile::Android, 'Mozilla/5.0 (Linux; Android 9; ANE-LX2J Build/HUAWEIANE-LX2J; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/88.0.4324.93 Mobile Safari/537.36 Instagram 172.0.0.21.123 Android (28/9; 480dpi; 1080x2060; HUAWEI; ANE-LX2J; HWANE; hi6250; ja_JP; 269790805)'],
     [Jpmobile::Mobile::WindowsPhone, 'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)'],
     [Jpmobile::Mobile::BlackBerry, 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220'],
     [Jpmobile::Mobile::Ipad, 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'],

data/spec/rack_helper.rb

@@ -75,8 +75,6 @@ module Jpmobile::RackHelper
     body = case res
            when Array
              res[2]
-           when String
-             res.body
            else
              res.body
            end
@@ -84,8 +82,6 @@ module Jpmobile::RackHelper
     case body
     when Array
       body.first
-    when String
-      body
     else
       body
     end

data/spec/unit/email_spec.rb

@@ -56,7 +56,7 @@ describe 'Jpmobile::Email' do
 
   describe 'japanese_mail_address_regexp' do
     before do
-      Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z\.\-]|$)/)
+      Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z.\-]|$)/)
     end
 
     it '#detect_from_mail_header should return Jpmobile::Mobile::AbstractMobile when the header contains .jp address' do

data/spec/unit/receive_mail_spec.rb

@@ -7,7 +7,7 @@ describe 'Jpmobile::Mail#receive' do
 
   before(:each) do
     @to = 'info@jpmobile-rails.org'
-    Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z\.\-]/)
+    Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z.\-]/)
   end
 
   describe 'PC mail' do

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', '~> 1.1.1'
+gem 'activerecord-session_store', git: 'https://github.com/rails/activerecord-session_store.git', ref: 'f188efbc49a522123cc8acc805143824176d01c1'
 
 gem 'pry'
 gem 'pry-byebug'
@@ -14,3 +14,7 @@ group :development, :test do
   gem "rspec-rails"
   gem 'rails-controller-testing'
 end
+
+group :test do
+  gem 'cuprite'
+end

data/test/rails/overrides/app/controllers/mobile_spec_controller.rb

@@ -8,6 +8,6 @@ class MobileSpecController < ApplicationController
     render file: File.join(Rails.public_path, '422.html')
   end
 
-  def no_mobile
+  def mobile_not_exist
   end
 end

data/test/rails/overrides/app/controllers/template_path_controller.rb

@@ -10,6 +10,9 @@ class TemplatePathController < ApplicationController
   def show
   end
 
+  def partial
+  end
+
   def optioned_index
     render action: 'index'
   end

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

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

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

@@ -61,7 +61,7 @@ RailsRoot::Application.routes.draw do
   %w[
     index
     file_render
-    no_mobile
+    mobile_not_exist
   ].each do |a|
     get "mobile_spec/#{a}", to: "mobile_spec##{a}"
   end

data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb

@@ -6,7 +6,7 @@ shared_examples_for 'docomo_guid が起動しないとき' do
   it 'で link_to の自動書き換えが行われない' do
     get :link
 
-    expect(response.body).to match(%r{href=\".+/link\"})
+    expect(response.body).to match(%r{href=".+/link"})
   end
 end
 
@@ -14,7 +14,7 @@ shared_examples_for 'docomo_guid が起動するとき' do
   it 'で link_to の自動書き換えが行われる' do
     get :link
 
-    expect(response.body).to match(%r{href=\".+/link\?guid=ON\"})
+    expect(response.body).to match(%r{href=".+/link\?guid=ON"})
   end
 end
 

data/test/rails/overrides/spec/controllers/mobile_spec_controller_spec.rb

@@ -52,7 +52,7 @@ describe MobileSpecController, type: :controller do
     end
   end
 
-  describe "GET 'no_mobile'" do
+  describe "GET 'mobile_not_exist'" do
     around do |example|
       orig_value = Jpmobile.config.fallback_view_selector
       Jpmobile.config.fallback_view_selector = true
@@ -65,7 +65,7 @@ describe MobileSpecController, type: :controller do
     context 'PC access' do
       it 'should be successful' do
         request.user_agent = 'Mozilla'
-        get 'no_mobile'
+        get 'mobile_not_exist'
 
         expect(response).to be_successful
         expect(response.body).not_to match('RailsRoot PC mobile')
@@ -75,7 +75,7 @@ describe MobileSpecController, type: :controller do
     context 'mobile access' do
       it 'should be successful' do
         request.user_agent = 'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
-        get 'no_mobile'
+        get 'mobile_not_exist'
 
         expect(response).to be_successful
         expect(response.body).not_to match('RailsRoot mobile')

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

@@ -48,7 +48,7 @@ RSpec.configure do |config|
   #       # ...
   #     end
   #
-  # The different available types are documented in the features, such as in
+  # The different available types are documented in the system, such as in
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 

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 }