bizside 2.1.8 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f0b10f92d32ddbec79c248e6c89533070a49087e5e7a5e63eadf66d21dc98d
-  data.tar.gz: 6776211a6494c3f7ad2baab4e6578189ff0529a4fb9ea5094af8a9cef293ce21
+  metadata.gz: db766ed6fdf059cdaa9fd7325c855f84294c988f94559c39597658a674dc6c40
+  data.tar.gz: e26eaddb5f279e4d840baae4346d416e6f4467b102dea75a90d301c95a458649
 SHA512:
-  metadata.gz: 19aeb39f554f1c783fb2c2138dff4bfbf8865d134c5a8652162c7be999008fece4aaf9a724eb40a23b5028a3c6f3da9702e831930b3397122921feda86b147a4
-  data.tar.gz: da39892e84bf45a14c913ec6b7b54ec4b61641ea3b1074d7769d1cb029a438af6b6c10e3f42ea44d97bbd8696ec1f188088f28a73a2b068f8fe52115067a7ca0
+  metadata.gz: 5635c741923a924331b20dfa0b027e6adfc220a371306f2792f51569e48da21250c6fd0f4dc0d29d7116215edb36e6bcf73a417c1b55d5d19ff6c5317e176c0b
+  data.tar.gz: 63c3ba3993e0c9da71c236e9e197be92096330323aa10352f5848478722df2cd5e3ff7f5d716bbc3753fe19bdef56de02ea195591d89ebf73d95e1cd79d33e04

data/lib/bizside/carrierwave.rb

@@ -47,6 +47,66 @@ CarrierWave.configure do |config|
     config.fog_directory = Bizside.config.storage.fog.container
     config.fog_public = false
     config.storage = :fog
+
+    # Patch to not set ACLs to 'private' if fog_public is false.
+    # Requests to set/update ACLs fail if ACL is disabled.
+    # Setting 'private' to ACLs also fails when the bucket is not in the same account as IAM user/role.
+    # 'private' is applied by default so there's no need to set 'private' explicitly.
+    module CarrierWave
+      module Storage
+        class Fog
+          class File
+            def acl_header
+              if fog_provider == 'AWS'
+                @uploader.fog_public ? { 'x-amz-acl' => 'public-read' } : {}
+              elsif fog_provider == "Google"
+                @uploader.fog_public ? { destination_predefined_acl: "publicRead" } : {}
+              else
+                {}
+              end
+            end
+          end
+        end
+      end
+    end
+
+    require 'fog/aws/models/storage/directory'
+
+    module Fog
+      module AWS
+        class Storage
+          class Directory < Fog::Model
+            def public=(new_public)
+              if new_public
+                @acl = 'public-read'
+              else
+                @acl = nil
+              end
+              new_public
+            end
+          end
+        end
+      end
+    end
+
+    require 'fog/aws/models/storage/file'
+
+    module Fog
+      module AWS
+        class Storage
+          class File < Fog::Model
+            def public=(new_public)
+              if new_public
+                @acl = 'public-read'
+              else
+                @acl = nil
+              end
+              new_public
+            end
+          end
+        end
+      end
+    end
   end
 
 end

data/lib/bizside/job_utils.rb

@@ -9,12 +9,7 @@ module Bizside
 
     def self.add_job_to(queue, klass, *args)
       if Bizside.rails_env&.test?
-        if klass.respond_to?(:before_enqueue)
-          return unless klass.before_enqueue(*args)
-        end
-
-        Bizside.logger.info "テスト時にはジョブの登録を行わず、即時実行します。"
-        klass.perform(*args)
+        do_perform_and_hooks_instantly(klass, 'テスト時にはジョブの登録を行わず、即時実行します。', *args)
         return
       end
 
@@ -49,12 +44,7 @@ module Bizside
 
     def self.enqueue_at_with_queue(queue, time, klass, *args)
       if Bizside.rails_env&.test?
-        if klass.respond_to?(:before_enqueue)
-          return unless klass.before_enqueue(*args)
-        end
-
-        Bizside.logger.info "テスト時には遅延ジョブの登録を行わず、即時実行します。"
-        klass.perform(*args)
+        do_perform_and_hooks_instantly(klass, 'テスト時には遅延ジョブの登録を行わず、即時実行します。', *args)
         return
       end
 
@@ -84,12 +74,7 @@ module Bizside
 
     def self.set_job_at(time, klass, *args)
       if Bizside.rails_env&.test?
-        if klass.respond_to?(:before_enqueue)
-          return unless klass.before_enqueue(*args)
-        end
-
-        Bizside.logger.info "テスト時には遅延ジョブの登録を行わず、即時実行します。"
-        klass.perform(*args)
+        do_perform_and_hooks_instantly(klass, 'テスト時には遅延ジョブの登録を行わず、即時実行します。', *args)
         return
       end
 
@@ -214,7 +199,11 @@ module Bizside
 
     def self.dequeue(klass, *args)
       if Bizside.rails_env&.test?
+        if klass.respond_to?(:before_dequeue)
+          return if klass.before_dequeue(*args) == false
+        end
         Bizside.logger.info 'テスト時にジョブの削除は行いません。'
+        klass.after_dequeue(*args) if klass.respond_to?(:after_dequeue)
         return
       end
 
@@ -316,5 +305,65 @@ module Bizside
       ::Resque::Failure.count(queue, class_name)
     end
 
+    def self.do_perform_and_hooks_instantly(klass, log_message, *args)
+      begin
+        if klass.respond_to?(:before_enqueue)
+          return if klass.before_enqueue(*args) == false
+        end
+      rescue
+        # should not propagate to on_failure(job code)
+        raise
+      end
+      error_after_queue = nil
+      args_to_enqueue = Marshal.load(Marshal.dump(args)) # deep copy
+      begin
+        klass.after_enqueue(*args) if klass.respond_to?(:after_enqueue)
+      rescue => e
+        # should propagate only to code that enqueued the job
+        error_after_queue = e
+      end
+
+      args = stringify_keys(args_to_enqueue)
+
+      begin
+        begin
+          klass.before_perform(*args) if klass.respond_to?(:before_perform)
+        rescue ::Resque::Job::DontPerform
+          return
+        end
+
+        perform = -> do
+          Bizside.logger.info log_message
+          klass.perform(*args)
+        end
+        if klass.respond_to?(:around_perform)
+          klass.around_perform(*args, &perform)
+        else
+          perform.call
+        end
+
+        klass.after_perform(*args) if klass.respond_to?(:after_perform)
+      rescue => e
+        klass.on_failure(e, *args) if klass.respond_to?(:on_failure)
+        raise
+      ensure
+        raise error_after_queue if error_after_queue
+      end
+    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.8'
+  VERSION = '2.1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.10
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -471,8 +471,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.16
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.