image_processing 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e86e76046f3b8e0b9fd36a71d52b158a923c75f33848692de1e199ecb17366f
-  data.tar.gz: 7267f19b5cb3224a61e04be0a0d3b3f17d353750a1a522a11f2912b9ba49b809
+  metadata.gz: fa60a0e94436db0e6f672a321162282b92fff25b9acac0031d11f8e75bd46bee
+  data.tar.gz: f6f2cc0a61658d8a3db0883b4bdf7b9ec6421d29b74ce22ca1fee5ea2ff58d94
 SHA512:
-  metadata.gz: 473958a39a8e760cdb9d352399190f1cdea0dcd915ad729ec740fb7f424dc05041c43fe1085439c0f54763c388b83c2b7dcf32f66cc15caa9dbc0f21c325a166
-  data.tar.gz: ac3cc41432e9dc786035f77c721eb1407c84c6307fccc9d8f01f42ca909618229134411f503eeeb770809f620804468750414e6dc8900c442a46d08d3d02e660
+  metadata.gz: 7220163f9f2572070de49f84ac4a9051433c504c44c6925660bcac162855b38920691d6e661deeeee3b2b6238f8a78cc4881dd10e539136bf02bef01ff05cca0
+  data.tar.gz: 9b21b5d109a9e7f8b116cccbf347809a2943171e959e8c1efc9797fcc133759c34ee83148601aa3f413f7e972b12a1803b4229f2b27835c35ab745fe39b0011f

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.13.0 (2024-07-24)
+
+* [minimagick] Use `-append` when calling `#append` with no arguments (@janko)
+
+* [vips] Avoid lines on the side when rotating by multiples of 90 degrees (@etherbob)
+
+* Add `#resize_to_cover` that allows resizing an image to cover a given rectangle without cropping the excess (@brendon)
+
+## 1.12.2 (2022-03-01)
+
+* Prevent remote shell execution when using `#apply` with operations coming from user input (@janko)
+
+## 1.12.1 (2020-11-06)
+
+* Fix format fallback for files ending with a dot on Ruby 2.7+ (@coding-chimp)
+
 ## 1.12.0 (2020-09-20)
 
 * Add instrumentation support via `#instrumenter` (@janko)

data/README.md

@@ -29,10 +29,18 @@ how to resize and process images.
 
 1. Install ImageMagick and/or libvips:
 
-  ```sh
+In a Mac terminal:
+
+```sh
   $ brew install imagemagick vips
   ```
 
+ In a debian/ubuntu terminal:
+
+```sh
+  $ sudo apt install imagemagick libvips
+  ```
+
 2. Add the gem to your Gemfile:
 
   ```rb
@@ -181,10 +189,17 @@ pipeline
 
 Our test suite requires both `imagemagick` and `libvips` libraries to be installed.
 
+In a Mac terminal:
+
 ```
 $ brew install imagemagick vips
 ```
 
+In a debian/ubuntu terminal:
+```shell
+sudo apt install imagemagick libvips
+```
+
 Afterwards you can run tests with
 
 ```

data/image_processing.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.8"
   spec.add_development_dependency "minitest-hooks", ">= 1.4.2"
   spec.add_development_dependency "minispec-metadata"
-  spec.add_development_dependency "phashion" unless RUBY_ENGINE == "jruby"
+  spec.add_development_dependency "dhash-vips"
 end

data/lib/image_processing/chainable.rb

@@ -34,13 +34,13 @@ module ImageProcessing
     def apply(operations)
       operations.inject(self) do |builder, (name, argument)|
         if argument == true || argument == nil
-          builder.send(name)
+          builder.public_send(name)
         elsif argument.is_a?(Array)
-          builder.send(name, *argument)
+          builder.public_send(name, *argument)
         elsif argument.is_a?(Hash)
-          builder.send(name, **argument)
+          builder.public_send(name, **argument)
         else
-          builder.send(name, argument)
+          builder.public_send(name, argument)
         end
       end
     end
@@ -53,7 +53,9 @@ module ImageProcessing
     # Call the defined processing and get the result. Allows specifying
     # the source file and destination.
     def call(file = nil, destination: nil, **call_options)
-      options = { source: file, destination: destination }.compact
+      options = {}
+      options[:source] = file if file
+      options[:destination] = destination if destination
 
       branch(**options).call!(**call_options)
     end

data/lib/image_processing/mini_magick.rb

@@ -86,6 +86,12 @@ module ImageProcessing
         magick.extent "#{width}x#{height}"
       end
 
+      # Resizes the image to cover the specified dimensions, without
+      # cropping the excess.
+      def resize_to_cover(width, height, **options)
+        thumbnail("#{width}x#{height}^", **options)
+      end
+
       # Crops the image with the specified crop points.
       def crop(*args)
         case args.count
@@ -151,7 +157,11 @@ module ImageProcessing
 
       # Appends a raw ImageMagick command-line argument to the command.
       def append(*args)
-        magick.merge! args
+        if args.empty?
+          magick.append
+        else
+          magick.merge! args
+        end
       end
 
       private

data/lib/image_processing/pipeline.rb

@@ -37,9 +37,9 @@ module ImageProcessing
 
     # Determines the appropriate destination image format.
     def destination_format
-      format   = File.extname(destination)[1..-1] if destination
+      format   = determine_format(destination) if destination
       format ||= self.format
-      format ||= File.extname(source_path)[1..-1] if source_path
+      format ||= determine_format(source_path) if source_path
 
       format || DEFAULT_FORMAT
     end
@@ -93,5 +93,11 @@ module ImageProcessing
         @source
       end
     end
+
+    def determine_format(file_path)
+      extension = File.extname(file_path)
+
+      extension[1..-1] if extension.size > 1
+    end
   end
 end

data/lib/image_processing/version.rb

@@ -1,3 +1,3 @@
 module ImageProcessing
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/lib/image_processing/vips.rb

@@ -90,9 +90,31 @@ module ImageProcessing
         image.gravity(gravity, width, height, extend: extend, background: background)
       end
 
+      # Resizes the image to cover the specified dimensions, without
+      # cropping the excess.
+      def resize_to_cover(width, height, **options)
+        image = self.image.is_a?(String) ? ::Vips::Image.new_from_file(self.image) : self.image
+
+        image_ratio = Rational(image.width, image.height)
+        thumbnail_ratio = Rational(width, height)
+
+        if image_ratio > thumbnail_ratio
+          width = ::Vips::MAX_COORD
+        else
+          height = ::Vips::MAX_COORD
+        end
+
+        thumbnail(width, height, **options, crop: :none)
+      end
+
       # Rotates the image by an arbitrary angle.
       def rotate(degrees, **options)
-        image.similarity(angle: degrees, **options)
+        if ([90, 180, 270].include?(degrees) && options.empty?)
+          rot_command = "rot#{degrees}".to_sym
+          image.public_send rot_command
+        else
+          image.similarity(angle: degrees, **options)
+        end
       end
 
       # Overlays the specified image over the current one. Supports specifying

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_processing
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -107,7 +107,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: phashion
+  name: dhash-vips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,7 +144,7 @@ homepage: https://github.com/janko/image_processing
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: High-level wrapper for processing images for the web with ImageMagick or
   libvips.