diff --git a/app/models/aircraft.rb b/app/models/aircraft.rb
index 1053b55..9919af5 100644
--- a/app/models/aircraft.rb
+++ b/app/models/aircraft.rb
@@ -87,9 +87,10 @@ class Aircraft < ApplicationRecord
def picture_shown? = picture.attached? && picture.attachment.persisted?
# The photo at a page's size (:thumb or :card), or the original when it
- # can't be resized (see ActiveStorage::Blob#resizable_image?).
+ # isn't a kind that can be resized. (One that can't be read is sent as the
+ # original too: see config/initializers/active_storage_images.rb.)
def picture_for(size)
- picture.blob.resizable_image? ? picture.variant(size) : picture
+ picture.variable? ? picture.variant(size) : picture
end
private
diff --git a/app/views/squawks/_attachments.html.erb b/app/views/squawks/_attachments.html.erb
index c569a27..161568f 100644
--- a/app/views/squawks/_attachments.html.erb
+++ b/app/views/squawks/_attachments.html.erb
@@ -2,8 +2,7 @@
(which has Download); other files open in a new tab and have a download link. %>
<% files = squawk.attachments.to_a %>
<% if files.any? %>
- <%# Thumbnails for images that can be resized; others are listed as files. %>
- <% photos, others = files.partition { _1.image? && _1.blob.resizable_image? } %>
+ <% photos, others = files.partition { _1.image? && _1.variable? } %>
<% photos.each do |file| %>
diff --git a/config/initializers/active_storage_images.rb b/config/initializers/active_storage_images.rb
index e220279..d584061 100644
--- a/config/initializers/active_storage_images.rb
+++ b/config/initializers/active_storage_images.rb
@@ -1,15 +1,7 @@
# Uploads that claim to be images but can't be read as one (empty, corrupt,
-# or another kind of file with an image name).
+# or another kind of file with an image name): if resizing fails, send the
+# original rather than an error.
Rails.application.config.to_prepare do
- ActiveStorage::Blob.class_eval do
- # Worth resizing: an image kind that the upload check didn't find
- # unreadable. (Until that check has run, assume it's fine.)
- def resizable_image?
- variable? && !(metadata[:analyzed] && metadata[:width].blank?)
- end
- end
-
- # If resizing fails anyway, send the original rather than an error.
ActiveStorage::Representations::BaseController.rescue_from(Vips::Error, ActiveStorage::InvariableError) do
redirect_to Rails.application.routes.url_helpers.rails_blob_path(@blob, disposition: params[:disposition], only_path: true)
end
diff --git a/test/integration/malformed_input_test.rb b/test/integration/malformed_input_test.rb
index 51b9d76..755a50b 100644
--- a/test/integration/malformed_input_test.rb
+++ b/test/integration/malformed_input_test.rb
@@ -75,13 +75,18 @@ class MalformedInputTest < ActionDispatch::IntegrationTest
assert_response :unprocessable_entity
end
- test "an image that can't be read is shown as the file, never resized" do
- @a.picture.attach(io: StringIO.new("GIF89a not really"), filename: "broken.gif", content_type: "image/gif")
- @a.picture.blob.update!(metadata: { identified: true, analyzed: true }) # analysis found no dimensions
- assert_kind_of ActiveStorage::Attached::One, @a.picture_for(:thumb)
+ test "photos measured without dimensions (uploaded before image processing) still get thumbnails" do
+ jpeg = Vips::Image.black(400, 300).jpegsave_buffer
+ @a.picture.attach(io: StringIO.new(jpeg), filename: "old.jpg", content_type: "image/jpeg")
+ @a.picture.blob.update!(metadata: { identified: true, analyzed: true }) # as older uploads were recorded
get aircraft_path(@a)
- assert_response :success
- assert_select "img[src*='/representations/']", 0
+ assert_select "img[src*='/representations/']"
+
+ squawk = @a.squawks.create!(issue_reported: "Leak", reported_by: @owner)
+ squawk.attachments.attach(io: StringIO.new(jpeg), filename: "PXL_1.jpg", content_type: "image/jpeg")
+ squawk.attachments.first.blob.update!(metadata: { identified: true, analyzed: true })
+ get aircraft_squawks_path(@a)
+ assert_select "a[data-gallery-target=item] img[src*='/representations/']"
end
test "if resizing a photo fails anyway, the original is sent instead of an error" do