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

Merge pull request #42 from quartzmo/gcs-site-url

Browse source 
Update GCSService#url
This commit is contained in:
George Claghorn 2017-07-12 12:19:21 -04:00 committed by GitHub
commit c55af14d1b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -9,4 +9,4 @@ gem 'sqlite3'
gem 'httparty'
gem 'aws-sdk', '~> 2', require: false
gem 'google-cloud-storage', require: false
gem 'google-cloud-storage', '~> 1.3', require: false

6
Gemfile.lock
View file

@ -69,9 +69,9 @@ GEM
google-cloud-core (1.0.0)
google-cloud-env (~> 1.0)
googleauth (~> 0.5.1)
google-cloud-env (1.0.0)
google-cloud-env (1.0.1)
faraday (~> 0.11)
google-cloud-storage (1.2.0)
google-cloud-storage (1.3.0)
digest-crc (~> 0.4)
google-api-client (~> 0.13.0)
google-cloud-core (~> 1.0)
@ -141,7 +141,7 @@ DEPENDENCIES
aws-sdk (~> 2)
bundler (~> 1.15)
byebug
google-cloud-storage
google-cloud-storage (~> 1.3)
httparty
rake
sqlite3

4
lib/active_storage/service/gcs_service.rb
View file

@ -44,8 +44,8 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
def url(key, expires_in:, disposition:, filename:)
instrument :url, key do |payload|
generated_url = file_for(key).signed_url(expires: expires_in) + "&" +
{ "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }.to_query
query = { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }
generated_url = file_for(key).signed_url(expires: expires_in, query: query)
payload[:url] = generated_url