aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2017-07-14 15:28:25 -0400
committerGitHub <noreply@github.com>2017-07-14 15:28:25 -0400
commit52cfe86dce45da2f69df7c4f92955d8ee375cfc3 (patch)
treed5cc8f713a958d4f9154b13b5d7b532f027da502
parent6dcdc5c9abb8e4e93a2c582b11ff4bb77d62ed3b (diff)
parentc49c56b46986c4a1b0701f9f4e16fe60222cf0fc (diff)
downloadrails-52cfe86dce45da2f69df7c4f92955d8ee375cfc3.tar.gz
rails-52cfe86dce45da2f69df7c4f92955d8ee375cfc3.tar.bz2
rails-52cfe86dce45da2f69df7c4f92955d8ee375cfc3.zip
Merge pull request #51 from dixpac/restore_intermediate_variables
Revert back to the original implementaion with varaibles
-rw-r--r--lib/active_storage/service/gcs_service.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
index 1addda6733..b0ad3e2fa4 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/lib/active_storage/service/gcs_service.rb
@@ -36,14 +36,20 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
def exist?(key)
instrument :exist, key do |payload|
- payload[:exist] = file_for(key).present?
+ answer = file_for(key).present?
+ payload[:exist] = answer
+ answer
end
end
def url(key, expires_in:, disposition:, filename:)
instrument :url, key do |payload|
query = { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }
- payload[:url] = file_for(key).signed_url(expires: expires_in, query: query)
+ generated_url = file_for(key).signed_url(expires: expires_in, query: query)
+
+ payload[:url] = generated_url
+
+ generated_url
end
end