mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
0210ac0b43
In response to https://github.com/rails/rails/issues/32917 In the current implementation, ActiveStorage passes all options to the underlying processor, including when a key has a value of false. For example, passing: ``` avatar.variant(resize: "100x100", monochrome: false, flip: "-90") ``` will return a monochrome image (or an error, pending on ImageMagick configuration) because it passes `-monochrome false` to the command (but the command line does not allow disabling flags this way, as usually a user would omit the flag entirely to disable that feature). This fix only passes those keys forward to the underlying processor if the value responds to `present?`. In practice, this means that `false` or `nil` will be filtered out before going to the processor. One possible use case would be for a user to be able to apply different filters to an avatar. The code might look something like: ``` variant_options = { monochrome: params[:monochrome], resize: params[:resize] } avatar.variant(*variant_options) ``` Obviously some sanitization may be beneficial in a real-world scenario, but this type of configuration object could be used in many other places as well. - Add removing falsy values from varaints to changelog - The entirety of #image_processing_transformation inject block was wrapped in `list.tap` to guard against the default `nil` being returned if no conditional was called. - add test for explicitly true variant options
177 lines
5.5 KiB
Ruby
177 lines
5.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "test_helper"
|
|
require "database/setup"
|
|
|
|
class ActiveStorage::VariantTest < ActiveSupport::TestCase
|
|
test "resized variation of JPEG blob" do
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = blob.variant(resize: "100x100").processed
|
|
assert_match(/racecar\.jpg/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 67, image.height
|
|
end
|
|
|
|
test "resized and monochrome variation of JPEG blob" do
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = blob.variant(resize: "100x100", monochrome: true).processed
|
|
assert_match(/racecar\.jpg/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 67, image.height
|
|
assert_match(/Gray/, image.colorspace)
|
|
end
|
|
|
|
test "monochrome with default variant_processor" do
|
|
begin
|
|
ActiveStorage.variant_processor = nil
|
|
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = blob.variant(monochrome: true).processed
|
|
image = read_image(variant)
|
|
assert_match(/Gray/, image.colorspace)
|
|
ensure
|
|
ActiveStorage.variant_processor = :mini_magick
|
|
end
|
|
end
|
|
|
|
test "disabled variation of JPEG blob" do
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = blob.variant(resize: "100x100", monochrome: false).processed
|
|
assert_match(/racecar\.jpg/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 67, image.height
|
|
assert_match(/RGB/, image.colorspace)
|
|
end
|
|
|
|
test "disabled variation of JPEG blob with :combine_options" do
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = ActiveSupport::Deprecation.silence do
|
|
blob.variant(combine_options: {
|
|
resize: "100x100",
|
|
monochrome: false
|
|
}).processed
|
|
end
|
|
assert_match(/racecar\.jpg/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 67, image.height
|
|
assert_match(/RGB/, image.colorspace)
|
|
end
|
|
|
|
test "disabled variation using :combine_options" do
|
|
begin
|
|
ActiveStorage.variant_processor = nil
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = ActiveSupport::Deprecation.silence do
|
|
blob.variant(combine_options: {
|
|
crop: "100x100+0+0",
|
|
monochrome: false
|
|
}).processed
|
|
end
|
|
assert_match(/racecar\.jpg/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 100, image.height
|
|
assert_match(/RGB/, image.colorspace)
|
|
ensure
|
|
ActiveStorage.variant_processor = :mini_magick
|
|
end
|
|
end
|
|
|
|
test "center-weighted crop of JPEG blob using :combine_options" do
|
|
begin
|
|
ActiveStorage.variant_processor = nil
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = ActiveSupport::Deprecation.silence do
|
|
blob.variant(combine_options: {
|
|
gravity: "center",
|
|
resize: "100x100^",
|
|
crop: "100x100+0+0",
|
|
}).processed
|
|
end
|
|
assert_match(/racecar\.jpg/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 100, image.height
|
|
ensure
|
|
ActiveStorage.variant_processor = :mini_magick
|
|
end
|
|
end
|
|
|
|
test "center-weighted crop of JPEG blob using :resize_to_fill" do
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = blob.variant(resize_to_fill: [100, 100]).processed
|
|
assert_match(/racecar\.jpg/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 100, image.height
|
|
end
|
|
|
|
test "resized variation of PSD blob" do
|
|
blob = create_file_blob(filename: "icon.psd", content_type: "image/vnd.adobe.photoshop")
|
|
variant = blob.variant(resize: "20x20").processed
|
|
assert_match(/icon\.png/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal "PNG", image.type
|
|
assert_equal 20, image.width
|
|
assert_equal 20, image.height
|
|
end
|
|
|
|
test "resized variation of ICO blob" do
|
|
blob = create_file_blob(filename: "favicon.ico", content_type: "image/vnd.microsoft.icon")
|
|
variant = blob.variant(resize: "20x20").processed
|
|
assert_match(/icon\.png/, variant.service_url)
|
|
|
|
image = read_image(variant)
|
|
assert_equal "PNG", image.type
|
|
assert_equal 20, image.width
|
|
assert_equal 20, image.height
|
|
end
|
|
|
|
test "optimized variation of GIF blob" do
|
|
blob = create_file_blob(filename: "image.gif", content_type: "image/gif")
|
|
|
|
assert_nothing_raised do
|
|
blob.variant(layers: "Optimize").processed
|
|
end
|
|
end
|
|
|
|
test "variation of invariable blob" do
|
|
assert_raises ActiveStorage::InvariableError do
|
|
create_file_blob(filename: "report.pdf", content_type: "application/pdf").variant(resize: "100x100")
|
|
end
|
|
end
|
|
|
|
test "service_url doesn't grow in length despite long variant options" do
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = blob.variant(font: "a" * 10_000).processed
|
|
assert_operator variant.service_url.length, :<, 525
|
|
end
|
|
|
|
test "works for vips processor" do
|
|
begin
|
|
ActiveStorage.variant_processor = :vips
|
|
blob = create_file_blob(filename: "racecar.jpg")
|
|
variant = blob.variant(thumbnail_image: 100).processed
|
|
|
|
image = read_image(variant)
|
|
assert_equal 100, image.width
|
|
assert_equal 67, image.height
|
|
rescue LoadError
|
|
# libvips not installed
|
|
ensure
|
|
ActiveStorage.variant_processor = :mini_magick
|
|
end
|
|
end
|
|
end
|