From e6b272e5c9c227cfbbe375a893f567c5967d669c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 11 Sep 2020 15:16:29 +0200
Subject: Change REST API to return empty data for suspended accounts (#14765)
---
lib/paperclip/attachment_extensions.rb | 4 ++++
lib/paperclip/url_generator_extensions.rb | 4 ++++
2 files changed, 8 insertions(+)
(limited to 'lib')
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index 93df0a326..752e79e65 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -35,6 +35,10 @@ module Paperclip
formats.include?(other_extension.delete('.')) && File.basename(other_filename, other_extension) == File.basename(original_filename, File.extname(original_filename))
end
+
+ def default_url(style_name = default_style)
+ @url_generator.for_as_default(style_name)
+ end
end
end
diff --git a/lib/paperclip/url_generator_extensions.rb b/lib/paperclip/url_generator_extensions.rb
index 1079efdbc..e1d6df2c2 100644
--- a/lib/paperclip/url_generator_extensions.rb
+++ b/lib/paperclip/url_generator_extensions.rb
@@ -11,6 +11,10 @@ module Paperclip
Addressable::URI.parse(url).normalize.to_str.gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
end
end
+
+ def for_as_default(style_name)
+ attachment_options[:interpolator].interpolate(default_url, @attachment, style_name)
+ end
end
end
--
cgit