jekyll-imgflow 0.3.2 → 0.4.0

data/lib/jekyll-imgflow/providers/base_provider.rb

@@ -2,6 +2,7 @@
 
 require "open3"
 require "pathname"
+require "fileutils"
 
 module JekyllImgFlow
   module Providers
@@ -10,6 +11,15 @@ module JekyllImgFlow
       # Valid smartcrop position values
       SMARTCROP_POSITIONS = %w[attention entropy center centre].freeze
 
+      # Short compass → provider position mapping used by HTTP providers.
+      COMPASS_TO_SHORT = {
+        "northwest" => "tl",
+        "northeast" => "tr",
+        "southwest" => "bl",
+        "southeast" => "br",
+        "center" => "c"
+      }.freeze
+
       attr_accessor :config
 
       def initialize(config = {})
@@ -17,6 +27,86 @@ module JekyllImgFlow
         @operations = []
       end
 
+      # Operation lookup helpers — used by all providers to avoid
+      # repeating `@operations.find { |op| op[:type] == :xxx }`.
+      def find_op(type)
+        @operations.find { |op| op[:type] == type }
+      end
+
+      def op?(type)
+        @operations.any? { |op| op[:type] == type }
+      end
+
+      # Normalize a crop operation into a geometry hash.
+      # Returns { smartcrop:, keep:, x:, y:, width:, height: } where
+      # smartcrop is true when ratio + keep + valid smartcrop position.
+      def crop_geometry(operation)
+        opts = operation[:options] || {}
+        params = operation[:params] || {}
+        keep = opts[:keep] || params[:keep] || params[:position]
+        smartcrop = operation[:ratio] && keep && SMARTCROP_POSITIONS.include?(keep.to_s)
+        coords = if operation[:ratio]
+                   { x: opts[:calculated_x], y: opts[:calculated_y],
+                     width: opts[:calculated_width], height: opts[:calculated_height] }
+                 else
+                   { x: opts[:x] || 0, y: opts[:y] || 0,
+                     width: opts[:width], height: opts[:height] }
+                 end
+        coords.merge(smartcrop: smartcrop, keep: keep)
+      end
+
+      # Extract watermark operation parts into a hash.
+      def watermark_parts(operation)
+        {
+          watermark_path: operation[:watermark_path],
+          position: operation[:options][:position],
+          opacity: operation[:options][:opacity]
+        }
+      end
+
+      # Shared compass → short position mapping (tl/tr/bl/br/c).
+      # HTTP providers (imgproxy, weserv, flyimg) all use this mapping.
+      def compass_to_short(position)
+        COMPASS_TO_SHORT[position.to_s] || position.to_s
+      end
+
+      # Input format extension (lowercased, no dot) for format preservation.
+      def input_format_ext(input_path)
+        File.extname(input_path).delete(".").downcase
+      end
+
+      # Convert a 0..1 opacity float to a 0..255 integer (used by all
+      # providers that encode alpha as an 8-bit value).
+      def alpha_byte_value(opacity)
+        (opacity * 255).round
+      end
+
+      # Generate a temporary file path by replacing the extension of
+      # +input_path+ with +suffix+ (e.g. temp_path("a.jpg", "tmp_base.jpg")
+      # → "a.tmp_base.jpg").
+      def temp_path(input_path, suffix)
+        input_path.gsub(/\.[^.]+$/, ".#{suffix}")
+      end
+
+      # Map a smartcrop +keep+ value to the libvips interestingness string
+      # used by Sharp and LibVips smartcrop/thumbnail --crop operations.
+      def smartcrop_interestingness(keep)
+        case keep.to_s
+        when "entropy" then "entropy"
+        when "center", "centre" then "centre"
+        else "attention"
+        end
+      end
+
+      # Check whether any of the given CLI commands is available on PATH.
+      # Used by CLI providers (sharp, libvips, imagemagick).
+      def cli_available?(*commands)
+        commands.any? do |cmd|
+          _, _, status = Open3.capture3("which", cmd)
+          status.success?
+        end
+      end
+
       # Check if this provider is available (must be implemented by subclasses)
       def available?
         # Default: not available unless subclass implements actual check
@@ -165,6 +255,7 @@ module JekyllImgFlow
       end
 
       def execute_command(command)
+        # nosemgrep: ruby.lang.security.dangerous-exec.dangerous-exec -- provider commands shell-escape paths; pipelines are intentional for Sharp watermark operations.
         stdout, stderr, status = Open3.capture3(command)
         raise "Command failed: #{command}\nError: #{stderr.strip}" unless status.success?
 
@@ -205,5 +296,113 @@ module JekyllImgFlow
         end
       end
     end
+
+    # Shared base for HTTP-based providers (imgproxy, weserv, flyimg).
+    # Subclasses must implement `service_url`, `build_combined_url`, and
+    # define a `TIMEOUT` constant. They may optionally override
+    # `provider_label` for error messages.
+    class HttpBase < BaseProvider
+      def available?
+        url = service_url
+        return false unless url
+
+        check_http_service(url)
+      end
+
+      def execute(input_path, output_path)
+        return if @operations.empty?
+
+        url = build_combined_url(input_path)
+        fetch_and_save(url, output_path)
+        output_path
+      ensure
+        reset_operations
+      end
+
+      protected
+
+      # Subclasses override to return the configured service URL or nil.
+      def service_url
+        raise NotImplementedError
+      end
+
+      # Subclasses override to build the full request URL.
+      def build_combined_url(_input_path)
+        raise NotImplementedError
+      end
+
+      # Label used in error messages (defaults to class name).
+      def provider_label
+        self.class.name.split("::").last
+      end
+
+      def timeout
+        self.class::TIMEOUT
+      end
+
+      def fetch_and_save(url, output_path)
+        response = fetch_with_timeout(url)
+        raise "#{provider_label} request failed" if response.empty?
+
+        FileUtils.mkdir_p(File.dirname(output_path))
+        File.write(output_path, response)
+      end
+
+      def fetch_with_timeout(url)
+        uri = URI(url)
+        Net::HTTP.start(uri.host, uri.port,
+                        use_ssl: uri.scheme == "https",
+                        open_timeout: timeout,
+                        read_timeout: timeout) do |http|
+          request = Net::HTTP::Get.new(uri)
+          response = http.request(request)
+
+          raise "HTTP #{response.code}: #{response.message}" unless response.is_a?(Net::HTTPSuccess)
+
+          response.body
+        end
+      rescue StandardError => e
+        raise "#{provider_label} request failed: #{e.message}"
+      end
+    end
+
+    # Shared base for CLI-based providers (sharp, imagemagick, libvips).
+    # Subclasses implement `build_commands(input_path, output_path)` to
+    # return an array of command entries (strings or arrays), and
+    # `run_command(cmd)` to execute a single entry.
+    class CliBase < BaseProvider
+      def execute(input_path, output_path)
+        return if @operations.empty?
+
+        before_execute(input_path)
+        commands = build_commands(input_path, output_path)
+        Array(commands).each { |cmd| run_command(cmd) }
+        output_path
+      ensure
+        reset_operations
+      end
+
+      protected
+
+      # Hook for subclasses to perform pre-execution work (e.g. SVG warnings).
+      def before_execute(_input_path); end
+
+      # Subclasses override to return command(s) to execute.
+      # May return a single command or an array of commands.
+      def build_commands(_input_path, _output_path)
+        raise NotImplementedError
+      end
+
+      # Execute a single command. Default uses the shell-based
+      # `execute_command` from BaseProvider. Subclasses that use
+      # argument arrays (no shell) should override this.
+      def run_command(cmd)
+        if cmd.is_a?(Array) && cmd.first == :cleanup
+          FileUtils.rm_f(cmd[1])
+          return
+        end
+        execute_command(cmd)
+      end
+    end
   end
 end

data/lib/jekyll-imgflow/providers/flyimg.rb

@@ -2,144 +2,98 @@
 
 require "net/http"
 require "uri"
-require "tempfile"
 require_relative "base_provider"
 
 module JekyllImgFlow
   module Providers
     # Flyimg provider implementation using the standardized tag interface
-    class Flyimg < BaseProvider
-      TIMEOUT = 10
+    class Flyimg < HttpBase
+      TIMEOUT = 60
 
-      def available?
-        # Check if flyimg service is running
-        return false unless @config.respond_to?(:flyimg_url) && @config.flyimg_url
-
-        check_http_service(@config.flyimg_url)
+      def service_url
+        @config.respond_to?(:flyimg_url) ? @config.flyimg_url : nil
       end
 
-      def execute(input_path, output_path)
-        return if @operations.empty?
-
-        # Build single Flyimg URL with all operations combined
-        url = build_combined_flyimg_url(input_path)
-
-        # Fetch the result in one request
-        fetch_and_save(url, output_path)
-        output_path
-      ensure
-        reset_operations
+      def build_combined_flyimg_url(input_path)
+        build_combined_url(input_path)
       end
 
-      def build_combined_flyimg_url(input_path)
-        raise "flyimg_url not set" unless @config.flyimg_url
+      def build_combined_url(input_path)
+        raise "flyimg_url not set" unless service_url
 
         encoded_url = encode_file_url(input_path)
         options = []
 
-        # Add all operations to single options string
-        @operations.each do |operation|
-          case operation[:type]
-          when :resize
-            # Tags now provide complete calculated values.
-            # c_1 forces the image to fill the exact width x height area.
-            # pns_0 allows upscaling when the source is smaller than the target
-            # (Flyimg's pns/preserve-natural-size defaults to 1, blocking enlarge).
-            options << "w_#{operation[:width]}"
-            options << "pns_0"
-            if operation[:height]
-              options << "h_#{operation[:height]}"
-              options << "c_1"
-            end
-
-          when :crop
-            opts = operation[:options]
-            params = operation[:params] || {}
-
-            # Check for keep parameter (smartcrop support)
-            keep = opts[:keep] || params[:keep] || params[:position]
-
-            if operation[:ratio] && keep && SMARTCROP_POSITIONS.include?(keep.to_s)
-              # Use smartcrop (Flyimg's smc option picks the best crop area)
-              crop_width = opts[:calculated_width]
-              crop_height = opts[:calculated_height]
-
-              options << "w_#{crop_width}"
-              options << "h_#{crop_height}"
-              options << "c_1"
-              options << "smc_1"
-            else
-              # Use basic cropping via extract (top-left / bottom-right coordinates)
-              if operation[:ratio]
-                crop_x = opts[:calculated_x]
-                crop_y = opts[:calculated_y]
-                crop_width = opts[:calculated_width]
-                crop_height = opts[:calculated_height]
-              else
-                crop_x = opts[:x]
-                crop_y = opts[:y]
-                crop_width = opts[:width]
-                crop_height = opts[:height]
-              end
-              options << "e_1"
-              options << "p1x_#{crop_x}"
-              options << "p1y_#{crop_y}"
-              options << "p2x_#{crop_x + crop_width}"
-              options << "p2y_#{crop_y + crop_height}"
-            end
-
-          when :quality
-            flyimg_quality = translate_quality_to_flyimg(operation[:quality])
-            options << "q_#{flyimg_quality}"
-
-          when :format
-            # Assume validated input from tags
-            options << "o_#{operation[:format]}"
-
-          when :watermark
-            watermark_path = operation[:watermark_path]
-            position = operation[:options][:position]
-            opacity = operation[:options][:opacity]
-
-            # Flyimg watermark parameters
-            encoded_watermark = encode_file_url(watermark_path)
-            position_param = translate_flyimg_position(position)
-            opacity_param = (opacity * 100).round
-            options << "wm_#{encoded_watermark}_#{position_param}_#{opacity_param}"
-
-          when :alpha_opacity
-            opacity = operation[:opacity]
-            options << "a_#{(opacity * 255).round}"
-          end
-        end
+        @operations.each { |operation| append_flyimg_operation(operation, options) }
+
+        preserve_input_format(input_path, options)
+        "#{service_url}/upload/#{options.join(',')}/#{encoded_url}"
+      end
 
-        # Preserve format when no explicit format operation is requested.
-        # Without this, chained HTTP requests (e.g. quality-only steps after a
-        # prior format conversion) would lose the previously converted format.
-        unless @operations.any? { |op| op[:type] == :format }
-          input_ext = File.extname(input_path).delete(".").downcase
-          options << "o_#{map_format(input_ext)}" unless input_ext.empty?
+      private
+
+      def append_flyimg_operation(operation, options)
+        case operation[:type]
+        when :resize
+          append_flyimg_resize(operation, options)
+        when :crop
+          append_flyimg_crop(operation, options)
+        when :quality
+          options << "q_#{operation[:quality]}"
+        when :format
+          options << "o_#{operation[:format]}"
+        when :watermark
+          append_flyimg_watermark(operation, options)
+        when :alpha_opacity
+          options << "a_#{alpha_byte_value(operation[:opacity])}"
         end
+      end
+
+      def append_flyimg_resize(operation, options)
+        # c_1 forces the image to fill the exact width x height area.
+        # pns_0 allows upscaling when the source is smaller than the target
+        # (Flyimg's pns/preserve-natural-size defaults to 1, blocking enlarge).
+        options << "w_#{operation[:width]}"
+        options << "pns_0"
+        return unless operation[:height]
 
-        # Build combined URL: base/upload/options/options,.../encoded_url
-        options_string = options.join(",")
-        "#{@config.flyimg_url}/upload/#{options_string}/#{encoded_url}"
+        options << "h_#{operation[:height]}"
+        options << "c_1"
       end
 
-      private
+      def append_flyimg_crop(operation, options)
+        geo = crop_geometry(operation)
 
-      def translate_flyimg_position(position)
-        # Translate compass directions to Flyimg position format
-        case position
-        when "northwest" then "tl"
-        when "northeast" then "tr"
-        when "southwest" then "bl"
-        when "southeast" then "br"
-        when "center" then "c"
-        else position
+        if geo[:smartcrop]
+          options << "w_#{geo[:width]}"
+          options << "h_#{geo[:height]}"
+          options << "c_1"
+          options << "smc_1"
+        else
+          # Use basic cropping via extract (top-left / bottom-right coordinates)
+          options << "e_1"
+          options << "p1x_#{geo[:x]}"
+          options << "p1y_#{geo[:y]}"
+          options << "p2x_#{geo[:x] + geo[:width]}"
+          options << "p2y_#{geo[:y] + geo[:height]}"
         end
       end
 
+      def append_flyimg_watermark(operation, options)
+        parts = watermark_parts(operation)
+        encoded_watermark = encode_file_url(parts[:watermark_path])
+        position_param = compass_to_short(parts[:position])
+        opacity_param = (parts[:opacity] * 100).round
+        options << "wm_#{encoded_watermark}_#{position_param}_#{opacity_param}"
+      end
+
+      def preserve_input_format(input_path, options)
+        return if op?(:format)
+
+        ext = input_format_ext(input_path)
+        options << "o_#{map_format(ext)}" unless ext.empty?
+      end
+
       def map_format(format)
         case format&.downcase
         when "jpeg", "jpg"
@@ -155,33 +109,9 @@ module JekyllImgFlow
         end
       end
 
-      def fetch_and_save(url, output_path)
-        response = fetch_with_timeout(url)
-        raise "Flyimg request failed" if response.empty?
-
-        FileUtils.mkdir_p(File.dirname(output_path))
-        File.write(output_path, response)
-      end
-
-      def fetch_with_timeout(url)
-        uri = URI(url)
-        Net::HTTP.start(uri.host, uri.port,
-                        use_ssl: uri.scheme == "https",
-                        open_timeout: TIMEOUT,
-                        read_timeout: TIMEOUT) do |http|
-          request = Net::HTTP::Get.new(uri)
-          response = http.request(request)
-
-          raise "HTTP #{response.code}: #{response.message}" unless response.is_a?(Net::HTTPSuccess)
-
-          response.body
-        end
-      rescue StandardError => e
-        raise "Flyimg request failed: #{e.message}"
-      end
-
-      def translate_quality_to_flyimg(quality)
-        quality
+      # Thin wrapper kept for test compatibility.
+      def translate_flyimg_position(position)
+        compass_to_short(position)
       end
     end
   end

data/lib/jekyll-imgflow/providers/imagemagick.rb

@@ -7,31 +7,22 @@ require_relative "base_provider"
 module JekyllImgFlow
   module Providers
     # ImageMagick provider implementation using the standardized tag interface
-    class Imagemagick < BaseProvider
+    class Imagemagick < CliBase
       # Cache rsvg delegate check across all instances (checked once per build)
       @rsvg_available = nil
       @svg_warning_shown = false
 
       def available?
-        # Check if magick or convert CLI is available
-        _, _, status1 = Open3.capture3("which", "magick")
-        _, _, status2 = Open3.capture3("which", "convert")
-        status1.success? || status2.success?
+        cli_available?("magick", "convert")
       end
 
-      def execute(input_path, output_path)
-        return if @operations.empty?
-
+      def before_execute(input_path)
         # Warn once per build about SVG performance with ImageMagick
         warn_svg_performance if svg?(input_path) && !self.class.instance_variable_get(:@svg_warning_shown)
+      end
 
-        # Build single ImageMagick command with all operations combined
-        command = build_combined_imagemagick_command(input_path, output_path)
-        execute_command(command)
-
-        output_path
-      ensure
-        reset_operations
+      def build_commands(input_path, output_path)
+        build_combined_imagemagick_command(input_path, output_path)
       end
 
       def build_combined_imagemagick_command(input_path, output_path)
@@ -47,85 +38,7 @@ module JekyllImgFlow
                           ["magick", input_path.shellescape]
                         end
 
-        # Add all operations
-        @operations.each do |operation|
-          case operation[:type]
-          when :resize
-            # Tags now provide complete calculated values
-            command_parts << "-resize" << if operation[:height]
-                                            "#{operation[:width]}x#{operation[:height]}!"
-                                          else
-                                            operation[:width].to_s
-                                          end
-
-          when :crop
-            opts = operation[:options]
-            params = operation[:params] || {}
-
-            # Check for keep parameter (ImageMagick doesn't support smartcrop, but we handle it gracefully)
-            keep = opts[:keep] || params[:keep] || params[:position]
-
-            if operation[:ratio] && keep && SMARTCROP_POSITIONS.include?(keep.to_s)
-              # ImageMagick doesn't support smartcrop, but we handle the keep parameter
-              # Use center gravity as a reasonable fallback for smartcrop requests
-              crop_width = opts[:calculated_width]
-              crop_height = opts[:calculated_height]
-              crop_x = opts[:calculated_x]
-              crop_y = opts[:calculated_y]
-
-              # Use gravity center for smartcrop-like behavior
-              crop_spec = "#{crop_width}x#{crop_height}+#{crop_x}+#{crop_y}"
-              command_parts << "-gravity" << "center"
-            else
-              # Use basic cropping
-              if operation[:ratio]
-                crop_x = opts[:calculated_x]
-                crop_y = opts[:calculated_y]
-                crop_width = opts[:calculated_width]
-                crop_height = opts[:calculated_height]
-              else
-                crop_x = opts[:x]
-                crop_y = opts[:y]
-                crop_width = opts[:width]
-                crop_height = opts[:height]
-              end
-              crop_spec = "#{crop_width}x#{crop_height}+#{crop_x}+#{crop_y}"
-            end
-            command_parts << "-crop" << crop_spec
-
-          when :quality
-            magick_quality = translate_quality_to_imagemagick(operation[:quality])
-            command_parts << "-quality" << magick_quality.to_s
-
-          when :format
-            # Assume validated input from tags
-            # Format is handled by output filename extension
-            # Quality is set separately if needed
-            unless @operations.any? { |op| op[:type] == :quality }
-              default_quality = @config&.quality || raise("No quality configured")
-              command_parts << "-quality" << default_quality.to_s
-            end
-
-          when :watermark
-            watermark_path = operation[:watermark_path]
-            position = operation[:options][:position]
-
-            # Translate compass directions to ImageMagick gravity format
-            gravity = translate_position(position)
-
-            # Add watermark as composite operation
-            command_parts << watermark_path.shellescape
-            command_parts << "-gravity" << gravity
-            command_parts << "-composite"
-
-          when :alpha_opacity
-            opacity = operation[:opacity]
-            alpha_value = (opacity * 100).round
-            command_parts << "-alpha" << "set"
-            command_parts << "-channel" << "A"
-            command_parts << "-evaluate" << "multiply" << "#{alpha_value}%"
-          end
-        end
+        @operations.each { |operation| append_imagemagick_operation(operation, command_parts) }
 
         # Add output filename
         command_parts << output_path.shellescape
@@ -146,9 +59,56 @@ module JekyllImgFlow
 
       private
 
-      def translate_quality_to_imagemagick(quality)
-        # ImageMagick uses 1-100 directly, no translation needed
-        quality
+      def append_imagemagick_operation(operation, command_parts)
+        case operation[:type]
+        when :resize
+          command_parts << "-resize" << if operation[:height]
+                                          "#{operation[:width]}x#{operation[:height]}!"
+                                        else
+                                          operation[:width].to_s
+                                        end
+        when :crop
+          append_imagemagick_crop(operation, command_parts)
+        when :quality
+          command_parts << "-quality" << operation[:quality].to_s
+        when :format
+          # Format is handled by output filename extension.
+          # Quality is set separately if needed.
+          unless op?(:quality)
+            default_quality = @config&.quality || raise("No quality configured")
+            command_parts << "-quality" << default_quality.to_s
+          end
+        when :watermark
+          append_imagemagick_watermark(operation, command_parts)
+        when :alpha_opacity
+          alpha_value = (operation[:opacity] * 100).round
+          command_parts << "-alpha" << "set"
+          command_parts << "-channel" << "A"
+          command_parts << "-evaluate" << "multiply" << "#{alpha_value}%"
+        end
+      end
+
+      def append_imagemagick_crop(operation, command_parts)
+        geo = crop_geometry(operation)
+
+        if geo[:smartcrop]
+          # ImageMagick doesn't support smartcrop, but we handle the keep parameter
+          # Use center gravity as a reasonable fallback for smartcrop requests
+          command_parts << "-gravity" << "center"
+        end
+
+        crop_spec = "#{geo[:width]}x#{geo[:height]}+#{geo[:x]}+#{geo[:y]}"
+        command_parts << "-crop" << crop_spec
+      end
+
+      def append_imagemagick_watermark(operation, command_parts)
+        parts = watermark_parts(operation)
+        gravity = translate_position(parts[:position])
+
+        # Add watermark as composite operation
+        command_parts << parts[:watermark_path].shellescape
+        command_parts << "-gravity" << gravity
+        command_parts << "-composite"
       end
 
       # Choose a rasterization density (DPI) for SVG input.