kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

include the content type when uploading to S3

Browse source
This commit is contained in:
Simo Leone 2019-01-24 16:56:24 +00:00
parent 1fecebae31
commit c5b71c9bae
No known key found for this signature in database
GPG key ID: 879B8C9843368178
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activestorage/lib/active_storage/service/s3_service.rb
View file

@ -16,9 +16,9 @@ module ActiveStorage
@upload_options = upload
end
def upload(key, io, checksum: nil, **)
def upload(key, io, checksum: nil, content_type: nil, **)
instrument :upload, key: key, checksum: checksum do
object_for(key).put(upload_options.merge(body: io, content_md5: checksum))
object_for(key).put(upload_options.merge(body: io, content_md5: checksum, content_type: content_type))
rescue Aws::S3::Errors::BadDigest
raise ActiveStorage::IntegrityError
end

18
activestorage/test/service/s3_service_test.rb
View file

@ -59,6 +59,24 @@ if SERVICE_CONFIGURATIONS[:s3]
service.delete key
end
end
test "upload with content type" do
key = SecureRandom.base58(24)
data = "Something else entirely!"
content_type = "text/plain"
@service.upload(
key,
StringIO.new(data),
checksum: Digest::MD5.base64digest(data),
filename: "cool_data.txt",
content_type: content_type
)
assert_equal content_type, @service.bucket.object(key).content_type
ensure
@service.delete key
end
end
else
puts "Skipping S3 Service tests because no S3 configuration was supplied"