bizside 2.1.10 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db766ed6fdf059cdaa9fd7325c855f84294c988f94559c39597658a674dc6c40
-  data.tar.gz: e26eaddb5f279e4d840baae4346d416e6f4467b102dea75a90d301c95a458649
+  metadata.gz: 505728253077850f79dd349f00a51357e9b0969a94aefe4d9e516d300a3b650e
+  data.tar.gz: 6f0cd5d78b501f3b7302eff8017f2fde987966cba56f3722840baa91fc34a7aa
 SHA512:
-  metadata.gz: 5635c741923a924331b20dfa0b027e6adfc220a371306f2792f51569e48da21250c6fd0f4dc0d29d7116215edb36e6bcf73a417c1b55d5d19ff6c5317e176c0b
-  data.tar.gz: 63c3ba3993e0c9da71c236e9e197be92096330323aa10352f5848478722df2cd5e3ff7f5d716bbc3753fe19bdef56de02ea195591d89ebf73d95e1cd79d33e04
+  metadata.gz: f46f57a50e3bab26842bb224635033c5c5dab4044d609852ffe082fcc9aee7c0aba76eb2c928fd1bb227bef5c55fe314ec0a1020640cd6c455c31ba8bc00171a
+  data.tar.gz: 6adc13affa302d5397f78c9083dd581e02fd945b5b928ec191b3602fb7b619dd236bae56fca85776af3b828a806c06a87a55d9c938d59cbfd2a827ef242c15c1

data/lib/bizside/job_utils.rb

@@ -63,6 +63,42 @@ module Bizside
       end
     end
 
+    def self.delayed_queue_peek(start, count)
+      if Bizside.rails_env&.test?
+        Rails.logger.info "テスト時には遅延ジョブの一覧を返しません。"
+        return []
+      end
+
+      ::Resque.delayed_queue_peek(start, count)
+    end
+
+    def self.delayed_queue_schedule_size
+      if Bizside.rails_env&.test?
+        Rails.logger.info "テスト時には遅延ジョブの数を返しません。"
+        return 0
+      end
+
+      ::Resque.delayed_queue_schedule_size
+    end
+
+    def self.delayed_timestamp_peek(timestamp, start, count)
+      if Bizside.rails_env&.test?
+        Rails.logger.info "テスト時には指定された時間の遅延ジョブの一覧を返しません。"
+        return []
+      end
+
+      ::Resque.delayed_timestamp_peek(timestamp, start, count)
+    end
+
+    def self.delayed_timestamp_size(timestamp)
+      if Bizside.rails_env&.test?
+        Rails.logger.info "テスト時には指定された時間の遅延ジョブの数を返しません。"
+        return 0
+      end
+
+      ::Resque.delayed_timestamp_size(timestamp)
+    end
+
     def self.remove_delayed_in_queue(klass, queue, *args)
       if Bizside.rails_env&.test?
         Rails.logger.info "テスト時には遅延ジョブのキャンセルを行いません。"
@@ -315,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
@@ -323,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
@@ -352,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/version.rb

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

metadata

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