Commit 113198f9 by Evan Prothro Committed by Jon Yurek

fixup for s3_server_side_encryption option

parent 3918b326
...@@ -146,7 +146,7 @@ module Paperclip ...@@ -146,7 +146,7 @@ module Paperclip
@s3_server_side_encryption = false @s3_server_side_encryption = false
end end
if @s3_server_side_encryption if @s3_server_side_encryption
@s3_server_side_encryption = @options[:s3_server_side_encryption].to_s.upcase @s3_server_side_encryption = @options[:s3_server_side_encryption]
end end
unless @options[:url].to_s.match(/\A:s3.*url\Z/) || @options[:url] == ":asset_host" unless @options[:url].to_s.match(/\A:s3.*url\Z/) || @options[:url] == ":asset_host"
......
...@@ -1045,7 +1045,7 @@ describe Paperclip::Storage::S3 do ...@@ -1045,7 +1045,7 @@ describe Paperclip::Storage::S3 do
object.expects(:write).with(anything, object.expects(:write).with(anything,
content_type: "image/png", content_type: "image/png",
acl: :public_read, acl: :public_read,
server_side_encryption: 'AES256') server_side_encryption: :aes256)
@dummy.save @dummy.save
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment