bizside 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49502df4872c3de14b3ad2024d7371dbeec9c4762b2b9e63b36d8ee7892fbdd0
-  data.tar.gz: 1389bdd6a7bffe5f46ead6fec1a6bfe3c9d750450c1f9b2d3108e09db8420597
+  metadata.gz: d4c22002eada30e8bb21db240f3c28c346c7049ccc375ff6f7afd3cfb8fb713e
+  data.tar.gz: 6357dee7fe2d59e8619cc0937d6fd0ccc204dcf7387cbc0cf4871681e0cf22bd
 SHA512:
-  metadata.gz: ebabb7d63d49861032dfb0f714775fe408d6b0eae43509255f67ad4778b7011ef59b6428bd25e82534f59de651c0322c7474c79b4530c218a20ff74c28a05468
-  data.tar.gz: 42b12132c4a9afdcc748e1276fe9409f23fb4dd287987d135155375542b2092b7022fd1b8c9261e1f32870fcfffd2586effc7a88d43b46d5e25a39917b87097e
+  metadata.gz: bd28798fd692aef8e7fe202a5de9375362d29a226b19517f1ada70f39f69d94110a260b4cb4c14c3b7c5b6f0d5f92f223f33cd01aff19176b310e491b2de2040
+  data.tar.gz: b32b86fa1b621e70b37cf237dfcf7c09dc4fb868fde37727f5f19214f12e207ffc5d9db697ab3210083fd2c1c7dc3c67470e99dac7167460475d9a7d5c8fa4d4

data/lib/bizside/audit_log.rb

@@ -24,12 +24,12 @@ module Bizside
 
     def call(env)
       start = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')
-      @status, @headers, @response = @app.call(env)
+      status, headers, response = @app.call(env)
       stop = Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')      
       exception = env[Bizside::ShowExceptions::BIZSIDE_EXCEPTION_ENV_KEY]
 
       if env['BIZSIDE_SUPPRESS_AUDIT']
-        return @status, @headers, @response
+        return status, headers, response
       end
 
       if @@ignore_paths.any? do |path|
@@ -40,25 +40,25 @@ module Bizside
             env['REQUEST_URI'] == path
           end
         end
-        return @status, @headers, @response
+        return status, headers, response
       end
 
       if Bizside.rails_env&.development?
-        return @status, @headers, @response if env['REQUEST_URI'] =~ /\/[^\/]+\/assets\/.*/
+        return status, headers, response if env['REQUEST_URI'] =~ /\/[^\/]+\/assets\/.*/
       elsif Bizside.rails_env&.test?
-        return @status, @headers, @response
+        return status, headers, response
       end
 
-      info = build_loginfo(env, start, stop, @status, exception)
+      info = build_loginfo(env, start, stop, status, exception)
       logger.record(info)
 
-      return @status, @headers, @response
+      return status, headers, response
     end
 
     private
 
     def logger
-      @logger ||= Bizside::Audit::Logger.logger
+      Bizside::Audit::Logger.logger
     end
 
     def build_loginfo(env, start, stop, status, exception)

data/lib/bizside/railtie.rb

@@ -33,11 +33,13 @@ module Bizside
     end
 
     if Bizside.config.user_agent.enabled?
+      if Bizside.config.user_agent.to_h.has_key?('use_variant')
+        raise "ERROR: 'use_variant' is obsolete. Delete it from config/bizside.yml"
+      end
+
       require_relative 'user_agent'
 
       initializer 'user_agent' do
-        require_relative 'user_agent/action_view'
-
         ActiveSupport.on_load(:action_controller) do
           include Bizside::UserAgent::ControllerHelper
         end

data/lib/bizside/user_agent/controller_helper.rb

@@ -23,7 +23,7 @@ module Bizside
           self.user_agent = ::Bizside::UserAgent.parse(request.env['HTTP_USER_AGENT'])
         end
 
-        set_request_variant if Bizside.config.user_agent.use_variant?
+        set_request_variant
 
         request.env['BIZSIDE_DEVICE'] = self.user_agent.name
       end

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -442,10 +442,6 @@ files:
 - lib/bizside/uploader/extension_whitelist.rb
 - lib/bizside/uploader/filename_validator.rb
 - 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
 - lib/bizside/version.rb

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

@@ -1,56 +0,0 @@
-require 'action_view'
-
-class ActionView::TemplateRenderer
-
-  def render(context, options)
-    @view    = context
-    @details = extract_details(options)
-    template = get_template_by_user_agent(context, options)
-    context  = @lookup_context
-
-    prepend_formats(template.formats)
-
-    unless context.rendered_format
-      context.rendered_format = template.formats.first || formats.first
-    end
-
-    render_template(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/action_view_6.rb

@@ -1,50 +0,0 @@
-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/use_variant.rb

@@ -1,4 +0,0 @@
-require 'action_view/template/resolver'
-
-ActionView::PathResolver::EXTENSIONS = { locale: ".", variants: ".", formats: ".",  handlers: "." }
-ActionView::PathResolver::DEFAULT_PATTERN = ":prefix/:action{.:locale,}{.:variants,}{.:formats,}{.:handlers,}"

data/lib/bizside/user_agent/action_view.rb

@@ -1,16 +0,0 @@
-case Rails::VERSION::MAJOR
-when 5
-  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_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