imgproxy 2.0.1 → 3.0.0

data/lib/imgproxy/options_casters/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Imgproxy
   module OptionsCasters
     # Casts array option
@@ -5,7 +7,7 @@ module Imgproxy
       def self.cast(raw)
         return if raw.nil?
 
-        raw.is_a?(Array) ? raw : [raw]
+        raw.is_a?(::Array) ? raw : [raw]
       end
     end
   end

data/lib/imgproxy/options_casters/autoquality.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/string"
+require "imgproxy/options_casters/integer"
+require "imgproxy/options_casters/float"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `autoquality` processing option
+    module Autoquality
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        method: Imgproxy::OptionsCasters::String,
+        target: Imgproxy::OptionsCasters::Float,
+        min_quality: Imgproxy::OptionsCasters::Integer,
+        max_quality: Imgproxy::OptionsCasters::Integer,
+        allowed_error: Imgproxy::OptionsCasters::Float,
+      ).freeze
+
+      def self.cast(raw)
+        return raw unless raw.is_a?(Hash)
+
+        values = CASTER.cast(raw)
+        (values[0] == "none") ? "none" : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/average.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/bool"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `average` info option
+    module Average
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        average: Imgproxy::OptionsCasters::Bool,
+        ignore_transparent: Imgproxy::OptionsCasters::Bool,
+      ).freeze
+
+      def self.cast(raw)
+        # Allow average to be just a boolean
+        return Imgproxy::OptionsCasters::Bool.cast(raw) if [true, false].include?(raw)
+
+        return raw unless raw.is_a?(Hash)
+        return if raw[:average].nil?
+
+        values = CASTER.cast(raw)
+        values[0].zero? ? 0 : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/background.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/integer"
+require "imgproxy/options_casters/string"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `background` info option
+    module Background
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        r: Imgproxy::OptionsCasters::Integer,
+        g: Imgproxy::OptionsCasters::Integer,
+        b: Imgproxy::OptionsCasters::Integer,
+      ).freeze
+
+      def self.cast(raw)
+        return raw.map { |v| Imgproxy::OptionsCasters::Integer.cast(v) } if raw.is_a?(::Array)
+
+        return raw unless raw.is_a?(Hash)
+        return Imgproxy::OptionsCasters::String.cast(raw[:hex_color]) if raw.key?(:hex_color)
+
+        CASTER.cast(raw)
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/base64.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "base64"
 
 module Imgproxy

data/lib/imgproxy/options_casters/blur_detections.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "imgproxy/trim_array"
+require "imgproxy/options_casters/float"
+require "imgproxy/options_casters/array"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `blur_detections` processing option
+    module BlurDetections
+      using TrimArray
+
+      def self.cast(raw)
+        # Allow blur_detections to be just a numeric
+        return Imgproxy::OptionsCasters::Float.cast(raw) if raw.is_a?(Numeric)
+
+        return raw unless raw.is_a?(Hash)
+        return unless raw[:sigma]
+
+        values = [
+          Imgproxy::OptionsCasters::Float.cast(raw[:sigma]),
+          *Imgproxy::OptionsCasters::Array.cast(raw[:class_names]),
+        ].trim!
+        values[0].zero? ? 0 : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/blurhash.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/integer"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `blurhash` info option
+    module Blurhash
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        x_components: Imgproxy::OptionsCasters::Integer,
+        y_components: Imgproxy::OptionsCasters::Integer,
+      ).freeze
+
+      def self.cast(raw)
+        return raw unless raw.is_a?(Hash)
+        CASTER.cast(raw)
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/bool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Imgproxy
   module OptionsCasters
     # Casts boolean option
@@ -5,7 +7,7 @@ module Imgproxy
       def self.cast(raw)
         return if raw.nil?
 
-        raw && raw != 0 && raw != "0" ? 1 : 0
+        (raw && raw != 0 && raw != "0") ? 1 : 0
       end
     end
   end

data/lib/imgproxy/options_casters/crop.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "imgproxy/trim_array"
 require "imgproxy/options_casters/float"
 require "imgproxy/options_casters/gravity"
 
 module Imgproxy
   module OptionsCasters
