diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-04 17:34:37 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-04 17:34:37 +0200 |
| commit | 7409bb2ff8e20f9036842a68f34e215cefdd98d9 (patch) | |
| tree | 8788f9d2d89c519a71e837191e0172b02e274ffd /lib/active_file/site | |
| parent | 9b9d69b34ea77ee62bd0ef1846767db9f795c301 (diff) | |
| download | rails-7409bb2ff8e20f9036842a68f34e215cefdd98d9.tar.gz rails-7409bb2ff8e20f9036842a68f34e215cefdd98d9.tar.bz2 rails-7409bb2ff8e20f9036842a68f34e215cefdd98d9.zip | |
Actually #url needs to deal with the disposition
Diffstat (limited to 'lib/active_file/site')
| -rw-r--r-- | lib/active_file/site/disk_site.rb | 6 | ||||
| -rw-r--r-- | lib/active_file/site/s3_site.rb | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/active_file/site/disk_site.rb b/lib/active_file/site/disk_site.rb index 3a98971274..ec60175bbf 100644 --- a/lib/active_file/site/disk_site.rb +++ b/lib/active_file/site/disk_site.rb @@ -37,13 +37,13 @@ class ActiveFile::Site::DiskSite < ActiveFile::Site end - def url(key, expires_in: nil) + def url(key, expires_in:, disposition:, filename:) verified_key_with_expiration = ActiveFile::VerifiedKeyWithExpiration.encode(key, expires_in: expires_in) if defined?(Rails) - Rails.application.routes.url_helpers.rails_disk_blob_path(verified_key_with_expiration) + Rails.application.routes.url_helpers.rails_disk_blob_path(verified_key_with_expiration, disposition: disposition) else - "/rails/blobs/#{verified_key_with_expiration}" + "/rails/blobs/#{verified_key_with_expiration}?disposition=#{disposition}" end end diff --git a/lib/active_file/site/s3_site.rb b/lib/active_file/site/s3_site.rb index e407f84861..cfd2ddcc9a 100644 --- a/lib/active_file/site/s3_site.rb +++ b/lib/active_file/site/s3_site.rb @@ -29,8 +29,9 @@ class ActiveFile::Site::S3Site < ActiveFile::Site end - def url(key, expires_in: nil) - object_for(key).presigned_url(:get, expires_in: expires_in) + def url(key, expires_in:, disposition:, filename:) + object_for(key).presigned_url :get, expires_in: expires_in, + response_content_disposition: "#{disposition}; filename=#{filename}" end def byte_size(key) |