jpmobile 6.1.2 → 7.0.0

data/lib/jpmobile/mobile/vodafone.rb

@@ -4,9 +4,9 @@ module Jpmobile::Mobile
   # スーパクラスはSoftbank。
   class Vodafone < Softbank
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/.freeze
+    USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/
 
     # 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}.freeze
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(WILLCOM}
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/.freeze
+    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/
 
     # 位置情報があれば 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/.freeze
+    USER_AGENT_REGEXP = /Windows Phone/
   end
 end

data/lib/jpmobile/path_set.rb

@@ -1,41 +1,15 @@
 module Jpmobile
-  class PathSet < Array
-    %w[initialize << concat insert push unshift].each do |method|
-      class_eval <<-METHOD, __FILE__, __LINE__ + 1
-        def #{method}(*args)
-          super
-          typecast!
-        end
-      METHOD
-    end
+  class PathSet < ActionView::PathSet
+    private
 
-    def find(path, prefix = nil, partial = false, details = {}, key = nil)
-      template = find_all(path, prefix, partial, details, key).first
-      raise MissingTemplate.new(self, "#{prefix}/#{path}", details, partial) unless template
-
-      template
-    end
-
-    def find_all(*args)
-      each do |resolver|
-        templates = resolver.find_all(*args)
-        return templates unless templates.empty?
-      end
-      []
-    end
-
-    def exists?(*args)
-      find_all(*args).any?
-    end
-
-    protected
-
-    def typecast!
-      each_with_index do |path, i|
-        path = path.to_s if path.is_a?(Pathname)
-        next unless path.is_a?(String)
-
-        self[i] = Jpmobile::Resolver.new(path)
+    def typecast(paths)
+      paths.map do |path|
+        case path
+        when Pathname, String
+          Jpmobile::Resolver.new path.to_s
+        else
+          super(paths)
+        end
       end
     end
   end

data/lib/jpmobile/rails.rb

@@ -12,8 +12,10 @@ end
 
 ActiveSupport.on_load(:action_view) do
   require 'jpmobile/hook_action_view'
+  require 'jpmobile/hook_template_details_requested'
 
   self.prepend Jpmobile::HtmlOptionsWithAcceptCharset
+  ActionView::TemplateDetails::Requested.prepend Jpmobile::HookTemplateDetailsRequested
 end
 
 ActiveSupport.on_load(:after_initialize) do

data/lib/jpmobile/resolver.rb

@@ -1,14 +1,52 @@
 module Jpmobile
   class Resolver < ::ActionView::FileSystemResolver
-    EXTENSIONS = [:locale, :formats, :handlers, :mobile].freeze
-    DEFAULT_PATTERN = ':prefix/:action{_:mobile,}{.:locale,}{.:formats,}{+:variants,}{.:handlers,}'.freeze
-
     def initialize(path)
-      raise ArgumentError, 'path already is a Resolver class' if path.is_a?(Resolver)
+      super(path)
+
+      @path_parser = Jpmobile::Resolver::PathParser.new
+    end
 
+    def clear_cache
       super
-      @pattern = DEFAULT_PATTERN
-      @path = File.expand_path(path)
+
+      @path_parser = Jpmobile::Resolver::PathParser.new
+    end
+
+    class PathParser < ::ActionView::Resolver::PathParser
+      def build_path_regex
+        handlers = ::ActionView::Template::Handlers.extensions.map {|x| Regexp.escape(x) }.join('|')
+        formats = ::ActionView::Template::Types.symbols.map {|x| Regexp.escape(x) }.join('|')
+        locales = '[a-z]{2}(?:-[A-Z]{2})?'
+        variants = '[^.]*'
+        mobile = Jpmobile::Mobile.all_variants.map {|x| Regexp.escape(x) }.join('|')
+
+        %r{
+          \A
+          (?:(?<prefix>.*)/)?
+          (?<partial>_)?
+          (?<action>.*?)
+          (?:_(?<mobile>#{mobile}))??
+          (?:\.(?<locale>#{locales}))??
+          (?:\.(?<format>#{formats}))??
+          (?:\+(?<variant>#{variants}))??
+          (?:\.(?<handler>#{handlers}))?
+          \z
+        }x
+      end
+
+      def parse(path)
+        @regex ||= build_path_regex
+        match = @regex.match(path)
+        path = ActionView::TemplatePath.build(match[:action], match[:prefix] || '', !!match[:partial])
+        details = Jpmobile::TemplateDetails.new(
+          match[:locale]&.to_sym,
+          match[:handler]&.to_sym,
+          match[:format]&.to_sym,
+          match[:variant]&.to_sym,
+          match[:mobile]&.to_sym,
+        )
+        ParsedPath.new(path, details)
+      end
     end
   end
 end

data/lib/jpmobile/template_details.rb

@@ -0,0 +1,38 @@
+module Jpmobile
+  class TemplateDetails < ActionView::TemplateDetails
+    def initialize(locale, handler, format, variant, mobile)
+      @mobile = mobile
+
+      super(locale, handler, format, variant)
+    end
+
+    def matches?(requested)
+      requested.formats_idx[@format] &&
+        requested.locale_idx[@locale] &&
+        requested.variants_idx[@variant] &&
+        requested.handlers_idx[@handler] &&
+        requested.mobile_idx[@mobile]
+    end
+
+    def sort_key_for(requested)
+      [
+        requested.formats_idx[@format],
+        requested.locale_idx[@locale],
+        requested.variants_idx[@variant],
+        requested.handlers_idx[@handler],
+        requested.mobile_idx[@mobile],
+      ]
+    end
+
+    class Requested < ActionView::TemplateDetails::Requested
+      attr_reader :mobile, :mobile_idx
+
+      def initialize(locale:, handlers:, formats:, variants:, mobile:)
+        super(locale: locale, handlers: handlers, formats: formats, variants: variants)
+
+        @mobile = mobile.map(&:to_sym)
+        @mobile_idx = build_idx_hash(mobile)
+      end
+    end
+  end
+end

data/lib/jpmobile/trans_sid.rb

@@ -91,7 +91,7 @@ module Jpmobile
 end
 
 module ActionController
-  class Metal #:nodoc:
+  class Metal # :nodoc:
     class_attribute :trans_sid_mode
 
     class << self

data/lib/jpmobile/util.rb

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

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '6.1.2'.freeze
+  VERSION = '7.0.0'.freeze
 end

data/lib/jpmobile/view_selector.rb

@@ -1,12 +1,11 @@
 module Jpmobile
   module ViewSelector
-    def self.included(base)
-      base.class_eval do
-        before_action :register_mobile
+    extend ActiveSupport::Concern
 
-        self._view_paths = self._view_paths.dup
-        self.view_paths.unshift(*self.view_paths.map {|resolver| Jpmobile::Resolver.new(resolver.to_path) })
-      end
+    included do
+      before_action :register_mobile
+
+      self.view_paths = Jpmobile::PathSet.new(self.view_paths.paths.map(&:path))
     end
 
     def register_mobile

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,9 @@ 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'
 

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/test/rails/overrides/Gemfile.jpmobile

@@ -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/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/{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 }