-    # Casts crop option
+    # Casts `crop` processing/info option
     module Crop
       using TrimArray
 

data/lib/imgproxy/options_casters/dominant_colors.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/bool"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `dominant_colors` info option
+    module DominantColors
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        dominant_colors: Imgproxy::OptionsCasters::Bool,
+        build_missed: Imgproxy::OptionsCasters::Bool,
+      ).freeze
+
+      def self.cast(raw)
+        # Allow dominant_colors to be just a boolean
+        return Imgproxy::OptionsCasters::Bool.cast(raw) if [true, false].include?(raw)
+
+        return raw unless raw.is_a?(Hash)
+        return if raw[:dominant_colors].nil?
+
+        values = CASTER.cast(raw)
+        values[0].zero? ? 0 : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/draw_detections.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "imgproxy/trim_array"
+require "imgproxy/options_casters/bool"
+require "imgproxy/options_casters/array"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `draw_detections` processing option
+    module DrawDetections
+      using TrimArray
+
+      def self.cast(raw)
+        # Allow draw_detections to be just a boolean
+        return Imgproxy::OptionsCasters::Bool.cast(raw) if [true, false].include?(raw)
+
+        return raw unless raw.is_a?(Hash)
+        return unless raw[:draw]
+
+        values = [
+          Imgproxy::OptionsCasters::Bool.cast(raw[:draw]),
+          *Imgproxy::OptionsCasters::Array.cast(raw[:class_names]),
+        ].trim!
+        values[0].zero? ? 0 : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/extend.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "imgproxy/options_casters/group"
 require "imgproxy/options_casters/bool"
 require "imgproxy/options_casters/gravity"
 
 module Imgproxy
   module OptionsCasters
-    # Casts extend option
+    # Casts `extend` processing option
     module Extend
       CASTER = Imgproxy::OptionsCasters::Group.new(
         extend: Imgproxy::OptionsCasters::Bool,

data/lib/imgproxy/options_casters/filename.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/string"
+require "imgproxy/options_casters/bool"
+require "imgproxy/options_casters/base64"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `filename` processing option
+    module Filename
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        filename: Imgproxy::OptionsCasters::String,
+        encoded: Imgproxy::OptionsCasters::Bool,
+      ).freeze
+
+      def self.cast(raw)
+        return raw unless raw.is_a?(Hash)
+        return if raw[:filename].nil?
+
+        encoded = Imgproxy::OptionsCasters::Bool.cast(raw[:encoded])
+
+        if encoded.nil? || encoded.zero?
+          return Imgproxy::OptionsCasters::String.cast(raw[:filename])
+        end
+
+        [Imgproxy::OptionsCasters::Base64.cast(raw[:filename]), 1]
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/float.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Imgproxy
   module OptionsCasters
     # Casts float option
@@ -5,10 +7,10 @@ module Imgproxy
       ZERO_RE = /\.0+/.freeze
 
       def self.cast(raw)
-        raw&.to_f&.yield_self do |f|
+        raw&.to_f&.then do |f|
           # Convert integral value to Integer so to_s won't give us trailing zero
           i = f.to_i
-          i == f ? i : f
+          (i == f) ? i : f
         end
       end
     end

data/lib/imgproxy/options_casters/format_quality.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/integer"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `format_quality` info option
+    module FormatQuality
+      def self.cast(raw)
+        return raw unless raw.is_a?(Hash)
+
+        raw.flat_map do |format, quality|
+          next if quality.nil?
+          [format.to_s, Imgproxy::OptionsCasters::Integer.cast(quality)]
+        end.compact
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/gradient.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/float"
+require "imgproxy/options_casters/string"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `gradient` processing option
+    module Gradient
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        opacity: Imgproxy::OptionsCasters::Float,
+        color: Imgproxy::OptionsCasters::String,
+        direction: Imgproxy::OptionsCasters::String,
+        start: Imgproxy::OptionsCasters::Float,
+        stop: Imgproxy::OptionsCasters::Float,
+      ).freeze
+
+      def self.cast(raw)
+        # Allow gradient to be just a numeric
+        return Imgproxy::OptionsCasters::Float.cast(raw) if raw.is_a?(Numeric)
+
+        return raw unless raw.is_a?(Hash)
+        return if raw[:opacity].nil?
+
+        values = CASTER.cast(raw)
+        values[0].zero? ? 0 : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/gravity.rb

@@ -1,22 +1,36 @@
-require "imgproxy/options_casters/group"
+# frozen_string_literal: true
+
+require "imgproxy/trim_array"
 require "imgproxy/options_casters/string"
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/array"
 require "imgproxy/options_casters/float"
 
 module Imgproxy
   module OptionsCasters
-    # Casts gravity option
+    # Casts `gravity` processing option
     module Gravity
-      CASTER = Imgproxy::OptionsCasters::Group.new(
-        type: Imgproxy::OptionsCasters::String,
+      using TrimArray
+
+      CLASS_NAMES_CASTER = Imgproxy::OptionsCasters::Group.new(
+        class_names: Imgproxy::OptionsCasters::Array,
+      )
+      OFFSETS_CASTER = Imgproxy::OptionsCasters::Group.new(
         x_offset: Imgproxy::OptionsCasters::Float,
         y_offset: Imgproxy::OptionsCasters::Float,
-      ).freeze
+      )
 
       def self.cast(raw)
         return raw unless raw.is_a?(Hash)
         return unless raw[:type]
 
-        CASTER.cast(raw)
+        type = Imgproxy::OptionsCasters::String.cast(raw[:type])
+
+        case type
+        when "sm" then type
+        when "obj" then [type, *CLASS_NAMES_CASTER.cast(raw)].trim!
+        else [type, *OFFSETS_CASTER.cast(raw)].trim!
+        end
       end
     end
   end

data/lib/imgproxy/options_casters/group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "imgproxy/trim_array"
 
 module Imgproxy

data/lib/imgproxy/options_casters/hashsum.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/string"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `hashsum` info option
+    module Hashsum
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        hashsum_type: Imgproxy::OptionsCasters::String,
+        hashsum: Imgproxy::OptionsCasters::String,
+      ).freeze
+
+      def self.cast(raw)
+        return raw unless raw.is_a?(Hash)
+        return if raw[:hashsum_type].nil?
+
+        values = CASTER.cast(raw)
+        (values[0] == "none") ? "none" : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Imgproxy
   module OptionsCasters
     # Casts integer option

data/lib/imgproxy/options_casters/jpeg_options.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "imgproxy/options_casters/group"
 require "imgproxy/options_casters/bool"
 require "imgproxy/options_casters/integer"
 
 module Imgproxy
   module OptionsCasters
-    # Casts jpeg_options option
+    # Casts `jpeg_options` processing option
     module JpegOptions
       CASTER = Imgproxy::OptionsCasters::Group.new(
         progressive: Imgproxy::OptionsCasters::Bool,

data/lib/imgproxy/options_casters/padding.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/integer"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `padding` info option
+    module Padding
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        top: Imgproxy::OptionsCasters::Integer,
+        right: Imgproxy::OptionsCasters::Integer,
+        bottom: Imgproxy::OptionsCasters::Integer,
+        left: Imgproxy::OptionsCasters::Integer,
+      ).freeze
+
+      def self.cast(raw)
+        # Allow padding to be just a number
+        return Imgproxy::OptionsCasters::Integer.cast(raw) if raw.is_a?(Numeric)
+
+        return raw.map { |v| Imgproxy::OptionsCasters::Integer.cast(v) } if raw.is_a?(::Array)
+
+        return raw unless raw.is_a?(Hash)
+
+        compact CASTER.cast(raw)
+      end
+
+      def self.compact(values)
+        if values[0] == values[1] && values[0] == values[2] && values[0] == values[3]
+          return values[0]
+        end
+
+        return values[0, 2] if values[0] == values[2] && values[1] == values[3]
+
+        return values[0, 3] if values[1] == values[3]
+
+        values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/png_options.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "imgproxy/options_casters/group"
 require "imgproxy/options_casters/bool"
 require "imgproxy/options_casters/integer"
 
 module Imgproxy
   module OptionsCasters
