bizside 2.1.9 → 2.1.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/bizside/carrierwave.rb +60 -0
- data/lib/bizside/job_utils.rb +36 -0
- data/lib/bizside/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e00f07cac4ef155557687062137c7220ba04b145199a2d577eb8215350ca21d2
|
4
|
+
data.tar.gz: 9dd5e9869c6e33c975189baf995714f4d1e96dd038b26c60cb81db41d7f9b43a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2671c42b0c8aeaca5026ec970d5ad9815ed93373d237d0752136960f116b8c821ec8fd5ce9c55a932a82ebd6e6a2c5ebc1a002d6cc838e6cb1415e43d07934fe
|
7
|
+
data.tar.gz: 8909accf04f288e550eac6272d4bf72bae44098f2bb8f0015cc7577d2283fa37599a89733c1de1182cbf50d979c3f85b9c6ae7bcfbe36ddcbd90b1232dd2fd3c
|
data/lib/bizside/carrierwave.rb
CHANGED
@@ -47,6 +47,66 @@ CarrierWave.configure do |config|
|
|
47
47
|
config.fog_directory = Bizside.config.storage.fog.container
|
48
48
|
config.fog_public = false
|
49
49
|
config.storage = :fog
|
50
|
+
|
51
|
+
# Patch to not set ACLs to 'private' if fog_public is false.
|
52
|
+
# Requests to set/update ACLs fail if ACL is disabled.
|
53
|
+
# Setting 'private' to ACLs also fails when the bucket is not in the same account as IAM user/role.
|
54
|
+
# 'private' is applied by default so there's no need to set 'private' explicitly.
|
55
|
+
module CarrierWave
|
56
|
+
module Storage
|
57
|
+
class Fog
|
58
|
+
class File
|
59
|
+
def acl_header
|
60
|
+
if fog_provider == 'AWS'
|
61
|
+
@uploader.fog_public ? { 'x-amz-acl' => 'public-read' } : {}
|
62
|
+
elsif fog_provider == "Google"
|
63
|
+
@uploader.fog_public ? { destination_predefined_acl: "publicRead" } : {}
|
64
|
+
else
|
65
|
+
{}
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
require 'fog/aws/models/storage/directory'
|
74
|
+
|
75
|
+
module Fog
|
76
|
+
module AWS
|
77
|
+
class Storage
|
78
|
+
class Directory < Fog::Model
|
79
|
+
def public=(new_public)
|
80
|
+
if new_public
|
81
|
+
@acl = 'public-read'
|
82
|
+
else
|
83
|
+
@acl = nil
|
84
|
+
end
|
85
|
+
new_public
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
require 'fog/aws/models/storage/file'
|
93
|
+
|
94
|
+
module Fog
|
95
|
+
module AWS
|
96
|
+
class Storage
|
97
|
+
class File < Fog::Model
|
98
|
+
def public=(new_public)
|
99
|
+
if new_public
|
100
|
+
@acl = 'public-read'
|
101
|
+
else
|
102
|
+
@acl = nil
|
103
|
+
end
|
104
|
+
new_public
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
50
110
|
end
|
51
111
|
|
52
112
|
end
|
data/lib/bizside/job_utils.rb
CHANGED
@@ -63,6 +63,42 @@ module Bizside
|
|
63
63
|
end
|
64
64
|
end
|
65
65
|
|
66
|
+
def self.delayed_queue_peek(start, count)
|
67
|
+
if Bizside.rails_env&.test?
|
68
|
+
Rails.logger.info "テスト時には遅延ジョブの一覧を返しません。"
|
69
|
+
return []
|
70
|
+
end
|
71
|
+
|
72
|
+
::Resque.delayed_queue_peek(start, count)
|
73
|
+
end
|
74
|
+
|
75
|
+
def self.delayed_queue_schedule_size
|
76
|
+
if Bizside.rails_env&.test?
|
77
|
+
Rails.logger.info "テスト時には遅延ジョブの数を返しません。"
|
78
|
+
return 0
|
79
|
+
end
|
80
|
+
|
81
|
+
::Resque.delayed_queue_schedule_size
|
82
|
+
end
|
83
|
+
|
84
|
+
def self.delayed_timestamp_peek(timestamp, start, count)
|
85
|
+
if Bizside.rails_env&.test?
|
86
|
+
Rails.logger.info "テスト時には指定された時間の遅延ジョブの一覧を返しません。"
|
87
|
+
return []
|
88
|
+
end
|
89
|
+
|
90
|
+
::Resque.delayed_timestamp_peek(timestamp, start, count)
|
91
|
+
end
|
92
|
+
|
93
|
+
def self.delayed_timestamp_size(timestamp)
|
94
|
+
if Bizside.rails_env&.test?
|
95
|
+
Rails.logger.info "テスト時には指定された時間の遅延ジョブの数を返しません。"
|
96
|
+
return 0
|
97
|
+
end
|
98
|
+
|
99
|
+
::Resque.delayed_timestamp_size(timestamp)
|
100
|
+
end
|
101
|
+
|
66
102
|
def self.remove_delayed_in_queue(klass, queue, *args)
|
67
103
|
if Bizside.rails_env&.test?
|
68
104
|
Rails.logger.info "テスト時には遅延ジョブのキャンセルを行いません。"
|
data/lib/bizside/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bizside
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- bizside-developers
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-11-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|