diff options
author | George Claghorn <george@basecamp.com> | 2018-03-05 11:53:31 -0500 |
---|---|---|
committer | George Claghorn <george@basecamp.com> | 2018-03-05 11:54:43 -0500 |
commit | ccac681122db9747fec9512076772bca345e24b9 (patch) | |
tree | 9648be7aa60c62b44d74e898b7a9f9888e6d7789 /activestorage/lib/active_storage/service/gcs_service.rb | |
parent | 9cc0c1aaf4d35b79055471f1a7ef0dba692b366d (diff) | |
download | rails-ccac681122db9747fec9512076772bca345e24b9.tar.gz rails-ccac681122db9747fec9512076772bca345e24b9.tar.bz2 rails-ccac681122db9747fec9512076772bca345e24b9.zip |
Generate root-relative paths in Active Storage disk service URL methods
Fixes #32129.
Diffstat (limited to 'activestorage/lib/active_storage/service/gcs_service.rb')
-rw-r--r-- | activestorage/lib/active_storage/service/gcs_service.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/activestorage/lib/active_storage/service/gcs_service.rb b/activestorage/lib/active_storage/service/gcs_service.rb index d163605754..83e9bbb305 100644 --- a/activestorage/lib/active_storage/service/gcs_service.rb +++ b/activestorage/lib/active_storage/service/gcs_service.rb @@ -3,7 +3,10 @@ gem "google-cloud-storage", "~> 1.8" require "google/cloud/storage" +require "net/http" + require "active_support/core_ext/object/to_query" +require "active_storage/filename" module ActiveStorage # Wraps the Google Cloud Storage as an Active Storage service. See ActiveStorage::Service for the generic API @@ -43,6 +46,16 @@ module ActiveStorage end end + def download_chunk(key, range) + instrument :download_chunk, key: key, range: range do + uri = URI(url(key, expires_in: 30.seconds, filename: ActiveStorage::Filename.new(""), content_type: "application/octet-stream", disposition: "inline")) + + Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |client| + client.get(uri, "Range" => "bytes=#{range.begin}-#{range.exclude_end? ? range.end - 1 : range.end}").body + end + end + end + def delete(key) instrument :delete, key: key do begin |