image_processing 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8540c4984c3cc5810f84f5b12301a8226617b9e5
-  data.tar.gz: 1e120d2f40f7b7add09ae8c4b78a6ba172785be9
+  metadata.gz: e049246f3103f7f178b7318bf8dcf13695e4176d
+  data.tar.gz: 62cfaf744d25bdee1db2c6a070ffabe52c3df89f
 SHA512:
-  metadata.gz: 6b0cb8ee60ada09a9068ebf09828befa47fee2485bd02791e34428e37c137e6a77eda1e78b99198ffbaa5d2c9cae37d6e129144a90ea272ffb6a12ca4cae7e23
-  data.tar.gz: 49c1c4e250d29aa7e104e6c8304a1c3c504ab69049fa59e173e9d0d86256a87272a3b81648b5218ad2763662ef0017918a46433f197fa6a70a6504d61db59543
+  metadata.gz: 15e19280b7889ac52b21c435be6d132a535cd94c31e38eb5a85fe47b9ad210963117fded9b53a444dc2c0cbc08962808cd38cb25f5c70902bc0509d5a70ad23f
+  data.tar.gz: 236da6230651462334d51dabaf975e59e070001ae8269dfb6ff206de88ce86496fafa65b1fa4f89ea3bed8d866e06276eb192f57fe4829d150e3a4cb35bbf0ea

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.11.0 (2018-03-27)
+
+* [minimagick] Fix broken deprecated `#convert` (@janko-m)
+
+* [minimagick] Add `#limit` for specifying resource limits using `-limit` (@janko-m)
+
+* [minimagick] Use `-thumbnail` instead of `-resize` in `#resize_*` methods (@janko-m)
+
+* [minimagick] Add loader and saver options (@janko-m)
+
 ## 0.10.3 (2018-03-24)
 
 * [minimagick] Fix bang methods in deprecated API calling nondestructive versions (@janko-m)

data/README.md

@@ -99,25 +99,7 @@ You can continue reading the API documentation for specific modules:
 * **[`ImageProcessing::Vips`]**
 * **[`ImageProcessing::MiniMagick`]**
 
-## Optimization
-
-After images have been processed, you might want to additionally optimize them
-to reduce their filesize. You can do that with the [image_optim] gem:
-
-```rb
-require "image_optim"
-
-result = ImageProcessing::Vips
-  .resize_to_limit(400, 400)
-  .saver(Q: 85)
-  .call(image)
-
-image_optim = ImageOptim.new(...)
-image_optim.optimize_image!(result.path)
-result.open # refresh file descriptor
-
-result # optimized image
-```
+See the **[wiki]** for additional "How To" guides for common scenarios.
 
 ## Contributing
 
@@ -148,5 +130,5 @@ The `ImageProcessing::MiniMagick` functionality was extracted from
 [VIPS]: http://jcupitt.github.io/libvips/
 [`ImageProcessing::Vips`]: /doc/vips.md#imageprocessingvips
 [`ImageProcessing::MiniMagick`]: /doc/minimagick.md#imageprocessingminimagick
-[image_optim]: https://github.com/toy/image_optim
 [refile-mini_magick]: https://github.com/refile/refile-mini_magick
+[wiki]: https://github.com/janko-m/image_processing/wiki

data/lib/image_processing/mini_magick/deprecated_api.rb

@@ -70,7 +70,8 @@ module ImageProcessing
       end
 
       deprecated_processing_method :convert do |file, format, page = nil, block|
-        source(file, page: page)
+        source(file)
+          .loader(page: page)
           .custom(&block)
           .convert!(format)
       end

data/lib/image_processing/mini_magick.rb

@@ -19,7 +19,6 @@ module ImageProcessing
 
     class Processor
       IMAGE_CLASS = ::MiniMagick::Tool
-      TRANSPARENT = "rgba(255,255,255,0.0)"
 
       def apply_operation(name, magick, *args)
         if respond_to?(name)
@@ -30,40 +29,49 @@ module ImageProcessing
       end
 
       def resize_to_limit(magick, width, height)
-        magick.resize "#{width}x#{height}>"
+        magick.thumbnail "#{width}x#{height}>"
       end
 
       def resize_to_fit(magick, width, height)
