image_processing 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22578c76658031df98eee4b527240f093f67685fe500203133cc0926c98651a
-  data.tar.gz: 00a25b55f2ac02e1ba2f9fa680df72bd686a6e364474b734673f30c28673df02
+  metadata.gz: ffa40592c60c9cdd802c66603dd364a5eabc2c3b0b784df8e6646bab22976916
+  data.tar.gz: fdb4f77ccd655719bdd9650816ae20fd80db7f192d267db8b3081a9e4beae476
 SHA512:
-  metadata.gz: dd79bd00804d9c2dde5e51d0fffe6e48cdd3ee5d69333cbe4a5471ce3714c0be43b4cf39df7d464fe7b23d76c172c417612de37a50d3173f2bffc130eac5498e
-  data.tar.gz: 0f13da9ed2363bc7f763f5ad73be4e6981344879472747905e57aa48eb0bce9fc261b39f6168ed8ce679fc5da70270321302858ba50df1a7362a899f6fceee59
+  metadata.gz: b1be056214e0da7b38cc229bcd4e48d7962514777881de9c93ddd68ccb5de8bd29bfada6afbf03a78007aee860d1bb706dc2f35f3e192c0861110df8e71c3a31
+  data.tar.gz: fa16784ff04521cb24608869f159185586e61f9ecaedc977ac89e550a1209e921f91590ea71b27fbeb4ab3a49f1ee545fd44d8291d83687d4e309d31dada3a28

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.9.0 (2019-04-09)
+
+* Drop support for MRI 2.2 and 2.3 (@janko)
+
+* [vips] Allow forcing a specific loader or saver (@janko)
+
 ## 1.8.0 (2019-02-25)
 
 * [vips] Perform resize-on-load when possible, significantly improving resizing speed (@janko)

data/image_processing.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
   spec.name          = "image_processing"
   spec.version       = ImageProcessing::VERSION
 
-  spec.required_ruby_version = ">= 2.0"
+  spec.required_ruby_version = ">= 2.4"
 
   spec.summary       = "Set of higher-level helper methods for image processing."
   spec.description   = "Set of higher-level helper methods for image processing."

data/lib/image_processing/mini_magick.rb

@@ -25,7 +25,7 @@ module ImageProcessing
       # Initializes the image on disk into a MiniMagick::Tool object. Accepts
       # additional options related to loading the image (e.g. geometry).
       # Additionally auto-orients the image to be upright.
-      def self.load_image(path_or_magick, operations: [], page: nil, geometry: nil, auto_orient: true, **options)
+      def self.load_image(path_or_magick, page: nil, geometry: nil, auto_orient: true, **options)
         if path_or_magick.is_a?(::MiniMagick::Tool)
           magick = path_or_magick
         else
@@ -195,7 +195,7 @@ module ImageProcessing
 
           if layers.any?
             layers.each { |path| File.delete(path) }
-            raise Error, "Multi-layer image is being converted into a single-layer format. You should either process individual layers or set :allow_splitting to true. See https://github.com/janko/image_processing/wiki/Splitting-a-PDF-into-multiple-images for how to process each layer individually."
+            raise Error, "Source format is multi-layer, but destination format is single-layer. If you care only about the first layer, add `.loader(page: 0)` to your pipeline. If you want to process each layer, see https://github.com/janko/image_processing/wiki/Splitting-a-PDF-into-multiple-images or use `.saver(allow_splitting: true)`."
           end
         end
 

data/lib/image_processing/processor.rb

@@ -6,7 +6,14 @@ module ImageProcessing
         fail Error, "invalid source: #{source.inspect}"
       end
 
-      accumulator = load_image(source, operations: operations, **loader)
+      if operations.dig(0, 0).to_s.start_with?("resize_") &&
+         loader.empty? &&
+         supports_resize_on_load?
+
+        accumulator = source
+      else
+        accumulator = load_image(source, **loader)
+      end
 
       operations.each do |operation|
         accumulator = apply_operation(accumulator, operation)
@@ -40,6 +47,10 @@ module ImageProcessing
       end
     end
 
+    def self.supports_resize_on_load?
+      false
+    end
+
     def initialize(accumulator = nil)
       @accumulator = accumulator
     end

data/lib/image_processing/version.rb

@@ -1,3 +1,3 @@
 module ImageProcessing
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

data/lib/image_processing/vips.rb

@@ -27,34 +27,41 @@ module ImageProcessing
       # Loads the image on disk into a Vips::Image object. Accepts additional
       # loader-specific options (e.g. interlacing). Afterwards auto-rotates the
       # image to be upright.
-      def self.load_image(path_or_image, operations: [], autorot: true, **options)
+      def self.load_image(path_or_image, loader: nil, autorot: true, **options)
         if path_or_image.is_a?(::Vips::Image)
           image = path_or_image
         else
           path = path_or_image
 
-          # utilize resize-on-load optimization when possible
-          return path if operations.any? &&
-                         operations[0][0].to_s.start_with?("resize_") &&
-                         options.empty?
-
-          options = Utils.select_valid_loader_options(path, options)
-
-          image = ::Vips::Image.new_from_file(path, **options)
+          if loader
+            image = ::Vips::Image.public_send(:"#{loader}load", path, **options)
+          else
+            options = Utils.select_valid_loader_options(path, options)
+            image = ::Vips::Image.new_from_file(path, **options)
+          end
         end
 
         image = image.autorot if autorot && !options.key?(:autorotate)
         image
       end
 
+      # See #thumbnail.
+      def self.supports_resize_on_load?
+        true
+      end
+
       # Writes the Vips::Image object to disk. This starts the processing
       # pipeline defined in the Vips::Image object. Accepts additional
       # saver-specific options (e.g. quality).
-      def self.save_image(image, destination_path, quality: nil, **options)
+      def self.save_image(image, path, saver: nil, quality: nil, **options)
         options = options.merge(Q: quality) if quality
-        options = Utils.select_valid_saver_options(destination_path, options)
 
-        image.write_to_file(destination_path, **options)
+        if saver
+          image.public_send(:"#{saver}save", path, **options)
+        else
+          options = Utils.select_valid_saver_options(path, options)
+          image.write_to_file(path, **options)
+        end
       end
 
       # Resizes the image to not be larger than the specified dimensions.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_processing
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -151,14 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Set of higher-level helper methods for image processing.