bizside 2.1.12 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505728253077850f79dd349f00a51357e9b0969a94aefe4d9e516d300a3b650e
-  data.tar.gz: 6f0cd5d78b501f3b7302eff8017f2fde987966cba56f3722840baa91fc34a7aa
+  metadata.gz: 85705b907c50726c6c80d22088f91c3413009119db847be089eab32ec73f8659
+  data.tar.gz: 1518ed67cb6cccc547823db1dcbe57f921aa7445906b9d07932916a148f09439
 SHA512:
-  metadata.gz: f46f57a50e3bab26842bb224635033c5c5dab4044d609852ffe082fcc9aee7c0aba76eb2c928fd1bb227bef5c55fe314ec0a1020640cd6c455c31ba8bc00171a
-  data.tar.gz: 6adc13affa302d5397f78c9083dd581e02fd945b5b928ec191b3602fb7b619dd236bae56fca85776af3b828a806c06a87a55d9c938d59cbfd2a827ef242c15c1
+  metadata.gz: '08592ac5b1048768a881c2be96820a7323121bf4656df65a69445bcaf875a673602e6c568baf895d6606790aa2102ada3c377bea6490bce88b4eedae56087839'
+  data.tar.gz: bce8b135b2ea68a35ea898a79242b2e9961d967af851f0ec785c1e09a086e48bef5d9befd3cb907a3529058128d5c043516a6757c4d8c8641689741b9a8be024

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.1'
 end

data/validations/ip_address_validator.rb

@@ -16,7 +16,7 @@ class IpAddressValidator < ActiveModel::EachValidator
         raise unless IPAddress::valid_ipv4?(value)
       end
     rescue
-      record.errors[attribute] << (options[:message] || "はIPアドレスとして正しくありません。")
+      record.errors.add(attribute, options[:message] || "はIPアドレスとして正しくありません。")
     end
   end
 end

data/validations/tel_validator.rb

@@ -14,7 +14,7 @@ class TelValidator < ActiveModel::EachValidator
     return if value.nil? or value.empty?
     
     unless validate_tel(record, value)
-      record.errors[attribute] << I18n.t('errors.messages.invalid')
+      record.errors.add(attribute, I18n.t('errors.messages.invalid'))
     end
   end
   

data/validations/url_validator.rb

@@ -13,17 +13,17 @@ class UrlValidator < ActiveModel::EachValidator
     begin
       URI.parse(value)
     rescue URI::InvalidURIError
-      record.errors[attribute] << (options[:message] || "はURLとして正しくありません。")
+      record.errors.add(attribute, options[:message] || "はURLとして正しくありません。")
       return
     end
     
     if @with_schema
       unless value.start_with?('http://') or value.start_with?('https://')
-        record.errors[attribute] << (options[:message] || "は http:// または https:// から始めてください。")
+        record.errors.add(attribute, options[:message] || "は http:// または https:// から始めてください。")
       end
     else
       if value.start_with?('http://') or value.start_with?('https://')
-        record.errors[attribute] << (options[:message] || "は http:// または https:// を含めないでください。")
+        record.errors.add(attribute, options[:message] || "は http:// または https:// を含めないでください。")
       end
     end
   end

data/validations/zip_validator.rb

@@ -12,8 +12,7 @@ class ZipValidator < ActiveModel::EachValidator
     return if (zip1.nil? or zip1.empty?) and (zip2.nil? or zip2.empty?)
 
     unless validate_zip(zip1, zip2)
-      record.errors[attribute] << I18n.t('errors.messages.zip')
-      return
+      record.errors.add(attribute, I18n.t('errors.messages.zip'))
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.1
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-12-15 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