imgproxy 2.1.0 → 3.0.0

data/logo/logo-light.svg

@@ -0,0 +1,31 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="266" height="100" fill="none">
+  <g clip-path="url(#a)">
+    <path fill="#000" d="M94.056 42.55v2.915h5.803v11.648h-5.803v2.915h14.733v-2.915h-5.69V42.549h-9.043Zm4.916-4.367c0 1.423.83 2.423 2.451 2.423 1.619 0 2.45-1 2.45-2.423 0-1.422-.831-2.422-2.45-2.422-1.62 0-2.451 1-2.451 2.422Zm14.479 4.366v17.465h3.239V48.746c0-2.507.859-3.633 2.775-3.633 1.915 0 2.774 1.14 2.774 3.633v11.268h3.24V48.746c0-2.535.859-3.633 2.775-3.633 1.915 0 2.774 1.112 2.774 3.633v11.268h3.24V47.845c0-3.465-2.099-5.76-5.24-5.76-1.648 0-3.155.732-4.014 1.915h-.591c-.86-1.225-2.155-1.916-3.747-1.916-1.648 0-2.887.578-3.563 1.634h-.409V42.55h-3.253Zm42.704 16.902V42.549h-3.24v1.578h-.887c-.831-1.226-2.676-2.043-4.662-2.043-4.662 0-7.774 3.437-7.774 8.62 0 5.099 3.126 8.507 7.774 8.507 1.916 0 3.775-.76 4.662-1.915h.887v1.859c0 2.676-1.887 4.253-5.07 4.253-2.535 0-4.422-1.042-5.07-2.788h-3.183c.183 3.436 3.478 5.704 8.253 5.704 5.155-.014 8.31-2.746 8.31-6.873Zm-13.324-8.747c0-3.465 1.944-5.591 5.127-5.591s5.127 2.126 5.127 5.591c0 3.465-1.944 5.592-5.127 5.592s-5.127-2.127-5.127-5.592Zm28.648-8.62c-2.127 0-4.071.874-4.887 2.212h-.888v-1.747h-3.239v23.296h3.239v-7.577h.888c.816 1.338 2.774 2.21 4.887 2.21 4.775 0 7.958-3.675 7.958-9.196s-3.183-9.197-7.958-9.197Zm-5.887 9.212c0-3.817 2-6.17 5.309-6.17 3.296 0 5.31 2.353 5.31 6.17 0 3.817-2 6.169-5.31 6.169-3.309 0-5.309-2.366-5.309-6.17Zm18.845-8.747v2.916h4.14v11.648h-4.14v2.915h13.746v-2.915h-6.366v-6.409c0-3.704 1.155-5.591 3.422-5.591 1.831 0 2.775 1.07 2.775 3.14v2.057h3.352v-2.521c0-3.55-1.915-5.705-5.07-5.705-1.676 0-3.071.634-3.831 1.803h-.888V42.55h-7.14Zm30.042 17.944c5.211 0 8.69-3.676 8.69-9.197 0-5.521-3.479-9.197-8.69-9.197-5.211 0-8.69 3.676-8.69 9.197 0 5.52 3.465 9.197 8.69 9.197Zm-5.451-9.197c0-3.817 2.071-6.17 5.451-6.17 3.394 0 5.451 2.353 5.451 6.17 0 3.817-2.057 6.169-5.451 6.169-3.394 0-5.451-2.366-5.451-6.17ZM227 60.028h3.718l4.127-6.056.324-.845h.296l.324.845 4.07 6.056h3.944l-5.747-8.591 6.099-8.888h-3.62l-4.62 6.705-.323.845h-.296l-.324-.845-4.423-6.705h-3.887l6.042 9.17-5.704 8.31Zm20.69-17.479 6.338 16.014h2.648l-1.056 2.972c-.535 1.31-1.057 1.86-2.028 1.86-1.057 0-1.62-.55-2.184-1.86h-2.943c.239 3.056 2.155 4.775 5.31 4.775 2.126 0 3.859-1.395 4.718-3.789l7.127-19.972h-3.296l-4.62 13.099h-1.267l-5.155-13.099h-3.592Z"/>
+    <mask id="b" width="94" height="79" x="0" y="22" maskUnits="userSpaceOnUse" style="mask-type:luminance">
+      <path fill="#fff" d="M.394 22.535h92.817v78.169H.394V22.535Z"/>
+    </mask>
+    <g mask="url(#b)">
+      <path fill="url(#c)" d="M78.493 32.732V22.535H68.31v2.831H44.535v-2.83H34.352v2.83H10.577v-2.83H.394v10.196h2.831v12.465H.395v10.197h2.83V67.86H.395v10.197h10.182v-2.845h23.775v2.831h10.183v-2.83H68.31v2.83h10.183V67.845h-2.831V55.38h2.83V45.183h-2.83V32.718h2.83v.014Zm-41.873-7.93h5.662v5.663H36.62v-5.662ZM2.662 30.466v-5.662h5.662v5.662H2.662Zm0 22.662v-5.662h5.662v5.662H2.662Zm5.662 22.648H2.662v-5.662h5.662v5.662Zm33.958 0H36.62v-5.662h5.662v5.662Zm26.028-5.099H44.535v-2.83H34.352v2.83H10.577v-2.83h-2.83V55.38h2.83V45.183h-2.83V32.718h2.83v-2.83h23.775v2.83h10.183v-2.83H68.31v2.83h2.83v12.465h-2.83V55.38h2.83v12.465h-2.83v2.831Zm7.93-.563v5.662h-5.663v-5.662h5.662Zm0-22.648v5.662h-5.663v-5.662h5.662Zm-5.663-17v-5.662h5.662v5.662h-5.662Z"/>
+      <path fill="#1960C4" d="M22.55 45.192v.864h.592a1.98 1.98 0 0 1 .8-.848 2.36 2.36 0 0 1 1.2-.304c.778 0 1.37.293 1.776.88.405.587.608 1.445.608 2.576v1.552h-2.544V48.68c0-.459-.086-.8-.256-1.024-.17-.235-.432-.352-.784-.352-.438 0-.763.197-.976.592-.203.395-.304.997-.304 1.808v3.072h2.8V55h-6.88v-2.224h1.664v-5.36h-1.872v-2.224h4.176ZM35.545 55v-9.808h2.496V55h-2.496Zm-3.44-4.192c0 .715.144 1.253.432 1.616.288.363.715.544 1.28.544.576 0 1.008-.181 1.296-.544.288-.363.432-.901.432-1.616h.368v3.312h-.96a2.293 2.293 0 0 1-.896.88c-.384.203-.827.304-1.328.304-.65 0-1.21-.155-1.68-.464-.459-.31-.816-.752-1.072-1.328-.245-.587-.368-1.28-.368-2.08v-6.24h2.496v5.616Zm14.019 4.448c-.49 0-.933-.107-1.328-.32a2.085 2.085 0 0 1-.88-.864h-.592V55h-2.496V41.432h2.496v4.672h.592c.192-.352.485-.635.88-.848.395-.213.837-.32 1.328-.32.79 0 1.477.213 2.064.64.597.416 1.056 1.013 1.376 1.792.32.768.48 1.68.48 2.736 0 1.045-.16 1.957-.48 2.736-.32.768-.779 1.365-1.376 1.792-.587.416-1.275.624-2.064.624Zm-2.944-5.168c0 .928.192 1.653.576 2.176.395.512.944.768 1.648.768s1.248-.256 1.632-.768c.395-.523.592-1.248.592-2.176 0-.928-.197-1.648-.592-2.16-.384-.512-.928-.768-1.632-.768-.704 0-1.253.261-1.648.784-.384.512-.576 1.227-.576 2.144Zm10.835-4.896 2.256 7.072h1.376L57.12 54.2h-2.704l-2.96-9.008h2.56Zm4.144 10.864c-.245.8-.624 1.408-1.136 1.824-.501.416-1.125.624-1.872.624-.928 0-1.659-.256-2.192-.768-.523-.512-.832-1.259-.928-2.24h2.192c.117.32.245.544.384.672a.715.715 0 0 0 .528.208.623.623 0 0 0 .496-.224c.139-.139.261-.373.368-.704l2.848-10.256h2.368L58.16 56.056Z"/>
+      <path fill="url(#d)" fill-rule="evenodd" d="M81.437 91.746h10.957L73.606 72.945l7.83 18.802Z" clip-rule="evenodd"/>
+      <path fill="url(#e)" fill-rule="evenodd" d="M73.606 72.944v26.62l7.817-7.832" clip-rule="evenodd"/>
+    </g>
+  </g>
+  <defs>
+    <linearGradient id="c" x1="39.445" x2="39.445" y1="78.046" y2="22.535" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#1D40B2"/>
+      <stop offset="1" stop-color="#1680D6"/>
+    </linearGradient>
+    <linearGradient id="d" x1="76.587" x2="89.416" y1="84.063" y2="80.629" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#1C1C1C"/>
+      <stop offset="1" stop-color="#3D3E3F"/>
+    </linearGradient>
+    <linearGradient id="e" x1="70.287" x2="79.541" y1="87.15" y2="84.673" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#1C1C1C"/>
+      <stop offset="1" stop-color="#3D3E3F"/>
+    </linearGradient>
+    <clipPath id="a">
+      <path fill="#fff" d="M0 0h266v100H0z"/>
+    </clipPath>
+  </defs>
+</svg>

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: imgproxy
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
-- Sergey Alexandrovich
+- Sergei Aleksandrovich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: benchmark-memory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: shrine
   requirement: !ruby/object:Gem::Requirement
@@ -170,57 +170,95 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
 description: A gem that easily generates imgproxy URLs for your images
 email: darthsim@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- CHANGELOG.md
 - LICENSE
 - README.md
+- UPGRADE.md
+- docs/info_options.md
+- docs/processing_options.md
+- docs/yard/fix_pictures.rb
+- docs/yard/github_alerts.rb
+- docs/yard/relative_markdown_links.rb
 - lib/imgproxy.rb
-- lib/imgproxy/builder.rb
 - lib/imgproxy/config.rb
 - lib/imgproxy/extensions/active_storage.rb
 - lib/imgproxy/extensions/shrine.rb
-- lib/imgproxy/options.rb
-- lib/imgproxy/options_aliases.rb
+- lib/imgproxy/option_aliases/info.rb
+- lib/imgproxy/option_aliases/processing.rb
+- lib/imgproxy/options_builders/base.rb
+- lib/imgproxy/options_builders/info.rb
+- lib/imgproxy/options_builders/processing.rb
 - lib/imgproxy/options_casters/adjust.rb
+- lib/imgproxy/options_casters/alpha.rb
 - lib/imgproxy/options_casters/array.rb
+- lib/imgproxy/options_casters/autoquality.rb
+- lib/imgproxy/options_casters/average.rb
+- lib/imgproxy/options_casters/background.rb
 - lib/imgproxy/options_casters/base64.rb
+- lib/imgproxy/options_casters/blur_detections.rb
+- lib/imgproxy/options_casters/blurhash.rb
 - lib/imgproxy/options_casters/bool.rb
 - lib/imgproxy/options_casters/crop.rb
+- lib/imgproxy/options_casters/dominant_colors.rb
+- lib/imgproxy/options_casters/draw_detections.rb
 - lib/imgproxy/options_casters/extend.rb
+- lib/imgproxy/options_casters/filename.rb
 - lib/imgproxy/options_casters/float.rb
-- lib/imgproxy/options_casters/gif_options.rb
+- lib/imgproxy/options_casters/format_quality.rb
+- lib/imgproxy/options_casters/gradient.rb
 - lib/imgproxy/options_casters/gravity.rb
 - lib/imgproxy/options_casters/group.rb
+- lib/imgproxy/options_casters/hashsum.rb
 - lib/imgproxy/options_casters/integer.rb
 - lib/imgproxy/options_casters/jpeg_options.rb
+- lib/imgproxy/options_casters/padding.rb
 - lib/imgproxy/options_casters/png_options.rb
 - lib/imgproxy/options_casters/resize.rb
 - lib/imgproxy/options_casters/size.rb
 - lib/imgproxy/options_casters/string.rb
 - lib/imgproxy/options_casters/trim.rb
+- lib/imgproxy/options_casters/unsharp_masking.rb
+- lib/imgproxy/options_casters/video_thumbnail_tile.rb
 - lib/imgproxy/options_casters/watermark.rb
