bizside 2.1.11 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e00f07cac4ef155557687062137c7220ba04b145199a2d577eb8215350ca21d2
-  data.tar.gz: 9dd5e9869c6e33c975189baf995714f4d1e96dd038b26c60cb81db41d7f9b43a
+  metadata.gz: 684b653ee4921f968ac5419615dbd04e4ec314581a8942c0a7626711833247c5
+  data.tar.gz: c740c936e8027d969db49e66f63d75725cb10515f4a526e1631bd6b489af47d8
 SHA512:
-  metadata.gz: 2671c42b0c8aeaca5026ec970d5ad9815ed93373d237d0752136960f116b8c821ec8fd5ce9c55a932a82ebd6e6a2c5ebc1a002d6cc838e6cb1415e43d07934fe
-  data.tar.gz: 8909accf04f288e550eac6272d4bf72bae44098f2bb8f0015cc7577d2283fa37599a89733c1de1182cbf50d979c3f85b9c6ae7bcfbe36ddcbd90b1232dd2fd3c
+  metadata.gz: 48bd0994fce119c1e5681d242b095dab1cf5d812bcebb18ef28ebb89c3af66b6295bddb5c571240b1065443e7711f453119ace5988aa05921ec2a910b9066871
+  data.tar.gz: b2467222740be9070d261e61a30dac64ec44920617fc2dc49620c45a5e020b9d93e92f1e8b5b369484c1f64859237799c0918322cd2266e2de93df638660a515

data/lib/bizside/job_utils.rb

@@ -351,7 +351,7 @@ module Bizside
         raise
       end
       error_after_queue = nil
-      args_to_enqueue = Marshal.load(Marshal.dump(args)) # deep copy
+      args_to_enqueue = MultiJson.load(MultiJson.dump(args)) # deep copy
       begin
         klass.after_enqueue(*args) if klass.respond_to?(:after_enqueue)
       rescue => e
@@ -359,28 +359,26 @@ module Bizside
         error_after_queue = e
       end
 
-      args = stringify_keys(args_to_enqueue)
-
       begin
         begin
-          klass.before_perform(*args) if klass.respond_to?(:before_perform)
+          klass.before_perform(*args_to_enqueue) if klass.respond_to?(:before_perform)
         rescue ::Resque::Job::DontPerform
           return
         end
 
         perform = -> do
           Bizside.logger.info log_message
-          klass.perform(*args)
+          klass.perform(*args_to_enqueue)
         end
         if klass.respond_to?(:around_perform)
-          klass.around_perform(*args, &perform)
+          klass.around_perform(*args_to_enqueue, &perform)
         else
           perform.call
         end
 
-        klass.after_perform(*args) if klass.respond_to?(:after_perform)
+        klass.after_perform(*args_to_enqueue) if klass.respond_to?(:after_perform)
       rescue => e
-        klass.on_failure(e, *args) if klass.respond_to?(:on_failure)
+        klass.on_failure(e, *args_to_enqueue) if klass.respond_to?(:on_failure)
         raise
       ensure
         raise error_after_queue if error_after_queue
@@ -388,18 +386,5 @@ module Bizside
     end
     private_class_method :do_perform_and_hooks_instantly
 
-    def self.stringify_keys(object)
-      case object
-      when Hash
-        object.map {|k, v| [stringify_keys(k), stringify_keys(v)]}.to_h
-      when Array
-        object.map {|v| stringify_keys(v)}
-      when Symbol
-        object.to_s
-      else
-        object
-      end
-    end
-    private_class_method :stringify_keys
   end
 end

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.11'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.2.0
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 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
@@ -162,6 +162,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -287,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
@@ -297,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
@@ -430,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