Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG DOCKER_GROUP_ID
RUN apt update
RUN apt upgrade -y
RUN apt-get install -y build-essential libtag1-dev libffi-dev \
xvfb firefox git curl sox libsox-fmt-mp3 libpq-dev imagemagick sudo postgresql-client
xvfb firefox git curl sox libsox-fmt-mp3 libpq-dev imagemagick sudo postgresql-client webp

# for ruby
RUN apt-get install -y --force-yes autoconf patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev
Expand Down
4 changes: 2 additions & 2 deletions app/serializers/show_series_serializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ def thumb_image_url
else
variant.url
end
rescue ActiveStorage::InvariableError => e
Rails.logger.error("ActiveStorage::InvariableError for show_series id=#{object.id} title=#{object.title}: #{e.message}")
rescue ActiveStorage::InvariableError, ActiveStorage::ProcessingError, MiniMagick::Error => e
Rails.logger.error("Thumbnail processing failed for show_series id=#{object.id} title=#{object.title}: #{e.class}: #{e.message}")
image_url
end
end
Expand Down
20 changes: 19 additions & 1 deletion spec/serializers/show_series_serializer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,25 @@
allow(mock_attachment).to receive(:variant).and_raise(ActiveStorage::InvariableError)
allow(show_series).to receive(:as_image).and_return(mock_attachment)
allow(subject).to receive(:image_url).and_return("http://example.com/show.png")
expect(Rails.logger).to receive(:error).with(/ActiveStorage::InvariableError.*test show/)
expect(Rails.logger).to receive(:error).with(/Thumbnail processing failed.*test show.*ActiveStorage::InvariableError/)
expect(subject.thumb_image_url).to eq("http://example.com/show.png")
end

it "returns image_url as fallback when ActiveStorage::ProcessingError is raised" do
mock_attachment = double("as_image", present?: true)
allow(mock_attachment).to receive(:variant).and_raise(ActiveStorage::ProcessingError)
allow(show_series).to receive(:as_image).and_return(mock_attachment)
allow(subject).to receive(:image_url).and_return("http://example.com/show.png")
expect(Rails.logger).to receive(:error).with(/Thumbnail processing failed.*test show.*ActiveStorage::ProcessingError/)
expect(subject.thumb_image_url).to eq("http://example.com/show.png")
end

it "returns image_url as fallback when MiniMagick::Error is raised" do
mock_attachment = double("as_image", present?: true)
allow(mock_attachment).to receive(:variant).and_raise(MiniMagick::Error)
allow(show_series).to receive(:as_image).and_return(mock_attachment)
allow(subject).to receive(:image_url).and_return("http://example.com/show.png")
expect(Rails.logger).to receive(:error).with(/Thumbnail processing failed.*test show.*MiniMagick::Error/)
expect(subject.thumb_image_url).to eq("http://example.com/show.png")
end
end
Expand Down