mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Restore thumbnails for photos recorded without dimensions
Photos uploaded before image processing was installed are marked analyzed with no width, so the "unreadable image" check showed them as file links. Every resizable image gets a thumbnail again; one that can't be read still falls back to the original when resizing fails. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
908c943e21
commit
a2672b99a3
4 files changed
+17
-20
No files matched your search
@@ -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
|
||||
|
||||
@@ -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? } %>
|
||||
<div class="mt-1" data-controller="gallery">
|
||||
<ul class="flex flex-wrap gap-1.5">
|
||||
<% photos.each do |file| %>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user