daddy 0.9.14 → 0.9.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/daddy/{uploader.rb → carrierwave.rb} +5 -5
- data/lib/daddy/rails/railtie.rb +3 -3
- data/lib/daddy/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: 83f26abfad4548e521a75c8739d373be17e949ecefdd24ee5ae6720345cfb657
|
|
4
|
+
data.tar.gz: 4e7e951bcedf7df58de4bc9cb31e95351b7641eff3dfb593455d9adc0adac63d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 692b8c969023e967bd64d2c4153797b938fa16a432a8b21866a757d12aef468febd0a0ab940ccd84c4640d689f2ca5a5ad0e777ef5de56b224f9caf0327a2f1f
|
|
7
|
+
data.tar.gz: 2f0f3343079e1471b435d69621f29b421ecb3cfcffbb5ade14c490857af148634f40235d698085a4eaac7a9fb96a04dc49958c1935c9739117c99dd1219d8a32
|
|
@@ -8,15 +8,15 @@ CarrierWave.configure do |config|
|
|
|
8
8
|
"/data/#{::Rails.application.class.module_parent_name.underscore}/#{::Rails.env}"
|
|
9
9
|
end
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
if File.exists?('config/aws.yml')
|
|
12
|
+
aws = YAML.safe_load(ERB.new(File.read('config/aws.yml'), 0, '-').result)
|
|
13
|
+
|
|
14
|
+
if aws.dig('s3', 'enabled')
|
|
13
15
|
require 'carrierwave/storage/fog'
|
|
14
16
|
config.storage :fog
|
|
15
17
|
config.cache_storage :fog
|
|
16
|
-
|
|
17
18
|
config.fog_provider = 'fog/aws'
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
|
|
20
20
|
config.fog_credentials = {
|
|
21
21
|
provider: 'AWS',
|
|
22
22
|
aws_access_key_id: aws['s3']['access_key_id'],
|
data/lib/daddy/rails/railtie.rb
CHANGED
|
@@ -18,14 +18,14 @@ module Daddy
|
|
|
18
18
|
|
|
19
19
|
initializer 'carrierwave' do
|
|
20
20
|
if defined?(CarrierWave)
|
|
21
|
-
|
|
22
|
-
require 'daddy/
|
|
21
|
+
puts '[daddy] loading carrierwave configuration'
|
|
22
|
+
require 'daddy/carrierwave'
|
|
23
23
|
end
|
|
24
24
|
end
|
|
25
25
|
|
|
26
26
|
initializer 'sidekiq' do
|
|
27
27
|
if defined?(Sidekiq)
|
|
28
|
-
|
|
28
|
+
puts '[daddy] loading sidekiq configuration'
|
|
29
29
|
require 'daddy/sidekiq'
|
|
30
30
|
end
|
|
31
31
|
end
|
data/lib/daddy/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: daddy
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.15
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- ichy
|
|
@@ -353,6 +353,7 @@ files:
|
|
|
353
353
|
- lib/capistrano/tasks/clear_cache.rake
|
|
354
354
|
- lib/capistrano/tasks/update_linked_files.rake
|
|
355
355
|
- lib/daddy.rb
|
|
356
|
+
- lib/daddy/carrierwave.rb
|
|
356
357
|
- lib/daddy/cucumber.rb
|
|
357
358
|
- lib/daddy/cucumber/helpers.rb
|
|
358
359
|
- lib/daddy/cucumber/helpers/assert.rb
|
|
@@ -383,7 +384,6 @@ files:
|
|
|
383
384
|
- lib/daddy/sidekiq.rb
|
|
384
385
|
- lib/daddy/tasks.rb
|
|
385
386
|
- lib/daddy/test_help.rb
|
|
386
|
-
- lib/daddy/uploader.rb
|
|
387
387
|
- lib/daddy/utils/config.rb
|
|
388
388
|
- lib/daddy/utils/sql_utils.rb
|
|
389
389
|
- lib/daddy/utils/string_utils.rb
|