imgproxy 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95f295a470a117f44dff275879b3c048d4c0553ccb121f448b34c9282c1bebcc
-  data.tar.gz: 90aef03fecd81f74a7e3d73fe465ef7ff4e35e8cf9fdee605aa50edefe03da9c
+  metadata.gz: 408a45b49e0ddd25815dd6a3f904a93a9df27e9d00e31dcfccab11a9cf841196
+  data.tar.gz: b43ff3e7f9c80922937729921ea1a2fc5187974298ff19f5190191ff2a2d4b95
 SHA512:
-  metadata.gz: a04dfc605cc6143e67555de585f91dbcb443f09043e55eb66dad31f20a156cb8b1a6654f44c7c9f3e5458bd3ea089287bfe361747ee27426132b3512223de648
-  data.tar.gz: 5138489ca03ddb7f1835ae670a0dda2bf4d9c234f19a524f5189e7a61b203b81401c474886f5c659d1dbc57f0e797479f538c81d3be0d51ee4a78a1fca37d336
+  metadata.gz: d92e1e4782e614a0f445766e4f1d4b6b985564e4877b1a0230b2717b337acfea7d2ff09ff12cc9cbf1ea86312a5bc7c2c382102a9651f3e390ea4cdb7fadc68b
+  data.tar.gz: 6de6077c86b0d9a83dcb3673d35b9a28a0586ec9612211d233ed8fffc935de5ee8c587311fe695c7df882a3af42b558e221ac5f081a308274ace6c102a5ddf69

data/README.md

@@ -171,10 +171,15 @@ builder.url_for("http://images.example.com/images/image2.jpg")
 * `gravity_x`, `gravity_y` — floating point numbers between 0 and 1 that define the coordinates of the center of the resulting image when `fp` gravity is used.
 * `quality` — defines the quality of the resulting image, percentage.
 * `background` — when set, imgproxy will fill the resulting image background with the specified color. Can be a hex-color string or an array of red, green and blue values (0-255).
+* `brightness` — when set, imgproxy will adjust brightness of the resulting image. _Supported only by imgproxy pro._
+* `contrast` — when set, imgproxy will adjust contrast of the resulting image. _Supported only by imgproxy pro._
+* `saturation` — when set, imgproxy will adjust saturation of the resulting image. _Supported only by imgproxy pro._
 * `blur` — when set, imgproxy will apply the gaussian blur filter to the resulting image. Value is the size of a mask imgproxy will use.
 * `sharpen` — when set, imgproxy will apply the sharpen filter to the resulting image. Value is the size of a mask imgproxy will use.
