bizside 2.1.9 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff64fefe7426e051c6a8dfbbf37a45e40780afd5ded6fb08771783a4cbeb04ec
-  data.tar.gz: 36f857fe7739917d3ef2a4215094e645b08e443a93a2143ecaf2c24a8b9ef4b5
+  metadata.gz: e00f07cac4ef155557687062137c7220ba04b145199a2d577eb8215350ca21d2
+  data.tar.gz: 9dd5e9869c6e33c975189baf995714f4d1e96dd038b26c60cb81db41d7f9b43a
 SHA512:
-  metadata.gz: d609790daa2c1b7ac515563ecd0716dea901c9dc29e5a75e67db3512857d7f2948ab8410cb948761b821a90a3ebaf1d95f591de2f614bef862105f2432256af1
-  data.tar.gz: fe79fc79a6c6c8b209f41275d9a012973da88fd2329d3d82894b24e337a8668e968251711d537022985035d1e083d36a7b0fc299eb6a6d1fce9c1006a3564403
+  metadata.gz: 2671c42b0c8aeaca5026ec970d5ad9815ed93373d237d0752136960f116b8c821ec8fd5ce9c55a932a82ebd6e6a2c5ebc1a002d6cc838e6cb1415e43d07934fe
+  data.tar.gz: 8909accf04f288e550eac6272d4bf72bae44098f2bb8f0015cc7577d2283fa37599a89733c1de1182cbf50d979c3f85b9c6ae7bcfbe36ddcbd90b1232dd2fd3c

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

@@ -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 "テスト時には遅延ジョブのキャンセルを行いません。"

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.1.9'
+  VERSION = '2.1.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.11
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport