bizside 2.1.12 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505728253077850f79dd349f00a51357e9b0969a94aefe4d9e516d300a3b650e
-  data.tar.gz: 6f0cd5d78b501f3b7302eff8017f2fde987966cba56f3722840baa91fc34a7aa
+  metadata.gz: 684b653ee4921f968ac5419615dbd04e4ec314581a8942c0a7626711833247c5
+  data.tar.gz: c740c936e8027d969db49e66f63d75725cb10515f4a526e1631bd6b489af47d8
 SHA512:
-  metadata.gz: f46f57a50e3bab26842bb224635033c5c5dab4044d609852ffe082fcc9aee7c0aba76eb2c928fd1bb227bef5c55fe314ec0a1020640cd6c455c31ba8bc00171a
-  data.tar.gz: 6adc13affa302d5397f78c9083dd581e02fd945b5b928ec191b3602fb7b619dd236bae56fca85776af3b828a806c06a87a55d9c938d59cbfd2a827ef242c15c1
+  metadata.gz: 48bd0994fce119c1e5681d242b095dab1cf5d812bcebb18ef28ebb89c3af66b6295bddb5c571240b1065443e7711f453119ace5988aa05921ec2a910b9066871
+  data.tar.gz: b2467222740be9070d261e61a30dac64ec44920617fc2dc49620c45a5e020b9d93e92f1e8b5b369484c1f64859237799c0918322cd2266e2de93df638660a515

data/lib/bizside/user_agent/action_view/action_view_6.rb

@@ -0,0 +1,50 @@
+require 'action_view'
+
+class ActionView::TemplateRenderer
+
+  def render(context, options)
+    @details = extract_details(options)
+    template = get_template_by_user_agent(context, options)
+
+    prepend_formats(template.format)
+
+    render_template(context, template, options[:layout], options[:locals] || {})
+  end
+
+  private
+
+  def get_user_agent(context)
+    if context.respond_to?(:user_agent)
+      if context.respond_to?(:controller)
+        if context.controller.respond_to?(:session)
+          context.user_agent
+        end
+      end
+    end
+  end
+
+  def get_template_by_user_agent(context, options)
+    ret = nil
+    option_for_template = options[:template]
+
+    ua = get_user_agent(context)
+    if ua
+      ua.priorities.each do |priority|
+        begin
+          options[:template] = option_for_template + '.' + priority
+          ret = determine_template(options)
+          break
+        rescue ActionView::MissingTemplate
+        end
+      end
+    end
+
+    unless ret
+      options[:template] = option_for_template
+      ret = determine_template(options)
+    end
+
+    Rails.logger.debug "UserAgent: #{ua ? ua.name : 'unknown'} => #{ret.identifier}"
+    ret
+  end
+end

data/lib/bizside/user_agent/action_view.rb

@@ -5,6 +5,12 @@ when 5
   else
     load File.expand_path(File.join('action_view', 'action_view_4.rb'), __dir__)
   end
+when 6
+  if Bizside.config.user_agent.use_variant?
+    load File.expand_path(File.join('action_view', 'use_variant.rb'), __dir__)
+  else
+    load File.expand_path(File.join('action_view', 'action_view_6.rb'), __dir__)
+  end
 else
   raise "Rails#{Rails::VERSION::MAJOR} はサポートしていません。"
 end

data/lib/bizside/user_agent/controller_helper.rb

@@ -5,11 +5,7 @@ module Bizside
 
       included do
         case Rails::VERSION::MAJOR
-        when 3
-          before_filter :detect_user_agent
-        when 4
-          before_action :detect_user_agent
-        when 5
+        when 5, 6
           before_action :detect_user_agent
         else
           raise "Rails-#{Rails::VERSION::MAJOR} は未対応です。"

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.1.12'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +301,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -311,7 +311,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -444,6 +444,7 @@ files:
 - lib/bizside/user_agent.rb
 - lib/bizside/user_agent/action_view.rb
 - lib/bizside/user_agent/action_view/action_view_4.rb
+- lib/bizside/user_agent/action_view/action_view_6.rb
 - lib/bizside/user_agent/action_view/use_variant.rb
 - lib/bizside/user_agent/controller_helper.rb
 - lib/bizside/validations.rb