+* `pixelate` — when set, imgproxy will apply the pixelate filter to the resulting image. Value is the size of a pixel. _Supported only by imgproxy pro._
 * `watermark_opacity` — when set, imgproxy will put a watermark on the resulting image. See [watermars guide](https://github.comimgproxym/imgproxy/blob/master/docs/watermark.md) for more info.
 * `watermark_position`, `watermark_x_offset`, `watermark_y_offset`, `watermark_scale` — additional watermark options described in the [watermars guide](https://github.com/imgproxy/imgproxy/blob/master/docs/watermark.md).
+* `style` - when set, imgproxy will prepend `<style>` node with provided content to the `<svg>` node of source SVG image. _Supported only by imgproxy pro._
 * `preset` — array of names of presets that will be used by imgproxy. See [presets guide](https://github.com/imgproxy/imgproxy/blob/master/docs/presets.md) for more info.
 * `cachebuster` — defines cache buster that doesn't affect image processing but it's changing allows to bypass CDN, proxy server and browser cache.
 * `format` — specifies the resulting image format (`jpg`, `png`, `webp`).

data/lib/imgproxy.rb

@@ -45,6 +45,11 @@ module Imgproxy
     # @param [String,URI, Object] image Source image URL or object applicable for
     #   the configured URL adapters
     # @param [Hash] options Processing options
+    # @option options [Integer] :crop_width
+    # @option options [Integer] :crop_height
+    # @option options [String] :crop_gravity
+    # @option options [Float] :crop_gravity_x
+    # @option options [Float] :crop_gravity_y
     # @option options [String] :resizing_type
     # @option options [Integer] :width
     # @option options [Integer] :height
@@ -56,13 +61,18 @@ module Imgproxy
     # @option options [Float] :gravity_y
     # @option options [Integer] :quality
     # @option options [Array] :background
+    # @option options [Integer] :brightness supported only by imgproxy pro
+    # @option options [Float] :contrast supported only by imgproxy pro
+    # @option options [Float] :saturation supported only by imgproxy pro
     # @option options [Float] :blur
     # @option options [Float] :sharpen
+    # @option options [Integer] :pixelate supported only by imgproxy pro
     # @option options [Float] :watermark_opacity
     # @option options [String] :watermark_position
     # @option options [Integer] :watermark_x_offset
     # @option options [Integer] :watermark_y_offset
     # @option options [Float] :watermark_scale
+    # @option options [String] :style supported only by imgproxy pro
     # @option options [Array] :preset
     # @option options [String] :cachebuster
     # @option options [String] :format

data/lib/imgproxy/builder.rb

@@ -46,6 +46,7 @@ module Imgproxy
     private
 
     OPTIONS_ALIASES = {
+      crop: :c,
       resize: :rs,
       size: :s,
       resizing_type: :rt,
@@ -56,9 +57,15 @@ module Imgproxy
       gravity: :g,
       quality: :q,
       background: :bg,
+      adjust: :a,
+      brightness: :br,
+      contrast: :co,
+      saturation: :sa,
       blur: :bl,
       sharpen: :sh,
+      pixelate: :pix,
       watermark: :wm,
+      watermark_url: :wmu,
       preset: :pr,
       cachebuster: :cb,
     }.freeze

data/lib/imgproxy/options.rb

@@ -1,15 +1,19 @@
 module Imgproxy
   # Formats and regroups processing options
   class Options < Hash
-    STRING_OPTS = %i[resizing_type gravity watermark_position style cachebuster format].freeze
-    INT_OPTS = %i[width height quality watermark_x_offset watermark_y_offset].freeze
-    FLOAT_OPTS = %i[dpr gravity_x gravity_y blur sharpen watermark_opacity watermark_scale].freeze
+    STRING_OPTS = %i[resizing_type gravity crop_gravity watermark_position watermark_url style
+                     cachebuster format].freeze
+    INT_OPTS = %i[width height crop_width crop_height
+                  quality brightness pixelate watermark_x_offset watermark_y_offset].freeze
+    FLOAT_OPTS = %i[dpr gravity_x gravity_y crop_gravity_x crop_gravity_y contrast saturation
+                    blur sharpen watermark_opacity watermark_scale].freeze
     BOOL_OPTS = %i[enlarge extend].freeze
     ARRAY_OPTS = %i[background preset].freeze
     ALL_OPTS = (STRING_OPTS + INT_OPTS + FLOAT_OPTS + BOOL_OPTS + ARRAY_OPTS).freeze
 
-    OPTS_PRIORITY = %i[ resize size resizing_type width height dpr enlarge extend gravity quality
-                        background blur sharpen watermark preset cachebuster ].freeze
+    OPTS_PRIORITY = %i[ crop resize size resizing_type width height dpr enlarge extend gravity
+                        quality background blur sharpen pixelate watermark watermark_url preset
+                        cachebuster ].freeze
 
     # @param options [Hash] raw processing options
     def initialize(options)
@@ -17,11 +21,10 @@ module Imgproxy
 
       typecast
 
-      group_resizing_opts
-      group_gravity_opts
-      group_watermark_opts
+      group_options
 
       encode_style
+      encode_watermark_url
 
       replace(Hash[sort_by { |k, _| OPTS_PRIORITY.index(k) || 99 }])
 
@@ -51,37 +54,53 @@ module Imgproxy
       value.is_a?(Array) ? value : [value]
     end
 
+    def group_options
+      group_crop_opts
+      group_resizing_opts
+      group_gravity_opts
+      group_adjust_opts
+      group_watermark_opts
+    end
+
+    def group_crop_opts
+      crop_width = delete(:crop_width)
+      crop_height = delete(:crop_height)
+      crop_gravity = extract_and_trim_nils(:crop_gravity, :crop_gravity_x, :crop_gravity_y)
+
+      return unless crop_width || crop_height
+
+      crop_gravity = nil if crop_gravity[0].nil?
+
+      self[:crop] = [crop_width || 0, crop_height || 0, *crop_gravity]
+    end
+
     def group_resizing_opts
       return unless self[:width] && self[:height]
 
-      self[:size] = trim_nils(
-        [delete(:width), delete(:height), delete(:enlarge), delete(:extend)],
-      )
+      self[:size] = extract_and_trim_nils(:width, :height, :enlarge, :extend)
 
       self[:resize] = [delete(:resizing_type), *delete(:size)] if self[:resizing_type]
     end
 
     def group_gravity_opts
-      gravity = trim_nils(
-        [
-          delete(:gravity),
-          delete(:gravity_x),
-          delete(:gravity_y),
-        ],
-      )
+      gravity = extract_and_trim_nils(:gravity, :gravity_x, :gravity_y)
 
       self[:gravity] = gravity unless gravity[0].nil?
     end
 
+    def group_adjust_opts
+      return unless values_at(:brightness, :contrast, :saturation).count { |o| !o.nil? } > 1
+
+      self[:adjust] = extract_and_trim_nils(:brightness, :contrast, :saturation)
+    end
+
     def group_watermark_opts
-      watermark = trim_nils(
-        [
-          delete(:watermark_opacity),
-          delete(:watermark_position),
-          delete(:watermark_x_offset),
-          delete(:watermark_y_offset),
-          delete(:watermark_scale),
-        ],
+      watermark = extract_and_trim_nils(
+        :watermark_opacity,
+        :watermark_position,
+        :watermark_x_offset,
+        :watermark_y_offset,
+        :watermark_scale,
       )
 
       self[:watermark] = watermark unless watermark[0].nil?
@@ -92,6 +111,15 @@ module Imgproxy
       self[:style] = Base64.urlsafe_encode64(self[:style]).tr("=", "")
     end
 
+    def encode_watermark_url
+      return if self[:watermark_url].nil?
+      self[:watermark_url] = Base64.urlsafe_encode64(self[:watermark_url]).tr("=", "")
+    end
+
+    def extract_and_trim_nils(*keys)
+      trim_nils(keys.map { |k| delete(k) })
+    end
+
     def trim_nils(value)
       value.delete_at(-1) while !value.empty? && value[-1].nil?
       value

data/lib/imgproxy/version.rb

@@ -1,3 +1,3 @@
 module Imgproxy
-  VERSION = "1.0.6".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgproxy
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Sergey Alexandrovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug