image_processing 2.0.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073bdcd7bc5e6fbb52b92f70de43d3b700316620dd23ec75b9aeac18bd5375b3
-  data.tar.gz: 1678df6fd73afc2230fafd9c3f84b2d5174351819ef0f3961ed5206f2c6ae53b
+  metadata.gz: 5b790f3dd08c310a2413cb8cb6b33a9c602edb3509cdd1de2c8f94ebea702f17
+  data.tar.gz: 99d87927f2a6603939332f61292c2b2b582fecc5832b4562a92e8a5170e862d9
 SHA512:
-  metadata.gz: e41739ac97beb0cb48cd97be766578cac1c14b4fd86fea0dd7401b835ecfbd2c018485d12ea0cb6d3c6cfcf0d4e0355d5c011770dd7f0c74aec26e7499cb306f
-  data.tar.gz: 7618aa5091de6ddc2a01a189e548e508d862535ad8a7f4e400845c8696fcace78081f33efc343fa220ed04d13a0a71106a7e7c10141c107764270640ad30a0a6
+  metadata.gz: 00b2e0b0b250473b55e4ca415fd00f1c9fa50458e2c280a4110949838c344cb49c52b5afe023e0c75b8e435460f55517a1aeb8497ae1adf72fdca1de3fab59e2
+  data.tar.gz: a87c6791a8dbc06d5e40a6a64aaefd7803a382aac5071e238f7f7bface47d026405603bb6da9cc4534f9472f65d2e70bf4614cd75b9962506781a2818ad81b73

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## 2.0.3 (2026-06-08)
+## 2.2.0 (2026-09-29)
+
+* Save in the `#convert` format when the destination path has no extension, such as a `/dev/fd/N` path (thanks to @flavorjones)
+
+## 2.1.0 (2026-09-01)
+
+* [minimagick] Add `inherit_fds:` so a loader can name an already-open input (thanks to @flavorjones)
+
+## 2.0.3 (2026-08-06)
 
 * Prevent remote code execution when operation names come from user input, closing bypasses through the `#operation` meta-builder, `#method_missing`, and nested `#send` calls (reported by @szymonsec)
 

data/lib/image_processing/mini_magick.rb

@@ -9,11 +9,20 @@ module ImageProcessing
   module MiniMagick
     extend Chainable
 
-    def self.convert_shim(&block)
+    # mini_magick gained `inherit_fds:` on MiniMagick::Shell#execute in 5.4.0.
+    INHERIT_FDS_MINIMUM_VERSION = Gem::Version.new("5.4.0")
+
+    def self.convert_shim(inherit_fds: nil, &block)
+      if inherit_fds && ::MiniMagick.version < INHERIT_FDS_MINIMUM_VERSION
+        raise LoadError, "The `inherit_fds` loader option requires mini_magick #{INHERIT_FDS_MINIMUM_VERSION} or newer, but mini_magick #{::MiniMagick.version} is loaded. Please upgrade the gem."
+      end
+
+      options = inherit_fds ? { inherit_fds: inherit_fds } : {}
+
       if ::MiniMagick.respond_to?(:convert)
-        ::MiniMagick.convert(&block)
+        ::MiniMagick.convert(**options, &block)
       else
-        ::MiniMagick::Tool::Convert.new(&block)
+        ::MiniMagick::Tool::Convert.new(**options, &block)
       end
     end
 
@@ -37,12 +46,16 @@ module ImageProcessing
       # Initializes the image on disk into a MiniMagick::Tool object. Accepts
       # additional options related to loading the image (e.g. geometry).
       # Additionally auto-orients the image to be upright.
-      def self.load_image(path_or_magick, loader: nil, page: nil, geometry: nil, auto_orient: true, **options)
+      # `inherit_fds` names IO objects the tool inherits, so the source may be a
+      # `/dev/fd/N` path. The source stays a path, so `loader`, `page` and
+      # `geometry` still apply to it, which they would not if the caller passed
+      # a pre-built MiniMagick::Tool carrying the descriptor.
+      def self.load_image(path_or_magick, loader: nil, page: nil, geometry: nil, auto_orient: true, inherit_fds: nil, **options)
         if path_or_magick.is_a?(::MiniMagick::Tool)
           magick = path_or_magick
         else
           source_path = path_or_magick
-          magick = ::ImageProcessing::MiniMagick.convert_shim
+          magick = ::ImageProcessing::MiniMagick.convert_shim(inherit_fds: inherit_fds)
 
           Utils.apply_options(magick, **options)
 
@@ -60,11 +73,21 @@ module ImageProcessing
 
       # Calls the built ImageMagick command to perform processing and save
       # the result to disk. Accepts additional options related to saving the
-      # image (e.g. quality).
-      def self.save_image(magick, destination_path, allow_splitting: false, **options)
+      # image (e.g. quality). `format` names the output format when given,
+      # otherwise ImageMagick infers it from the path's extension.
+      def self.save_image(magick, destination_path, format = nil, allow_splitting: false, **options)
         Utils.apply_options(magick, **options)
 
-        magick << destination_path
+        if format
+          # ImageMagick reads everything before the first colon as the
+          # format, so a format carrying a colon could redirect the output.
+          format = format.to_s
+          fail Error, "invalid format: #{format.inspect}" unless format.ascii_only? && format.match?(/\A\w+\z/)
+
+          magick << "#{format}:#{destination_path}"
+        else
+          magick << destination_path
+        end
         magick.call
 
         Utils.disallow_split_layers!(destination_path) unless allow_splitting

data/lib/image_processing/pipeline.rb

@@ -21,7 +21,11 @@ module ImageProcessing
         call_processor
       elsif destination
         handle_destination do
-          call_processor(destination: destination)
+          if format && !determine_format(destination)
+            call_processor(destination: destination, format: format)
+          else
+            call_processor(destination: destination)
+          end
         end
       else
         create_tempfile do |tempfile|

data/lib/image_processing/processor.rb

@@ -1,7 +1,7 @@
 module ImageProcessing
   # Abstract class inherited by individual processors.
   class Processor
-    def self.call(source:, loader:, operations:, saver:, destination: nil)
+    def self.call(source:, loader:, operations:, saver:, destination: nil, format: nil)
       unless source.is_a?(String) || source.is_a?(self::ACCUMULATOR_CLASS)
         fail Error, "invalid source: #{source.inspect}"
       end
@@ -19,7 +19,9 @@ module ImageProcessing
         accumulator = apply_operation(accumulator, operation)
       end
 
-      if destination
+      if destination && format
+        save_image(accumulator, destination, format, **saver)
+      elsif destination
         save_image(accumulator, destination, **saver)
       else
         accumulator

data/lib/image_processing/version.rb

@@ -1,3 +1,3 @@
 module ImageProcessing
-  VERSION = "2.0.3"
+  VERSION = "2.2.0"
 end

data/lib/image_processing/vips.rb

@@ -56,12 +56,24 @@ module ImageProcessing
 
       # Writes the Vips::Image object to disk. This starts the processing
       # pipeline defined in the Vips::Image object. Accepts additional
-      # saver-specific options (e.g. quality).
-      def self.save_image(image, path, saver: nil, quality: nil, **options)
+      # saver-specific options (e.g. quality). The saver is chosen by `format`
+      # when given, otherwise by the path's extension.
+      def self.save_image(image, path, format = nil, saver: nil, quality: nil, **options)
         options[:Q] = quality if quality
 
         if saver
           image.public_send(:"#{saver}save", path, **options)
+        elsif format
+          # Savers such as heifsave pick their encoding from the suffix (AV1
+          # for ".avif"), so save through a target, which takes the suffix
+          # separately from the path.
+          saver = ::Vips.vips_foreign_find_save_target(".#{format}")
+          fail ::Vips::Error, "No known saver for '#{format}'." unless saver
+
+          filename      = ::Vips.p2str(::Vips.vips_filename_get_filename(path))
+          option_string = ::Vips.p2str(::Vips.vips_filename_get_options(path))
+          options       = Utils.select_valid_options(saver, options)
+          image.write_to_target(::Vips::Target.new_to_file(filename), ".#{format}#{option_string}", **options)
         else
           options = Utils.select_valid_saver_options(path, options)
           image.write_to_file(path, **options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_processing
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Janko Marohnić