From 636af368fb9e65087d2d2f2554f58a009c5bb27f Mon Sep 17 00:00:00 2001 From: Max Melentiev Date: Tue, 20 Nov 2018 16:03:03 +0300 Subject: [PATCH] Simplify code in delayeds3 --- lib/paperclip/storage/delayeds3.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/paperclip/storage/delayeds3.rb b/lib/paperclip/storage/delayeds3.rb index 257a471..e53c5cd 100644 --- a/lib/paperclip/storage/delayeds3.rb +++ b/lib/paperclip/storage/delayeds3.rb @@ -238,6 +238,8 @@ module Paperclip def flush_writes #:nodoc: + return if @queued_for_write.empty? + @queued_for_write.each do |style, file| file.close FileUtils.mkdir_p(File.dirname(filesystem_path(style))) @@ -246,7 +248,7 @@ module Paperclip FileUtils.chmod(0644, filesystem_path(style)) end - unless @queued_for_write.empty? || (delay_processing? && dirty?) + unless delay_processing? && dirty? instance.update_column(synced_to_s3_field, false) if instance_read(:synced_to_s3) if instance.respond_to?(synced_to_fog_field) && instance_read(:synced_to_fog) instance.update_column(synced_to_fog_field, false)