image_processing 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 908334dfbdaa9424701386bb8c1722d23679f726
-  data.tar.gz: abbc3ca67468cedb3729aae261e04e49f1d19cf7
+SHA256:
+  metadata.gz: 39c52030a178edeef33439eb70807d86935b1e05bbf250d0f30aa9a4947f6dea
+  data.tar.gz: 60c936577febb87380de300024a8f4517ae9dafed394d74fe7b0f78ab04efd7f
 SHA512:
-  metadata.gz: 151d52c9bba7feb70a516cda8e59b865e4684993646703219d0806aa0a92b6511cbd15d6af0b0f6d83b948a85926a35a465ccc4bc96531a68e499c4556743ed7
-  data.tar.gz: bcfb395d26a68bfe7cb21994a319fc982bbd8702a83123d7ac825064c582e46a5bedf3c33263b7f0f6b28e6420786ec1e54b029abf54ed90c487ad52539318ff
+  metadata.gz: 9bc68c91084d44b3052a47ac332d21840965537163b541ef09cd662d729c26e152b3e588f97fd954a13aaae0a5a645be86389a79308de4eee154feb7fed95baa
+  data.tar.gz: 4c026c8eb9cc4dfa537ef3f0f86b460a8dc0a13134fe441604483b6a4b1afd1048911b499673807fac82f7a15c37773e27fad1dd2d049f8e8adedd5204166923

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.2.0 (2018-04-18)
+
+* [minimagick] Allow appending "+" operators in `#loader` and `#saver` using the value `false` (@janko-m)
+
+* [core] Fix `#apply` not accepting a Hash as an argument (@janko-m)
+
+* [core] Allow sending any builder commands via `#apply`, not just operations (@janko-m)
+
+* [minimagick] Add `#define` as a wrapper around `-define` (@janko-m)
+
 ## 1.1.0 (2018-04-05)
 
 * [minimagick] Disallow splitting multi-layer images into multiple single-layer

data/lib/image_processing/chainable.rb

@@ -16,24 +16,29 @@ module ImageProcessing
       branch saver: options
     end
 
-    def apply(operations)
-      operation :apply, operations
-    end
-
     def custom(&block)
       operation :custom, block
     end
 
-    def method_missing(name, *args)
-      if name.to_s.end_with?("!")
-        send(name.to_s.chomp("!"), *args).call
-      elsif name.to_s.end_with?("?")
-        super
-      else
-        operation(name, *args)
+    def apply(operations)
+      operations.inject(self) do |builder, (name, argument)|
+        if argument == true || argument == nil
+          builder.send(name)
+        elsif argument.is_a?(Array)
+          builder.send(name, *argument)
+        else
+          builder.send(name, argument)
+        end
       end
     end
 
+    def method_missing(name, *args)
+      return super if name.to_s.end_with?("?")
+      return send(name.to_s.chomp("!"), *args).call if name.to_s.end_with?("!")
+
+      operation name, *args
+    end
+
     def operation(name, *args)
       branch operations: [[name, args]]
     end

data/lib/image_processing/mini_magick.rb

@@ -3,6 +3,8 @@ require "image_processing"
 
 module ImageProcessing
   module MiniMagick
+    extend Chainable
+
     def self.valid_image?(file)
       ::MiniMagick::Tool::Convert.new do |convert|
         convert << file.path
@@ -41,6 +43,22 @@ module ImageProcessing
         magick.extent "#{width}x#{height}"
       end
 
+      def define(magick, options)
+        return magick.define(options) if options.is_a?(String)
+
+        options.each do |namespace, options|
+          namespace = namespace.to_s.gsub("_", "-")
+
+          options.each do |key, value|
+            key = key.to_s.gsub("_", "-")
+
+            magick.define "#{namespace}:#{key}=#{value}"
+          end
+        end
+
+        magick
+      end
+
       def limits(magick, options)
         limit_args = options.flat_map { |type, value| %W[-limit #{type} #{value}] }
         prepend_args(magick, limit_args)
@@ -95,20 +113,15 @@ module ImageProcessing
       end
 
       def apply_options(magick, define: {}, **options)
-        apply(magick, options)
-        apply_define(magick, define)
-      end
-
-      def apply_define(magick, define)
-        define.each do |namespace, options|
-          namespace = namespace.to_s.gsub("_", "-")
-
-          options.each do |key, value|
-            key = key.to_s.gsub("_", "-")
-
-            magick.define "#{namespace}:#{key}=#{value}"
+        options.each do |option, value|
+          case value
+          when true, nil then magick.send(option)
+          when false     then magick.send(option).+
+          else                magick.send(option, *value)
           end
         end
+
+        define(magick, define)
       end
 
       def prepend_args(magick, args)
@@ -125,7 +138,5 @@ module ImageProcessing
         end
       end
     end
-
-    extend Chainable
   end
 end

data/lib/image_processing/processor.rb

@@ -4,16 +4,6 @@ module ImageProcessing
       @pipeline = pipeline
     end
 
-    def apply(image, operations)
-      operations.inject(image) do |result, (name, args)|
-        if args == true || args.nil?
-          apply_operation(name, result)
-        else
-          apply_operation(name, result, *args)
-        end
-      end
-    end
-
     def apply_operation(name, image, *args)
       if respond_to?(name)
         public_send(name, image, *args)

data/lib/image_processing/version.rb

@@ -1,3 +1,3 @@
 module ImageProcessing
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/image_processing/vips.rb

@@ -5,6 +5,8 @@ fail "image_processing/vips requires libvips 8.6+" unless Vips.at_least_libvips?
 
 module ImageProcessing
   module Vips
+    extend Chainable
+
     def self.valid_image?(file)
       ::Vips::Image.new_from_file(file.path, access: :sequential).avg
       true
@@ -26,23 +28,23 @@ module ImageProcessing
 
       def resize_to_limit(image, width, height, **options)
         width, height = default_dimensions(width, height)
-        generate_thumbnail(image, width, height, size: :down, **options)
+        thumbnail(image, width, height, size: :down, **options)
       end
 
       def resize_to_fit(image, width, height, **options)
         width, height = default_dimensions(width, height)
-        generate_thumbnail(image, width, height, **options)
+        thumbnail(image, width, height, **options)
       end
 
       def resize_to_fill(image, width, height, **options)
-        generate_thumbnail(image, width, height, crop: :centre, **options)
+        thumbnail(image, width, height, crop: :centre, **options)
       end
 
       def resize_and_pad(image, width, height, gravity: "centre", extend: nil, background: nil, alpha: nil, **options)
         embed_options = { extend: extend, background: background }
         embed_options.reject! { |name, value| value.nil? }
 
-        image = generate_thumbnail(image, width, height, **options)
+        image = thumbnail(image, width, height, **options)
         image = add_alpha(image) if alpha && !has_alpha?(image)
         image.gravity(gravity, width, height, **embed_options)
       end
@@ -70,7 +72,7 @@ module ImageProcessing
 
       private
 
-      def generate_thumbnail(image, width, height, sharpen: SHARPEN_MASK, **options)
+      def thumbnail(image, width, height, sharpen: SHARPEN_MASK, **options)
         image = image.thumbnail_image(width, height: height, **options)
         image = image.conv(sharpen) if sharpen
         image
@@ -116,7 +118,5 @@ module ImageProcessing
         options.select { |name, value| operation_options.include?(name) }
       end
     end
-
-    extend Chainable
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Set of higher-level helper methods for image processing.