From c49c56b46986c4a1b0701f9f4e16fe60222cf0fc Mon Sep 17 00:00:00 2001 From: dixpac Date: Fri, 14 Jul 2017 20:46:02 +0200 Subject: Revert back to the original implementaion with varaibles Revert `exist? and url` to the original implementation. Since the new one doesn't provide any benefits and makes implementation harder to follow. --- lib/active_storage/service/gcs_service.rb | 10 ++++++++-- 1 file 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 -- cgit v1.2.3