effective_assets 1.2.3 → 1.2.4
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/effective_assets/version.rb +1 -1
- data/lib/effective_assets.rb +3 -1
- data/lib/generators/templates/effective_assets.rb +1 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 03e7fd7428627ed8fd303d70e6a478e17aeb80c5
|
|
4
|
+
data.tar.gz: 0a6a66812402954a1d8954eb0be67316d27db1d1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f963edca391c3dbc93cd82581369a4306381174b1fcaac7f931192706dab840b9b7be93c8743e44065e831d2e4380b2ce4254597110ec03cb8526ece33c33224
|
|
7
|
+
data.tar.gz: bf1424823c5226157918db803efcf47216a753a4685982e52703b7b0d77a0dfd47fa805ab34594c6e466ea21f45317659f59c079edbed3b15975ae25a2319b8c
|
data/lib/effective_assets.rb
CHANGED
|
@@ -14,6 +14,7 @@ module EffectiveAssets
|
|
|
14
14
|
mattr_accessor :aws_bucket
|
|
15
15
|
mattr_accessor :aws_access_key_id
|
|
16
16
|
mattr_accessor :aws_secret_access_key
|
|
17
|
+
mattr_accessor :aws_region
|
|
17
18
|
|
|
18
19
|
mattr_accessor :aws_path # This directory is where we upload files to
|
|
19
20
|
mattr_accessor :aws_acl
|
|
@@ -47,7 +48,8 @@ module EffectiveAssets
|
|
|
47
48
|
config.fog_credentials = {
|
|
48
49
|
:provider => 'AWS',
|
|
49
50
|
:aws_access_key_id => EffectiveAssets.aws_access_key_id,
|
|
50
|
-
:aws_secret_access_key => EffectiveAssets.aws_secret_access_key
|
|
51
|
+
:aws_secret_access_key => EffectiveAssets.aws_secret_access_key,
|
|
52
|
+
:aws_region => EffectiveAssets.aws_region.presence || 'us-east-1'
|
|
51
53
|
}
|
|
52
54
|
config.fog_directory = EffectiveAssets.aws_bucket
|
|
53
55
|
config.fog_public = EffectiveAssets.aws_acl.to_s.include?('public')
|
|
@@ -27,11 +27,11 @@ EffectiveAssets.setup do |config|
|
|
|
27
27
|
# config.authorization_method = false
|
|
28
28
|
config.authorization_method = Proc.new { |controller, action, resource| true } # All users can see every screen
|
|
29
29
|
|
|
30
|
-
|
|
31
30
|
# This is your S3 bucket information
|
|
32
31
|
config.aws_bucket = ''
|
|
33
32
|
config.aws_access_key_id = ''
|
|
34
33
|
config.aws_secret_access_key = ''
|
|
34
|
+
config.aws_region = 'us-east-1'
|
|
35
35
|
|
|
36
36
|
config.aws_path = 'assets/'
|
|
37
37
|
|
|
@@ -40,7 +40,6 @@ EffectiveAssets.setup do |config|
|
|
|
40
40
|
# Valid settings are public-read, authenticated-read
|
|
41
41
|
config.aws_acl = 'public-read'
|
|
42
42
|
|
|
43
|
-
|
|
44
43
|
# Register Effective::Asset with ActiveAdmin if ActiveAdmin is present
|
|
45
44
|
config.use_active_admin = true
|
|
46
45
|
end
|