s3lurp 0.4.2 → 0.4.3
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.
- data/lib/s3lurp/version.rb +1 -1
- data/lib/s3lurp.rb +13 -4
- data/spec/s3lurp_spec.rb +11 -0
- metadata +3 -3
data/lib/s3lurp/version.rb
CHANGED
data/lib/s3lurp.rb
CHANGED
@@ -4,7 +4,8 @@ require 's3lurp/railtie' if defined? ::Rails::Railtie
|
|
4
4
|
|
5
5
|
module S3lurp
|
6
6
|
VALID_CONFIG_KEYS = [
|
7
|
-
:s3_bucket, :aws_access_key, :aws_secret_key,
|
7
|
+
:s3_bucket, :aws_access_key, :aws_secret_key,
|
8
|
+
:s3_access_key, :s3_secret_key, :acl, :cache_control,
|
8
9
|
:content_type, :content_disposition, :content_encoding, :expires,
|
9
10
|
:success_action_redirect, :success_action_status,
|
10
11
|
:min_file_size, :max_file_size,
|
@@ -23,7 +24,7 @@ module S3lurp
|
|
23
24
|
loaded_conf = YAML.load_file(Rails.root.join("config", config.file).to_s)
|
24
25
|
env_conf = loaded_conf[Rails.env] || loaded_conf
|
25
26
|
VALID_CONFIG_KEYS.each do |key|
|
26
|
-
config.send("#{key.to_s}=", env_conf[key.to_s])
|
27
|
+
config.send("#{key.to_s}=", env_conf[key.to_s]) if !env_conf[key.to_s].nil?
|
27
28
|
end
|
28
29
|
end
|
29
30
|
end
|
@@ -37,8 +38,8 @@ module S3lurp
|
|
37
38
|
|
38
39
|
def initialize
|
39
40
|
@s3_bucket = ENV['S3_BUCKET'] || "S3_BUCKET"
|
40
|
-
@aws_access_key = ENV['AWS_ACCESS_KEY'] || "AWS_KEY"
|
41
|
-
@aws_secret_key = ENV['AWS_SECRET_KEY'] || "AWS_SECRET"
|
41
|
+
@aws_access_key = ENV['AWS_ACCESS_KEY'] || ENV['S3_ACCESS_KEY'] || "AWS_KEY"
|
42
|
+
@aws_secret_key = ENV['AWS_SECRET_KEY'] || ENV['S3_SECRET_KEY'] || "AWS_SECRET"
|
42
43
|
@min_file_size = 0
|
43
44
|
@max_file_size = 10485760
|
44
45
|
@minutes_valid = 360
|
@@ -46,6 +47,14 @@ module S3lurp
|
|
46
47
|
@submit_tag_options = {}
|
47
48
|
end
|
48
49
|
|
50
|
+
# legacy for s3_* config vars
|
51
|
+
def s3_access_key=(arg)
|
52
|
+
self.aws_access_key = arg
|
53
|
+
end
|
54
|
+
def s3_secret_key=(arg)
|
55
|
+
self.aws_secret_key = arg
|
56
|
+
end
|
57
|
+
|
49
58
|
end
|
50
59
|
|
51
60
|
end
|
data/spec/s3lurp_spec.rb
CHANGED
@@ -112,6 +112,17 @@ describe S3lurp do
|
|
112
112
|
S3lurp.config.aws_secret_key.should == @secret
|
113
113
|
end
|
114
114
|
|
115
|
+
it 'should also configure with legacy options' do
|
116
|
+
S3lurp.configure do |config|
|
117
|
+
config.s3_bucket = @bucket
|
118
|
+
config.s3_access_key = @key
|
119
|
+
config.s3_secret_key = @secret
|
120
|
+
end
|
121
|
+
S3lurp.config.s3_bucket.should == @bucket
|
122
|
+
S3lurp.config.aws_access_key.should == @key
|
123
|
+
S3lurp.config.aws_secret_key.should == @secret
|
124
|
+
end
|
125
|
+
|
115
126
|
it 'should should always use ENV first for config' do
|
116
127
|
ENV['S3_BUCKET'] = @bucket
|
117
128
|
ENV['AWS_ACCESS_KEY'] = @key
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: s3lurp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
127
127
|
version: '0'
|
128
128
|
segments:
|
129
129
|
- 0
|
130
|
-
hash:
|
130
|
+
hash: -4220849144564821796
|
131
131
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
132
132
|
none: false
|
133
133
|
requirements:
|
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
136
136
|
version: '0'
|
137
137
|
segments:
|
138
138
|
- 0
|
139
|
-
hash:
|
139
|
+
hash: -4220849144564821796
|
140
140
|
requirements: []
|
141
141
|
rubyforge_project:
|
142
142
|
rubygems_version: 1.8.25
|