image_processing 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b28b25634ec49e61835850b56f7c1c46b4d0e10ea99fbb6ef05c238e307d348
-  data.tar.gz: 348ff75f2a0779c085341248ac9cf4e9a931e984a3ba2e2e016c77dd63cc04e0
+  metadata.gz: c73cfe4047169c0385afc59779c47cc43385b8c02a82e540d8ad53adbd32aa41
+  data.tar.gz: 6ae50e569a9bad8b408c7f17a2eaded27e939be43c8b72f956d19875e2de5116
 SHA512:
-  metadata.gz: 85f39d0e536bddda22b5a79d5a0cc95496cf8eccccb536549ac209dbad3850b83add4797420a165582c666230015a1a4f969c0846e026f950a0d4dee1c5d00a8
-  data.tar.gz: e9b452b98df5b6f96cccf89b51a17b6ea3d06197adce46549d441fbd6822bcecac58cb9bf8e8ddc8ad14c3b144f8a8d703cb4d183d615ad349337430f6da9b7c
+  metadata.gz: deae9e4f3c13765f296aaf3801d02f55756518e077c38e1e6df89fc6c478fda48de41866292326684be06aeac3dedcd4fd1bd4688b09cc2b0ba858d6034e6416
+  data.tar.gz: 152da0d976a408e8c2dbf66e5054df86e22ae8006381833e4d0c845f7c643acb55355efeb30f910ca32c0b19fb3171503f92fcef240d26728151a0a8de68ec54

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## HEAD
+
+* [vips] In `#composite` accept `:offset` option for the position of the overlay image (@janko-m)
+
+* [vips] In `#composite` accept `:gravity` option for the direction of the overlay image (@janko-m)
+
+* [vips] In `#composite` accept blend mode as an optional `:mode` parameter which defaults to `:over` (@janko-m)
+
+* [minimagick] In `#composite` rename `:compose` option to `:mode` (@janko-m)
+
+* [minimagick] In `#composite` replace `:geometry` option with `:offset` which accepts an array (@janko-m)
+
 ## 1.5.0 (2018-07-10)
 
 * [minimagick, vips] Add `#composite` method (@janko-m)

data/lib/image_processing/mini_magick.rb

@@ -76,16 +76,27 @@ module ImageProcessing
         magick.rotate(degrees)
       end
 
-      def composite(overlay = :none, mask: nil, compose: nil, gravity: nil, geometry: nil, args: nil, &block)
+      def composite(overlay = :none, mask: nil, mode: nil, gravity: nil, offset: nil, args: nil, **options, &block)
         return magick.composite if overlay == :none
 
+        if options.key?(:compose)
+          warn "[IMAGE_PROCESSING] The :compose parameter in #composite has been renamed to :mode, the :compose alias will be removed in ImageProcessing 2."
+          mode = options[:compose]
+        end
+
+        if options.key?(:geometry)
+          warn "[IMAGE_PROCESSING] The :geometry parameter in #composite has been deprecated and will be removed in ImageProcessing 2. Use :offset instead, e.g. `geometry: \"+10+15\"` should be replaced with `offset: [10, 15]`."
+          geometry = options[:geometry]
+        end
+        geometry = "%+d%+d" % offset if offset
+
         overlay_path = convert_to_path(overlay, "overlay")
         mask_path    = convert_to_path(mask, "mask") if mask
 
         magick << overlay_path
         magick << mask_path if mask_path
 
-        magick.compose(compose) if compose
+        magick.compose(mode) if mode
         define(compose: { args: args }) if args
 
         magick.gravity(gravity) if gravity

data/lib/image_processing/version.rb

@@ -1,3 +1,3 @@
 module ImageProcessing
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/lib/image_processing/vips.rb

@@ -78,22 +78,25 @@ module ImageProcessing
         end
       end
 
-      def composite(other, mode, **options)
-        other = [other] unless other.is_a?(Array)
-
-        other = other.map do |object|
-          if object.is_a?(String)
-            ::Vips::Image.new_from_file(object)
-          elsif object.respond_to?(:to_path)
-            ::Vips::Image.new_from_file(object.to_path)
-          elsif object.respond_to?(:path)
-            ::Vips::Image.new_from_file(object.path)
-          else
-            object
-          end
+      def composite(overlay, _mode = nil, mode: :over, gravity: :"north-west", offset: nil, **options)
+        if _mode
+          overlay = [overlay] unless overlay.is_a?(Array)
+          overlay = overlay.map { |object| convert_to_image(object, "overlay") }
+
+          return image.composite(overlay, _mode, **options)
+        end
+
+        overlay = convert_to_image(overlay, "overlay")
+        overlay = overlay.add_alpha unless overlay.has_alpha? # so that #gravity can use transparent background
+
+        if offset
+          opposite_gravity = gravity.to_s.gsub(/\w+/, "north"=>"south", "south"=>"north", "east"=>"west", "west"=>"east")
+          overlay = overlay.gravity(opposite_gravity, overlay.width + offset.first, overlay.height + offset.last)
         end
 
-        image.composite(other, mode, **options)
+        overlay = overlay.gravity(gravity, image.width, image.height)
+
+        image.composite(overlay, mode, **options)
       end
 
       # make Vips::Image#set, #set_type, and #set_value chainable
@@ -116,6 +119,22 @@ module ImageProcessing
         [width || ::Vips::MAX_COORD, height || ::Vips::MAX_COORD]
       end
 
+      def convert_to_image(object, name)
+        return object if object.is_a?(::Vips::Image)
+
+        if object.is_a?(String)
+          path = object
+        elsif object.respond_to?(:to_path)
+          path = object.to_path
+        elsif object.respond_to?(:path)
+          path = object.path
+        else
+          raise ArgumentError, "#{name} must be a Vips::Image, String, Pathname, or respond to #path"
+        end
+
+        ::Vips::Image.new_from_file(path)
+      end
+
       module Utils
         module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_processing
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick