mini_magick 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47a71b858d75780aca2cad04723b23ebbe03f43
-  data.tar.gz: 0435a6885e082c68913235ddad9219590e6d3400
+  metadata.gz: 45a32b5c2e6bb0323abe49c1d5c3cb5bd7378f3e
+  data.tar.gz: 430c76ab6de8661491e42bcb21a9ba21d9239e97
 SHA512:
-  metadata.gz: 41be6f64c5a0190da1b04e16c90bcd6c68133b165a8f8515d9231d17a8da3f6900965e7147643b8beae9515b2ab08cd23229f845e1b2dba69473374ceb7e68fc
-  data.tar.gz: 6eb28519339d44d5f658d4492708ebd459124c32bc0606a9fc9a2308de8eb442d0b11374bf9f486b7111f15ba05384dca346151ef410fb2bb082860a00d9ab7a
+  metadata.gz: a989fdcfa50a2317ce292c04724be10928f01e834c17f6b529646c16ab855be3d2bbcc3d1a929662bf327c7e8e77387a994b42bfa6ad5e159e09237492e9495e
+  data.tar.gz: 4f42cff0e866f24e8bfbd36e2121487424ba7f96a433ddefe3c5edaab70976531bf8bb15ba267eb6ef8d4bf359e752351d74b0416b1a57a2f15e5a84ff3ec1cd

data/lib/mini_magick/image.rb

@@ -145,23 +145,22 @@ module MiniMagick
     # is, it gets *modified*. You can either copy it yourself or use {.open}
     # which creates a temporary file for you and protects your original.
     #
-    # @param input_path [String] The location of an image file
+    # @param input_path [String, Pathname] The location of an image file
     # @yield [MiniMagick::Tool::Mogrify] If block is given, {#combine_options}
     #   is called.
     #
     def initialize(input_path, tempfile = nil, &block)
-      @path = input_path
+      @path = input_path.to_s
       @tempfile = tempfile
       @info = MiniMagick::Image::Info.new(@path)
 
       combine_options(&block) if block
     end
 
-    def eql?(other)
-      self.class.equal?(other.class) &&
-        signature == other.signature
+    def ==(other)
+      self.class == other.class && signature == other.signature
     end
-    alias == eql?
+    alias eql? ==
 
     def hash
       signature.hash
@@ -269,7 +268,14 @@ module MiniMagick
     #
     attribute :signature
     ##
-    # Returns the information from `identify -verbose` in a Hash format.
+    # Returns the information from `identify -verbose` in a Hash format, for
+    # ImageMagick.
+    #
+    # @return [Hash]
+    attribute :data
+    ##
+    # Returns the information from `identify -verbose` in a Hash format, for
+    # GraphicsMagick.
     #
     # @return [Hash]
     attribute :details
@@ -331,11 +337,13 @@ module MiniMagick
     # @param page [Integer] If this is an animated gif, say which 'page' you
     #   want with an integer. Default 0 will convert only the first page; 'nil'
     #   will convert all pages.
+    # @param read_opts [Hash] Any read options to be passed to ImageMagick
+    #   for example: image.format('jpg', page, {density: '300'})
     # @yield [MiniMagick::Tool::Convert] It optionally yields the command,
     #   if you want to add something.
     # @return [self]
     #
-    def format(format, page = 0)
+    def format(format, page = 0, read_opts={})
       if @tempfile
         new_tempfile = MiniMagick::Utilities.tempfile(".#{format}")
         new_path = new_tempfile.path
@@ -347,6 +355,9 @@ module MiniMagick
       input_path << "[#{page}]" if page && !layer?
 
       MiniMagick::Tool::Convert.new do |convert|
+        read_opts.each do |opt, val|
+          convert.send(opt.to_s, val)
+        end
         convert << input_path
         yield convert if block_given?
         convert << new_path

data/lib/mini_magick/image/info.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module MiniMagick
   class Image
     # @private
@@ -27,6 +29,8 @@ module MiniMagick
           exif
         when "details"
           details
+        when "data"
+          data
         else
           raw(value)
         end
@@ -80,16 +84,29 @@ module MiniMagick
 
       def exif
         @info["exif"] ||= (
+          hash = {}
           output = self["%[EXIF:*]"]
-          pairs = output.gsub(/^exif:/, "").split("\n").map { |line| line.split("=") }
-          Hash[pairs].tap do |hash|
-            ASCII_ENCODED_EXIF_KEYS.each do |key|
-              next unless hash.has_key?(key)
 
-              value = hash[key]
-              hash[key] = decode_comma_separated_ascii_characters(value)
+          output.each_line do |line|
+            line = line.chomp("\n")
+
+            case MiniMagick.cli
+            when :imagemagick
+              if match = line.match(/^exif:/)
+                key, value = match.post_match.split("=", 2)
+                value = decode_comma_separated_ascii_characters(value) if ASCII_ENCODED_EXIF_KEYS.include?(key)
+                hash[key] = value
+              else
+                hash[hash.keys.last] << "\n#{line}"
+              end
+            when :graphicsmagick
+              key, value = line.split("=", 2)
+              value.gsub!("\\012", "\n") # convert "\012" characters to newlines
+              hash[key] = value
             end
           end
+
+          hash
         )
       end
 
@@ -102,6 +119,8 @@ module MiniMagick
       end
 
       def details
+        warn "[MiniMagick] MiniMagick::Image#details has been deprecated, as it was causing too many parsing errors. You should use MiniMagick::Image#data instead, which differs in a way that the keys are in camelcase." if MiniMagick.imagemagick?
+
         @info["details"] ||= (
           details_string = identify(&:verbose)
           key_stack = []
@@ -132,21 +151,39 @@ module MiniMagick
         )
       end
 
-      def identify
-        path = @path
-        path += "[0]" unless path =~ /\[\d+\]$/
+      def data
+        raise Error, "MiniMagick::Image#data isn't supported on GraphicsMagick. Use MiniMagick::Image#details instead." if MiniMagick.graphicsmagick?
+
+        @info["data"] ||= (
+          json = MiniMagick::Tool::Convert.new do |convert|
+            convert << path
+            convert << "json:"
+          end
 
+          JSON.parse(json).fetch("image")
+        )
+      end
+
+      def identify
         MiniMagick::Tool::Identify.new do |builder|
           yield builder if block_given?
           builder << path
         end
       end
 
+      private
+
       def decode_comma_separated_ascii_characters(encoded_value)
         return encoded_value unless encoded_value.include?(',')
         encoded_value.scan(/\d+/).map(&:to_i).map(&:chr).join
       end
 
+      def path
+        value = @path
+        value += "[0]" unless value =~ /\[\d+\]$/
+        value
+      end
+
     end
   end
 end

data/lib/mini_magick/tool.rb

@@ -200,6 +200,21 @@ module MiniMagick
       self << "-"
     end
 
+    ##
+    # Adds ImageMagick's pseudo-filename `-` for standard output.
+    #
+    # @example
+    #   content = MiniMagick::Tool::Convert.new do |convert|
+    #     convert << "input.jpg"
+    #     convert.auto_orient
+    #     convert.stdout
+    #   end
+    #   # executes `convert input.jpg -auto-orient -` which returns file contents
+    #
+    def stdout
+      self << "-"
+    end
+
     ##
     # Define creator operator methods
     #

data/lib/mini_magick/utilities.rb

@@ -14,7 +14,7 @@ module MiniMagick
     #
     def which(cmd)
       exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      ENV.fetch('PATH').split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
           exe = File.join(path, "#{cmd}#{ext}")
           return exe if File.executable? exe

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 5
-    TINY  = 1
+    MINOR = 6
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -117,4 +117,3 @@ signing_key:
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files: []
-has_rdoc: