jr-paperclip 7.3.0 → 8.0.0.beta.1

data/lib/paperclip/geometry_detector_factory.rb

@@ -1,31 +1,75 @@
 module Paperclip
   class GeometryDetector
-    def initialize(file)
+    def initialize(file, backend: nil)
       @file = file
+      @backend = backend
       raise_if_blank_file
     end
 
     def make
       geometry = GeometryParser.new(geometry_string.strip).make
-      geometry || raise(Errors::NotIdentifiedByImageMagickError.new("Could not identify image size"))
+      geometry || raise(Errors::NotIdentifiedByBackendError.new("Could not identify image size"))
     end
 
     private
 
     def geometry_string
-      orientation = Paperclip.options[:use_exif_orientation] ?
-        "%[exif:orientation]" : "1"
+      if resolve_backend == :vips
+        vips_geometry_string
+      else
+        imagemagick_geometry_string
+      end
+    end
+
+    def resolve_backend
+      Paperclip.resolve_backend(@backend || Paperclip.options[:backend])
+    end
+
+    def imagemagick_geometry_string
+      orientation = if Paperclip.options[:use_exif_orientation]
+                      "%[exif:orientation]"
+                    else
+                      "1"
+                    end
       Paperclip.run(
-        Paperclip.options[:is_windows] ? "magick identify" : "identify",
+        (Paperclip.options[:is_windows] || Paperclip.imagemagick7?) ? "magick identify" : "identify",
         "-format '%wx%h,#{orientation}' :file", {
-          file: "#{path}[0]"
+          file: "#{path}[0]",
         },
         swallow_stderr: true
       )
     rescue Terrapin::ExitStatusError
       ""
     rescue Terrapin::CommandNotFoundError => e
-      raise_because_imagemagick_missing
+      raise Errors::CommandNotFoundError.new("Could not run the `identify` command. Please install ImageMagick.")
+    end
+
+    def vips_geometry_string
+      begin
+        require "vips"
+      rescue LoadError => e
+        raise Errors::CommandNotFoundError.new("Could not load ruby-vips. Please install libvips and the image_processing gem.")
+      end
+
+      begin
+        # Use ruby-vips gem directly instead of shelling out to vipsheader
+        image = Vips::Image.new_from_file(path, access: :sequential)
+        width = image.width
+        height = image.height
+
+        orientation = "1"
+        if Paperclip.options[:use_exif_orientation]
+          begin
+            orientation = image.get("orientation").to_s
+          rescue Vips::Error
+            # Field might not exist
+          end
+        end
+
+        "#{width}x#{height},#{orientation}"
+      rescue Vips::Error
+        ""
+      end
     end
 
     def path
@@ -34,12 +78,8 @@ module Paperclip
 
     def raise_if_blank_file
       if path.blank?
-        raise Errors::NotIdentifiedByImageMagickError.new("Cannot find the geometry of a file with a blank name")
+        raise Errors::NotIdentifiedByBackendError.new("Cannot find the geometry of a file with a blank name")
       end
     end
-
-    def raise_because_imagemagick_missing
-      raise Errors::CommandNotFoundError.new("Could not run the `identify` command. Please install ImageMagick.")
-    end
   end
 end

data/lib/paperclip/helpers.rb

@@ -56,5 +56,23 @@ module Paperclip
     def reset_duplicate_clash_check!
       @names_url = nil
     end
+
+    def imagemagick7?
+      return @imagemagick7 if instance_variable_defined?(:@imagemagick7)
+
+      @imagemagick7 = !!which("magick")
+    end
+
+    # https://github.com/minimagick/minimagick/blob/master/lib/mini_magick/utilities.rb#L9-L24
+    def which(cmd)
+      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+      (ENV["PATH"] || "").split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable? exe
+        end
+      end
+      nil
+    end
   end
 end

data/lib/paperclip/processor.rb

@@ -36,10 +36,18 @@ module Paperclip
     # The convert method runs the convert binary with the provided arguments.
     # See Paperclip.run for the available options.
     def convert(arguments = "", local_options = {})
+      command =
+        if Paperclip.imagemagick7? # IMv7 on any OS
+          "magick"
+        elsif Paperclip.options[:is_windows] # IMv6 on Windows
+          "magick convert"
+        else
+          "convert"
+        end
       Paperclip.run(
-        Paperclip.options[:is_windows] ? "magick convert" : "convert",
+        command,
         arguments,
-        local_options
+        local_options,
       )
     end
 
@@ -47,10 +55,34 @@ module Paperclip
     # See Paperclip.run for the available options.
     def identify(arguments = "", local_options = {})
       Paperclip.run(
-        Paperclip.options[:is_windows] ? "magick identify" : "identify",
+        (Paperclip.options[:is_windows] || Paperclip.imagemagick7?) ? "magick identify" : "identify",
         arguments,
-        local_options
+        local_options,
       )
     end
+
+    # Runs libvips command
+    def vips(arguments = "", local_options = {})
+      Paperclip.run("vips", arguments, local_options)
+    end
+
+    # Runs libvips header command
+    def vipsheader(arguments = "", local_options = {})
+      Paperclip.run("vipsheader", arguments, local_options)
+    end
+
+    # Returns a Vips::Image object for the given file path.
+    # This provides access to the full ruby-vips API for image manipulation.
+    # @param file_path [String] Path to the image file
+    # @param options [Hash] Options to pass to Vips::Image.new_from_file
+    # @return [Vips::Image] The loaded image
+    def vips_image(file_path, **options)
+      begin
+        require "vips"
+      rescue LoadError
+        raise Errors::CommandNotFoundError.new("Could not load ruby-vips. Please install libvips and the vips gem.")
+      end
+      Vips::Image.new_from_file(file_path, **options)
+    end
   end
 end