From 78ee45630b93e8949a58de1b9a29604fa85b312d Mon Sep 17 00:00:00 2001 From: taitus Date: Mon, 5 Jun 2023 15:55:53 +0200 Subject: [PATCH] Remove metadata from images Currently in the application we never show the original image, we always show one of its variants. This change removes the metadata of both the variants and the original version so that if at some point we decide to show the original version, we will no longer have to remember to remove the metadata. --- app/models/image.rb | 4 +-- .../files/logo_header_with_metadata.jpg | Bin 0 -> 8694 bytes spec/system/images_spec.rb | 25 ++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 spec/fixtures/files/logo_header_with_metadata.jpg create mode 100644 spec/system/images_spec.rb diff --git a/app/models/image.rb b/app/models/image.rb index 4d479d282..1f541171b 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -41,9 +41,9 @@ class Image < ApplicationRecord def variant(style) if style - attachment.variant(self.class.styles[style]) + attachment.variant(self.class.styles[style].merge(strip: true)) else - attachment + attachment.variant(strip: true) end end diff --git a/spec/fixtures/files/logo_header_with_metadata.jpg b/spec/fixtures/files/logo_header_with_metadata.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ccc1d4ef83dd1beb5970aa36b3b593ede3761cf9 GIT binary patch literal 8694 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 YaV>^SH;ZzTnN