jpmobile 7.0.2 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1353f6341c914dfadbe29cdf617506304701dafdbdc826e21a7339b8963d7934
-  data.tar.gz: 6007f9958265cae1eb8e73fdf50fb308b6d5ce086452d6986025244d52e525bb
+  metadata.gz: b00599e53c71e6bf45f9d8b953b4e7256d3a0f32f1e7f905006467e4a2dd8095
+  data.tar.gz: 935af37ae804e50db7cccf3fa979abddde111ba5f9e9fe61fea57a1420a567d8
 SHA512:
-  metadata.gz: b5623190d12407d9f5f6bd8348faf7fa2f81b206dc773d13898acc2a1da354fac16916564883c56692246fc4ebdcd8f40dc7ddd9f39e1d9974bb22abe5bf5d33
-  data.tar.gz: e873923cfcfcfdd0a80211a1197269117f920c905a886ed22cb0fbcadeeb8d6a3065d7dafde6839a053aff7107fff08e4d913f80c7a4fc948314a670f20588ee
+  metadata.gz: 4f418fba357ce7cd534817f4a398b0308d9baa720196ff6eecdb459806f5c998a1408db386ce9917bf74e62857406dd91f8f6757319b35d95f571a763b2f5ad1
+  data.tar.gz: 8067721a16ed607f3074326ebf340be90e6991bdc186a4e9d8f251a8b857b67789d235489d6bf75511f3b7b66923c8a6f1f62ba84df95f2e041143d3b307aa80

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jpmobile (7.0.1)
+    jpmobile (7.0.3)
       mail (~> 2.7.0)
       rexml
       scanf

data/README.md

@@ -294,6 +294,28 @@ def index
 end
 ```
 
+### アクション定義の省略
+
+Railsでは、アクション名に対応するテンプレートが存在する場合、アクション用のメソッド定義を省略できる。
+
+しかし、端末向けテンプレートしか存在しないアクションの場合、jpmobileではメソッド定義を省略することを許していない。
+
+```ruby
+class MyController < ApplicationController
+  # app/views/my/index_smart_phone.html.erb がある場合でも、次のメソッド定義は必須。
+  def index
+  end
+end
+```
+
+次のように設定を加えると、これを省略できるようになる。
+
+```ruby
+class MyController < ApplicationController
+  include Jpmobile::MethodLessActionSupport
+end
+```
+
 ### 位置情報の取得用リンクの生成
 
 以下のようなコードで、端末に位置情報を要求するリンクを出力する。

data/lib/jpmobile/method_less_action_support.rb

@@ -0,0 +1,11 @@
+module Jpmobile
+  module MethodLessActionSupport
+    def template_exists?(*args, **kwargs, &block)
+      super(
+        *args,
+        **kwargs.reverse_merge(mobile: request.mobile&.variants || []),
+        &block
+      )
+    end
+  end
+end

data/lib/jpmobile/rails.rb

@@ -2,6 +2,7 @@ ActiveSupport.on_load(:action_controller) do
   require 'jpmobile/docomo_guid'
   require 'jpmobile/filter'
   require 'jpmobile/helpers'
+  require 'jpmobile/method_less_action_support'
   require 'jpmobile/trans_sid'
   require 'jpmobile/hook_test_request'
   ActionDispatch::Request.prepend Jpmobile::Encoding

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '7.0.2'.freeze
+  VERSION = '7.0.3'.freeze
 end

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

@@ -0,0 +1,3 @@
+class MethodLessActionSupportController < ApplicationController
+  include Jpmobile::MethodLessActionSupport
+end

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

@@ -102,5 +102,7 @@ RailsRoot::Application.routes.draw do
       get "#{c}/#{a}", to: "#{c}##{a}"
     end
   end
+
+  get 'method_less_action_support', to: 'method_less_action_support#index'
 end
 # rubocop:enable Performance/CollectionLiteralInLoop

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

@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+describe 'Method-less mobile template only action', type: :request do
+  subject do
+    get '/method_less_action_support', headers: headers
+  end
+
+  let(:headers) do
+    {}
+  end
+
+  context 'when accessed with mobile User-Agent' do
+    before do
+      headers['User-Agent'] = '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'
+    end
+
+    it 'successfully renders mobile template' do
+      subject
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  context 'when accessed with non-mobile User-Agent' do
+    it 'raises AbstractController::ActionNotFound' do
+      expect { subject }.to raise_error(AbstractController::ActionNotFound)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -223,6 +223,7 @@ files:
 - lib/jpmobile/lookup_context.rb
 - lib/jpmobile/mail.rb
 - lib/jpmobile/mailer.rb
+- lib/jpmobile/method_less_action_support.rb
 - lib/jpmobile/mobile/abstract_mobile.rb
 - lib/jpmobile/mobile/android.rb
 - lib/jpmobile/mobile/android_tablet.rb
@@ -324,6 +325,7 @@ files:
 - test/rails/overrides/app/controllers/hankaku_filter_controller.rb
 - test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb
 - test/rails/overrides/app/controllers/links_controller.rb
+- test/rails/overrides/app/controllers/method_less_action_support_controller.rb
 - test/rails/overrides/app/controllers/mobile_spec_controller.rb
 - test/rails/overrides/app/controllers/template_path_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb
@@ -359,6 +361,7 @@ files:
 - test/rails/overrides/app/views/links/show_all.html.erb
 - test/rails/overrides/app/views/links/softbank_location.html.erb
 - test/rails/overrides/app/views/links/willcom_location.html.erb
+- test/rails/overrides/app/views/method_less_action_support/index_smart_phone.html.erb
 - test/rails/overrides/app/views/mobile_mailer/default_to_mail.text.erb
 - test/rails/overrides/app/views/mobile_mailer/multi_message.html.erb
 - test/rails/overrides/app/views/mobile_mailer/multi_message.text.erb
@@ -436,6 +439,7 @@ files:
 - 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/method_less_action_support_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
@@ -549,6 +553,7 @@ test_files:
 - test/rails/overrides/app/controllers/hankaku_filter_controller.rb
 - test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb
 - test/rails/overrides/app/controllers/links_controller.rb
+- test/rails/overrides/app/controllers/method_less_action_support_controller.rb
 - test/rails/overrides/app/controllers/mobile_spec_controller.rb
 - test/rails/overrides/app/controllers/template_path_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb
@@ -584,6 +589,7 @@ test_files:
 - test/rails/overrides/app/views/links/show_all.html.erb
 - test/rails/overrides/app/views/links/softbank_location.html.erb
 - test/rails/overrides/app/views/links/willcom_location.html.erb
+- test/rails/overrides/app/views/method_less_action_support/index_smart_phone.html.erb
 - test/rails/overrides/app/views/mobile_mailer/default_to_mail.text.erb
 - test/rails/overrides/app/views/mobile_mailer/multi_message.html.erb
 - test/rails/overrides/app/views/mobile_mailer/multi_message.text.erb
@@ -661,6 +667,7 @@ test_files:
 - 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/method_less_action_support_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