image_processing 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c6647897aed5a610f76eae2edef4327ec092653
-  data.tar.gz: '09335920e634fc2cb83a8be2111dda2c340421e2'
+  metadata.gz: 908334dfbdaa9424701386bb8c1722d23679f726
+  data.tar.gz: abbc3ca67468cedb3729aae261e04e49f1d19cf7
 SHA512:
-  metadata.gz: f1fbf330dc866bcabe44121cdf1f27ee488db46cbcdcc0d6cbfae07b95c9064740047d5faf63a02fc2ce6e11e14b8cf425dfa59ae716ff964ec5947a5e98be96
-  data.tar.gz: 332f2ad092e5ea7a5bda88388d152d11f8a788cd7659cb53e8370a83fcd5358c4078d677af6d89e594adfa04e050d12b2fcd4dcb1d2586020449b5285f098cb1
+  metadata.gz: 151d52c9bba7feb70a516cda8e59b865e4684993646703219d0806aa0a92b6511cbd15d6af0b0f6d83b948a85926a35a465ccc4bc96531a68e499c4556743ed7
+  data.tar.gz: bcfb395d26a68bfe7cb21994a319fc982bbd8702a83123d7ac825064c582e46a5bedf3c33263b7f0f6b28e6420786ec1e54b029abf54ed90c487ad52539318ff

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.1.0 (2018-04-05)
+
+* [minimagick] Disallow splitting multi-layer images into multiple single-layer
+  images by default to avoid unexpected behaviour, but can be re-enabled with
+  the `:allow_splitting` saver option (@janko-m)
+
+* [core] Add `#apply` for applying a list of operations (@janko-m)
+
 ## 1.0.0 (2018-04-04)
 
 * Depend on `mini_magick` and `ruby-vips` gems (@janko-m, @mokolabs)

data/README.md

@@ -5,7 +5,7 @@ when handling image uploads.
 
 This gem can process images with either [ImageMagick] or [libvips] libraries.
 ImageMagick is a good default choice, especially if you are migrating from
-another gem or library that uses ImageMagick. libvips is a newer library that
+another gem or library that uses ImageMagick. Libvips is a newer library that
 can process images [very rapidly][libvips performance] (up to 10x faster than
 ImageMagick).
 

data/lib/image_processing/chainable.rb

@@ -16,6 +16,10 @@ module ImageProcessing
       branch saver: options
     end
 
+    def apply(operations)
+      operation :apply, operations
+    end
+
     def custom(&block)
       operation :custom, block
     end

data/lib/image_processing/mini_magick.rb

@@ -70,12 +70,13 @@ module ImageProcessing
         magick
       end
 
-      def save_image(magick, destination_path, **options)
+      def save_image(magick, destination_path, allow_splitting: false, **options)
         apply_options(magick, options)
 
         magick << destination_path
-
         magick.call
+
+        disallow_split_layers!(destination_path) unless allow_splitting
       end
 
       private
@@ -94,14 +95,7 @@ module ImageProcessing
       end
 
       def apply_options(magick, define: {}, **options)
-        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
-
+        apply(magick, options)
         apply_define(magick, define)
       end
 
@@ -121,6 +115,15 @@ module ImageProcessing
         magick.args.replace args + magick.args
         magick
       end
+
+      def disallow_split_layers!(destination_path)
+        layers = Dir[destination_path.sub(/\.\w+$/, '-*\0')]
+
+        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-m/image_processing/wiki/Splitting-a-PDF-into-multiple-images for how to process each layer individually."
+        end
+      end
     end
 
     extend Chainable

data/lib/image_processing/processor.rb

@@ -4,6 +4,16 @@ 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.0.0"
+  VERSION = "1.1.0"
 end

metadata

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