-    # Casts png_options option
+    # Casts `png_options` processing option
     module PngOptions
       CASTER = Imgproxy::OptionsCasters::Group.new(
         interlaced: Imgproxy::OptionsCasters::Bool,

data/lib/imgproxy/options_casters/resize.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "imgproxy/trim_array"
 require "imgproxy/options_casters/string"
 require "imgproxy/options_casters/size"
 
 module Imgproxy
   module OptionsCasters
-    # Casts resize option
+    # Casts `resize` processing option
     module Resize
       using TrimArray
 

data/lib/imgproxy/options_casters/size.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "imgproxy/trim_array"
 require "imgproxy/options_casters/integer"
 require "imgproxy/options_casters/bool"
@@ -5,7 +7,7 @@ require "imgproxy/options_casters/extend"
 
 module Imgproxy
   module OptionsCasters
-    # Casts size option
+    # Casts `size` processing option
     module Size
       using TrimArray
 

data/lib/imgproxy/options_casters/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Imgproxy
   module OptionsCasters
     # Casts string option

data/lib/imgproxy/options_casters/trim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "imgproxy/options_casters/group"
 require "imgproxy/options_casters/float"
 require "imgproxy/options_casters/string"
@@ -5,7 +7,7 @@ require "imgproxy/options_casters/bool"
 
 module Imgproxy
   module OptionsCasters
-    # Casts trim option
+    # Casts `trim` processing option
     module Trim
       CASTER = Imgproxy::OptionsCasters::Group.new(
         threshold: Imgproxy::OptionsCasters::Float,

data/lib/imgproxy/options_casters/unsharp_masking.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/string"
+require "imgproxy/options_casters/float"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `unsharp_masking` info option
+    module UnsharpMasking
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        mode: Imgproxy::OptionsCasters::String,
+        weight: Imgproxy::OptionsCasters::Float,
+        divider: Imgproxy::OptionsCasters::Float,
+      ).freeze
+
+      def self.cast(raw)
+        return raw unless raw.is_a?(Hash)
+
+        values = CASTER.cast(raw)
+        (values[0] == "none") ? "none" : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/video_thumbnail_tile.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "imgproxy/options_casters/group"
+require "imgproxy/options_casters/float"
+require "imgproxy/options_casters/integer"
+require "imgproxy/options_casters/bool"
+
+module Imgproxy
+  module OptionsCasters
+    # Casts `video_thumbnail_tile` processing option
+    module VideoThumbnailTile
+      CASTER = Imgproxy::OptionsCasters::Group.new(
+        step: Imgproxy::OptionsCasters::Float,
+        columns: Imgproxy::OptionsCasters::Integer,
+        rows: Imgproxy::OptionsCasters::Integer,
+        tile_width: Imgproxy::OptionsCasters::Integer,
+        tile_height: Imgproxy::OptionsCasters::Integer,
+        extend_tile: Imgproxy::OptionsCasters::Bool,
+        trim: Imgproxy::OptionsCasters::Bool,
+      ).freeze
+
+      def self.cast(raw)
+        # Allow video_thumbnail_tile to be just a zero
+        return 0 if raw.is_a?(Numeric) && raw.zero?
+
+        return raw unless raw.is_a?(Hash)
+        return unless raw[:step]
+
+        values = CASTER.cast(raw)
+        values[0].zero? ? 0 : values
+      end
+    end
+  end
+end

data/lib/imgproxy/options_casters/watermark.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 require "imgproxy/options_casters/group"
 require "imgproxy/options_casters/float"
 require "imgproxy/options_casters/string"
-require "imgproxy/options_casters/integer"
 
 module Imgproxy
   module OptionsCasters
-    # Casts string option
+    # Casts `watermark` processing option
     module Watermark
       CASTER = Imgproxy::OptionsCasters::Group.new(
         opacity: Imgproxy::OptionsCasters::Float,
         position: Imgproxy::OptionsCasters::String,
-        x_offset: Imgproxy::OptionsCasters::Integer,
-        y_offset: Imgproxy::OptionsCasters::Integer,
+        x_offset: Imgproxy::OptionsCasters::Float,
+        y_offset: Imgproxy::OptionsCasters::Float,
         scale: Imgproxy::OptionsCasters::Float,
       ).freeze