Use latest version of rmagick for Ruby 3.2

carrierwaveuploader · Sep 8, 2023 · af4078d · af4078d
1 parent aa17243
commit af4078d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/carrierwave.gemspec b/carrierwave.gemspec
@@ -40,7 +40,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fog-rackspace"
   s.add_development_dependency "mini_magick", ">= 3.6.0"
   if RUBY_ENGINE != 'jruby'
-    s.add_development_dependency "rmagick", "~> 2.16"
+    if RUBY_VERSION < '3.2'
+      s.add_development_dependency "rmagick", "~> 2.16"
+    else
+      s.add_development_dependency "rmagick"
+    end
   end
   s.add_development_dependency "timecop"
   s.add_development_dependency "generator_spec", ">= 0.9.1"

diff --git a/lib/carrierwave/processing/rmagick.rb b/lib/carrierwave/processing/rmagick.rb
@@ -228,7 +228,7 @@ def resize_and_pad(width, height, background=:transparent, gravity=::Magick::Cen
       height = dimension_from height
       manipulate! do |img|
         img.resize_to_fit!(width, height)
-        new_img = ::Magick::Image.new(width, height) { self.background_color = background == :transparent ? 'rgba(255,255,255,0)' : background.to_s }
+        new_img = ::Magick::Image.new(width, height) { |options| options.background_color = background == :transparent ? 'rgba(255,255,255,0)' : background.to_s }
         if background == :transparent
           filled = new_img.matte_floodfill(1, 1)
         else