-        magick.resize "#{width}x#{height}"
+        magick.thumbnail "#{width}x#{height}"
       end
 
       def resize_to_fill(magick, width, height, gravity: "Center")
-        magick.resize "#{width}x#{height}^"
+        magick.thumbnail "#{width}x#{height}^"
         magick.gravity gravity
-        magick.background TRANSPARENT
+        magick.background "rgba(255,255,255,0.0)" # transparent
         magick.extent "#{width}x#{height}"
       end
 
-      def resize_and_pad(magick, width, height, background: TRANSPARENT, gravity: "Center")
-        background = TRANSPARENT if background == "transparent"
+      def resize_and_pad(magick, width, height, background: :transparent, gravity: "Center")
+        background = "rgba(255,255,255,0.0)" if background.to_s == "transparent"
 
-        magick.resize "#{width}x#{height}"
+        magick.thumbnail "#{width}x#{height}"
         magick.background background
         magick.gravity gravity
         magick.extent "#{width}x#{height}"
       end
 
+      def limit(magick, limits)
+        limit_args = limits.flat_map { |type, value| %W[-limit #{type} #{value}] }
+        magick.args.replace limit_args + magick.args
+        magick
+      end
+
       def append(magick, *args)
         magick.merge! args
       end
 
-      def load_image(path_or_magick, page: nil, geometry: nil, fail: true, auto_orient: true)
+      def load_image(path_or_magick, page: nil, geometry: nil, fail: true, auto_orient: true, define: {}, **options)
         if path_or_magick.is_a?(::MiniMagick::Tool)
           magick = path_or_magick
         else
           source_path = path_or_magick
           magick = ::MiniMagick::Tool::Convert.new
 
+          apply_define(magick, define)
+          apply_options(magick, options)
+
           input_path  = source_path
           input_path += "[#{page}]" if page
           input_path += "[#{geometry}]" if geometry
@@ -77,10 +85,38 @@ module ImageProcessing
         magick
       end
 
-      def save_image(magick, destination_path, **options)
+      def save_image(magick, destination_path, define: {}, **options)
+        apply_define(magick, define)
+        apply_options(magick, options)
+
         magick << destination_path
+
         magick.call
       end
+
+      private
+
+      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}"
+          end
+        end
+      end
+
+      def apply_options(magick, options)
+        options.each do |option, value|
+          case value
+          when true  then magick.send(option)
+          when false then magick.send(option).+
+          else            magick.send(option, *value)
+          end
+        end
+      end
     end
 
     extend Chainable

data/lib/image_processing/version.rb

@@ -1,3 +1,3 @@
 module ImageProcessing
-  VERSION = "0.10.3"
+  VERSION = "0.11.0"
 end

data/lib/image_processing/vips.rb

@@ -57,8 +57,7 @@ module ImageProcessing
           image = path_or_image
         else
           source_path = path_or_image
-          loader  = ::Vips.vips_foreign_find_load(source_path)
-          options = select_valid_options(loader, options) if loader
+          options     = select_valid_loader_options(source_path, options)
 
           image = ::Vips::Image.new_from_file(source_path, fail: true, **options)
         end
@@ -68,8 +67,7 @@ module ImageProcessing
       end
 
       def save_image(image, destination_path, **options)
-        saver   = ::Vips.vips_foreign_find_save(destination_path)
-        options = select_valid_options(saver, options) if saver
+        options = select_valid_saver_options(destination_path, options)
 
         image.write_to_file(destination_path, **options)
       end
@@ -82,6 +80,16 @@ module ImageProcessing
         [width || MAX_COORD, height || MAX_COORD]
       end
 
+      def select_valid_loader_options(source_path, options)
+        loader = ::Vips.vips_foreign_find_load(source_path)
+        loader ? select_valid_options(loader, options) : options
+      end
+
+      def select_valid_saver_options(destination_path, options)
+        saver = ::Vips.vips_foreign_find_save(destination_path)
+        saver ? select_valid_options(saver, options) : options
+      end
+
       def select_valid_options(operation_name, options)
         operation = ::Vips::Operation.new(operation_name)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_processing
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest