Skip to content

Commit

Permalink
Upload file with filename and disposition for Azure
Browse files Browse the repository at this point in the history
  • Loading branch information
peterzhu2118 committed Jul 31, 2019
1 parent efa2299 commit 24ae11d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
Expand Up @@ -17,10 +17,12 @@ def initialize(storage_account_name:, storage_access_key:, container:, **options
@container = container
end

def upload(key, io, checksum: nil, content_type: nil, **)
def upload(key, io, checksum: nil, filename: nil, content_type: nil, disposition: nil, **)
instrument :upload, key: key, checksum: checksum do
handle_errors do
blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum, content_type: content_type)
content_disposition = content_disposition_with(filename: filename, type: disposition) if disposition && filename

blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum, content_type: content_type, content_disposition: content_disposition)
end
end
end
Expand Down
15 changes: 15 additions & 0 deletions activestorage/test/service/azure_storage_service_test.rb
Expand Up @@ -23,6 +23,21 @@ class ActiveStorage::Service::AzureStorageServiceTest < ActiveSupport::TestCase
@service.delete key
end

test "upload with content disposition" do
key = SecureRandom.base58(24)
data = "Foobar"

@service.upload(key, StringIO.new(data), checksum: Digest::MD5.base64digest(data), filename: ActiveStorage::Filename.new("test.txt"), disposition: :inline)

assert_equal("inline; filename=\"test.txt\"; filename*=UTF-8''test.txt", @service.blobs.get_blob_properties(@service.container, key).properties[:content_disposition])

url = @service.url(key, expires_in: 2.minutes, disposition: :attachment, content_type: nil, filename: ActiveStorage::Filename.new("test.html"))
response = Net::HTTP.get_response(URI(url))
assert_match(/attachment;.*test\.html/, response["Content-Disposition"])
ensure
@service.delete key
end

test "signed URL generation" do
url = @service.url(@key, expires_in: 5.minutes,
disposition: :inline, filename: ActiveStorage::Filename.new("avatar.png"), content_type: "image/png")
Expand Down

0 comments on commit 24ae11d

Please sign in to comment.