+- lib/imgproxy/options_casters/watermark_size.rb
+- lib/imgproxy/options_casters/webp_options.rb
+- lib/imgproxy/options_casters/zoom.rb
+- lib/imgproxy/service_config.rb
 - lib/imgproxy/trim_array.rb
 - lib/imgproxy/url_adapters.rb
 - lib/imgproxy/url_adapters/active_storage.rb
 - lib/imgproxy/url_adapters/shrine.rb
+- lib/imgproxy/url_builders/base.rb
+- lib/imgproxy/url_builders/info.rb
+- lib/imgproxy/url_builders/processing.rb
 - lib/imgproxy/version.rb
+- logo/logo-dark.svg
+- logo/logo-light.svg
 homepage: https://github.com/imgproxy/imgproxy.rb
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
+  bug_tracker_uri: http://github.com/imgproxy/imgproxy.rb/issues
+  changelog_uri: https://github.com/imgproxy/imgproxy.rb/blob/master/CHANGELOG.md
+  documentation_uri: http://github.com/imgproxy/imgproxy.rb
+  homepage_uri: http://github.com/imgproxy/imgproxy.rb
+  source_code_uri: http://github.com/imgproxy/imgproxy.rb
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -236,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: imgproxy URL generator

data/lib/imgproxy/builder.rb

@@ -1,140 +0,0 @@
-require "openssl"
-require "base64"
-require "erb"
-
-require "imgproxy/options"
-require "imgproxy/options_aliases"
-
-module Imgproxy
-  # Builds imgproxy URL
-  #
-  #   builder = Imgproxy::Builder.new(
-  #     width: 500,
-  #     height: 400,
-  #     resizing_type: :fill,
-  #     sharpen: 0.5
-  #   )
-  #
-  #   builder.url_for("http://images.example.com/images/image1.jpg")
-  #   builder.url_for("http://images.example.com/images/image2.jpg")
-  class Builder
-    # @param [Hash] options Processing options
-    # @see Imgproxy.url_for
-    def initialize(options = {})
-      options = options.dup
-
-      extract_builder_options(options)
-
-      @options = Imgproxy::Options.new(options)
-      @format = @options.delete(:format)
-    end
-
-    # Genrates imgproxy URL
-    #
-    # @return [String] imgproxy URL
-    # @param [String,URI, Object] image Source image URL or object applicable for
-    #   the configured URL adapters
-    # @see Imgproxy.url_for
-    def url_for(image)
-      path = [*processing_options, url(image, ext: @format)].join("/")
-      signature = sign_path(path)
-
-      File.join(Imgproxy.config.endpoint.to_s, signature, path)
-    end
-
-    # Genrates imgproxy info URL
-    #
-    # @return [String] imgproxy info URL
-    # @param [String,URI, Object] image Source image URL or object applicable for
-    #   the configured URL adapters
-    # @see Imgproxy.info_url_for
-    def info_url_for(image)
-      path = url(image)
-      signature = sign_path(path)
-
-      File.join(Imgproxy.config.endpoint.to_s, "info", signature, path)
-    end
-
-    private
-
-    NEED_ESCAPE_RE = /[@?% ]|[^\p{Ascii}]/.freeze
-
-    def extract_builder_options(options)
-      @use_short_options = not_nil_or(options.delete(:use_short_options), config.use_short_options)
-      @base64_encode_url = not_nil_or(options.delete(:base64_encode_url), config.base64_encode_urls)
-      @escape_plain_url =
-        not_nil_or(options.delete(:escape_plain_url), config.always_escape_plain_urls)
-    end
-
-    def processing_options
-      @processing_options ||= @options.map do |key, value|
-        [option_alias(key), value].join(":")
-      end
-    end
-
-    def url(image, ext: nil)
-      url = config.url_adapters.url_of(image)
-
-      @base64_encode_url ? base64_url_for(url, ext: ext) : plain_url_for(url, ext: ext)
-    end
-
-    def plain_url_for(url, ext: nil)
-      escaped_url = need_escape_url?(url) ? ERB::Util.url_encode(url) : url
-
-      ext ? "plain/#{escaped_url}@#{ext}" : "plain/#{escaped_url}"
-    end
-
-    def base64_url_for(url, ext: nil)
-      encoded_url = Base64.urlsafe_encode64(url).tr("=", "").scan(/.{1,16}/).join("/")
-
-      ext ? "#{encoded_url}.#{ext}" : encoded_url
-    end
-
-    def need_escape_url?(url)
-      @escape_plain_url || url.match?(NEED_ESCAPE_RE)
-    end
-
-    def option_alias(name)
-      return name unless @use_short_options
-
-      Imgproxy::OPTIONS_ALIASES.fetch(name, name)
-    end
-
-    def sign_path(path)
-      return "unsafe" unless ready_to_sign?
-
-      digest = OpenSSL::HMAC.digest(
-        OpenSSL::Digest.new("sha256"),
-        signature_key,
-        "#{signature_salt}/#{path}",
-      )[0, signature_size]
-
-      Base64.urlsafe_encode64(digest).tr("=", "")
-    end
-
-    def ready_to_sign?
-      !(signature_key.nil? || signature_salt.nil? ||
-        signature_key.empty? || signature_salt.empty?)
-    end
-
-    def signature_key
-      config.raw_key
-    end
-
-    def signature_salt
-      config.raw_salt
-    end
-
-    def signature_size
-      config.signature_size
-    end
-
-    def config
-      Imgproxy.config
-    end
-
-    def not_nil_or(value, fallback)
-      value.nil? ? fallback : value
-    end
-  end
-end

data/lib/imgproxy/options.rb

@@ -1,119 +0,0 @@
-require "imgproxy/trim_array"
-require "imgproxy/options_casters/string"
-require "imgproxy/options_casters/integer"
-require "imgproxy/options_casters/float"
-require "imgproxy/options_casters/bool"
-require "imgproxy/options_casters/array"
-require "imgproxy/options_casters/base64"
-require "imgproxy/options_casters/resize"
-require "imgproxy/options_casters/size"
-require "imgproxy/options_casters/extend"
-require "imgproxy/options_casters/gravity"
-require "imgproxy/options_casters/crop"
-require "imgproxy/options_casters/trim"
-require "imgproxy/options_casters/adjust"
-require "imgproxy/options_casters/watermark"
-require "imgproxy/options_casters/jpeg_options"
-require "imgproxy/options_casters/png_options"
-require "imgproxy/options_casters/gif_options"
-
-module Imgproxy
-  # Formats and regroups processing options
-  class Options < Hash
-    using TrimArray
-
-    CASTERS = {
-      resize:                 Imgproxy::OptionsCasters::Resize,
-      size:                   Imgproxy::OptionsCasters::Size,
-      resizing_type:          Imgproxy::OptionsCasters::String,
-      resizing_algorithm:     Imgproxy::OptionsCasters::String,
-      width:                  Imgproxy::OptionsCasters::Integer,
-      height:                 Imgproxy::OptionsCasters::Integer,
-      dpr:                    Imgproxy::OptionsCasters::Float,
-      enlarge:                Imgproxy::OptionsCasters::Bool,
-      extend:                 Imgproxy::OptionsCasters::Extend,
-      gravity:                Imgproxy::OptionsCasters::Gravity,
-      crop:                   Imgproxy::OptionsCasters::Crop,
-      padding:                Imgproxy::OptionsCasters::Array,
-      trim:                   Imgproxy::OptionsCasters::Trim,
-      rotate:                 Imgproxy::OptionsCasters::Integer,
-      quality:                Imgproxy::OptionsCasters::Integer,
-      max_bytes:              Imgproxy::OptionsCasters::Integer,
-      background:             Imgproxy::OptionsCasters::Array,
-      background_alpha:       Imgproxy::OptionsCasters::Float,
-      adjust:                 Imgproxy::OptionsCasters::Adjust,
-      brightness:             Imgproxy::OptionsCasters::Integer,
-      contrast:               Imgproxy::OptionsCasters::Float,
-      saturation:             Imgproxy::OptionsCasters::Float,
-      blur:                   Imgproxy::OptionsCasters::Float,
-      sharpen:                Imgproxy::OptionsCasters::Float,
-      pixelate:               Imgproxy::OptionsCasters::Integer,
-      unsharpening:           Imgproxy::OptionsCasters::String,
-      watermark:              Imgproxy::OptionsCasters::Watermark,
-      watermark_url:          Imgproxy::OptionsCasters::Base64,
-      style:                  Imgproxy::OptionsCasters::Base64,
-      jpeg_options:           Imgproxy::OptionsCasters::JpegOptions,
-      png_options:            Imgproxy::OptionsCasters::PngOptions,
-      gif_options:            Imgproxy::OptionsCasters::GifOptions,
-      page:                   Imgproxy::OptionsCasters::Integer,
-      video_thumbnail_second: Imgproxy::OptionsCasters::Integer,
-      preset:                 Imgproxy::OptionsCasters::Array,
-      cachebuster:            Imgproxy::OptionsCasters::String,
-      strip_metadata:         Imgproxy::OptionsCasters::Bool,
-      strip_color_profile:    Imgproxy::OptionsCasters::Bool,
-      auto_rotate:            Imgproxy::OptionsCasters::Bool,
-      filename:               Imgproxy::OptionsCasters::String,
-      format:                 Imgproxy::OptionsCasters::String,
-      return_attachment:      Imgproxy::OptionsCasters::Bool,
-      expires:                Imgproxy::OptionsCasters::Integer,
-    }.freeze
-
-    META = %i[size resize adjust].freeze
-
-    # @param options [Hash] raw processing options
-    def initialize(options)
-      super()
-
-      # Options order hack: initialize known and meta options with nil value to preserve order
-      CASTERS.each_key { |n| self[n] = nil if options.key?(n) || META.include?(n) }
-
-      options.each do |name, value|
-        caster = CASTERS[name]
-        self[name] = caster ? caster.cast(value) : unwrap_hash(value)
-      end
-
-      group_resizing_opts
-      group_adjust_opts
-
-      compact!
-    end
-
-    private
-
-    def unwrap_hash(raw)
-      return raw unless raw.is_a?(Hash)
-
-      raw.flat_map do |_key, val|
-        unwrap_hash(val)
-      end
-    end
-
-    def group_resizing_opts
-      return unless self[:width] && self[:height] && !self[:size] && !self[:resize]
-
-      self[:size] = extract_and_trim_nils(:width, :height, :enlarge, :extend)
-      self[:resize] = [delete(:resizing_type), *delete(:size)] if self[:resizing_type]
-    end
-
-    def group_adjust_opts
-      return if self[:adjust]
-      return unless values_at(:brightness, :contrast, :saturation).count { |o| o } > 1
-
-      self[:adjust] = extract_and_trim_nils(:brightness, :contrast, :saturation)
-    end
-
-    def extract_and_trim_nils(*keys)
-      keys.map { |k| delete(k) }.trim!
-    end
-  end
-end

data/lib/imgproxy/options_aliases.rb

@@ -1,45 +0,0 @@
-module Imgproxy
-  OPTIONS_ALIASES = {
-    resize: :rs,
-    size: :s,
-    resizing_type: :rt,
-    resizing_algorithm: :ra,
-    width: :w,
-    height: :h,
-    enlarge: :el,
-    extend: :ex,
-    gravity: :g,
-    crop: :c,
-    padding: :pd,
-    trim: :t,
-    rotate: :rot,
-    quality: :q,
-    max_bytes: :mb,
-    background: :bg,
-    background_alpha: :bga,
-    adjust: :a,
-    brightness: :br,
-    contrast: :co,
-    saturation: :sa,
-    blur: :bl,
-    sharpen: :sh,
-    pixelate: :pix,
-    unsharpening: :ush,
-    watermark: :wm,
-    watermark_url: :wmu,
-    style: :st,
-    jpeg_options: :jpego,
-    png_options: :pngo,
-    gif_options: :gifo,
-    page: :pg,
-    video_thumbnail_second: :vts,
-    preset: :pr,
-    cachebuster: :cb,
-    strip_metadata: :sm,
-    strip_color_profile: :scp,
-    auto_rotate: :ar,
-    filename: :fn,
-    return_attachment: :att,
-    expires: :exp,
-  }.freeze
-end