mini_magick 4.3.6 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d7353bb4abb1f24f782090a89632e2697cc8f77
-  data.tar.gz: ec2f0d8462829f39796474f292c4d06ef9f7ec35
+  metadata.gz: b47a71b858d75780aca2cad04723b23ebbe03f43
+  data.tar.gz: 0435a6885e082c68913235ddad9219590e6d3400
 SHA512:
-  metadata.gz: 9ceb0494e0c4d9f568482d2c7c8249ed91e01931ddfffd8e119df1de379e4f35343ba5c40af38daa4b021d359a3d44e4c3ab6e86e096d97487e9beb387697a55
-  data.tar.gz: 9bba8837c2ee3f10751932dee4afcd46724392d7e04a01ee1527aacb8c7043a092e7de7067f85e194da9e8cfeeff03a4d9ec11ea04c93151e8e020983bc0bd20
+  metadata.gz: 41be6f64c5a0190da1b04e16c90bcd6c68133b165a8f8515d9231d17a8da3f6900965e7147643b8beae9515b2ab08cd23229f845e1b2dba69473374ceb7e68fc
+  data.tar.gz: 6eb28519339d44d5f658d4492708ebd459124c32bc0606a9fc9a2308de8eb442d0b11374bf9f486b7111f15ba05384dca346151ef410fb2bb082860a00d9ab7a

data/lib/mini_magick/configuration.rb

@@ -1,4 +1,5 @@
 require 'mini_magick/utilities'
+require 'logger'
 
 module MiniMagick
   module Configuration
@@ -86,6 +87,7 @@ module MiniMagick
       base.validate_on_write = true
       base.whiny = true
       base.shell_api = "open3"
+      base.logger = Logger.new($stdout).tap { |l| l.level = Logger::INFO }
     end
 
     ##
@@ -140,13 +142,14 @@ module MiniMagick
       @cli_path || @processor_path
     end
 
-    def logger
-      @logger || MiniMagick::Logger.new($stdout)
+    def debug=(value)
+      warn "MiniMagick.debug is deprecated and will be removed in MiniMagick 5. Use `MiniMagick.logger.level = Logger::DEBUG` instead."
+      logger.level = value ? Logger::DEBUG : Logger::INFO
     end
 
     # Backwards compatibility
     def reload_tools
-      warn "[MiniMagick] MiniMagick.reload_tools is deprecated because it is no longer necessary"
+      warn "MiniMagick.reload_tools is deprecated because it is no longer necessary"
     end
 
   end

data/lib/mini_magick/image/info.rb

@@ -106,9 +106,19 @@ module MiniMagick
           details_string = identify(&:verbose)
           key_stack = []
           details_string.lines.to_a[1..-1].each_with_object({}) do |line, details_hash|
-            next if line.strip.length.zero?
+            next if !line.valid_encoding? || line.strip.length.zero?
+
             level = line[/^\s*/].length / 2 - 1
-            key_stack.pop until key_stack.size <= level
+            if level >= 0
+              key_stack.pop until key_stack.size <= level
+            else
+              # Some metadata, such as SVG clipping paths, will be saved without
+              # indentation, resulting in a level of -1
+              last_key = details_hash.keys.last
+              details_hash[last_key] = '' if details_hash[last_key].empty?
+              details_hash[last_key] << line
+              next
+            end
 
             key, _, value = line.partition(/:[\s\n]/).map(&:strip)
             hash = key_stack.inject(details_hash) { |hash, key| hash.fetch(key) }

data/lib/mini_magick/image.rb

@@ -133,6 +133,10 @@ module MiniMagick
     # @return [String] The location of the current working file
     #
     attr_reader :path
+    ##
+    # @return [Tempfile] The underlying temporary file
+    #
+    attr_reader :tempfile
 
     ##
     # Create a new {MiniMagick::Image} object.
@@ -336,20 +340,23 @@ module MiniMagick
         new_tempfile = MiniMagick::Utilities.tempfile(".#{format}")
         new_path = new_tempfile.path
       else
-        new_path = path.sub(/(\.\w+)?$/, ".#{format}")
+        new_path = Pathname(path).sub_ext(".#{format}").to_s
       end
 
+      input_path = path.dup
+      input_path << "[#{page}]" if page && !layer?
+
       MiniMagick::Tool::Convert.new do |convert|
-        convert << (page ? "#{path}[#{page}]" : path)
+        convert << input_path
         yield convert if block_given?
         convert << new_path
       end
 
       if @tempfile
-        @tempfile.unlink
+        destroy!
         @tempfile = new_tempfile
       else
-        File.delete(path) unless path == new_path
+        File.delete(path) unless path == new_path || layer?
       end
 
       path.replace new_path
@@ -459,7 +466,10 @@ module MiniMagick
     # Destroys the tempfile (created by {.open}) if it exists.
     #
     def destroy!
-      @tempfile.unlink if @tempfile
+      if @tempfile
+        FileUtils.rm_f @tempfile.path.sub(/mpc$/, "cache") if @tempfile.path.end_with?(".mpc")
+        @tempfile.unlink
+      end
     end
 
     ##

data/lib/mini_magick/shell.rb

@@ -1,5 +1,5 @@
-require "mini_magick/logger"
 require "timeout"
+require "benchmark"
 
 module MiniMagick
   ##
@@ -11,25 +11,25 @@ module MiniMagick
   class Shell
 
     def run(command, options = {})
-      stdout, stderr, code = execute(command)
+      stdout, stderr, status = execute(command, stdin: options[:stdin])
 
-      case code
+      case status
       when 1
         fail MiniMagick::Error, "`#{command.join(" ")}` failed with error:\n#{stderr}"
       when 127
         fail MiniMagick::Error, stderr
-      end if options.fetch(:whiny, true)
+      end if options.fetch(:whiny, MiniMagick.whiny)
 
       $stderr.print(stderr) unless options[:stderr] == false
 
-      stdout
+      [stdout, stderr, status]
     end
 
-    def execute(command)
+    def execute(command, options = {})
       stdout, stderr, status =
-        MiniMagick.logger.debug(command.join(" ")) do
+        log(command.join(" ")) do
           Timeout.timeout(MiniMagick.timeout) do
-            send("execute_#{MiniMagick.shell_api.gsub("-", "_")}", *command)
+            send("execute_#{MiniMagick.shell_api.gsub("-", "_")}", command, options)
           end
         end
 
@@ -38,18 +38,31 @@ module MiniMagick
       ["", "executable not found: \"#{command.first}\"", 127]
     end
 
-    def execute_open3(*command)
+    private
+
+    def execute_open3(command, options = {})
       require "open3"
-      Open3.capture3(*command)
+
+      Open3.capture3(*command, binmode: true, stdin_data: options[:stdin].to_s)
     end
 
-    def execute_posix_spawn(*command)
+    def execute_posix_spawn(command, options = {})
       require "posix-spawn"
+
       pid, stdin, stdout, stderr = POSIX::Spawn.popen4(*command)
+      [stdin, stdout, stderr].each(&:binmode)
+      stdin.write(options[:stdin].to_s)
       Process.waitpid(pid)
 
       [stdout.read, stderr.read, $?]
     end
 
+    def log(command, &block)
+      value = nil
+      duration = Benchmark.realtime { value = block.call }
+      MiniMagick.logger.debug "[%.2fs] %s" % [duration, command]
+      value
+    end
+
   end
 end

data/lib/mini_magick/tool.rb

@@ -49,13 +49,15 @@ module MiniMagick
     # @param whiny [Boolean] Whether to raise errors on exit codes different
     #   than 0.
     # @example
-    #   MiniMagick::Tool::Identify.new(false) do |identify|
+    #   MiniMagick::Tool::Identify.new(whiny: false) do |identify|
     #     identify.help # returns exit status 1, which would otherwise throw an error
     #   end
-    def initialize(name, whiny = MiniMagick.whiny)
+    def initialize(name, options = {})
+      warn "MiniMagick::Tool.new(false) is deprecated and will be removed in MiniMagick 5, use MiniMagick::Tool.new(whiny: false) instead." if !options.is_a?(Hash)
+
       @name  = name
-      @whiny = whiny
       @args  = []
+      @whiny = options.is_a?(Hash) ? options.fetch(:whiny, MiniMagick.whiny) : options
     end
 
     ##
@@ -67,16 +69,30 @@ module MiniMagick
     #   mogrify << "path/to/image.jpg"
     #   mogrify.call # executes `mogrify -resize 500x500 path/to/image.jpg`
     #
-    # @param whiny [Boolean] Whether you want an error to be raised when
-    #   ImageMagick returns an exit code of 1. You may want this because
-    #   some ImageMagick's commands (`identify -help`) return exit code 1,
-    #   even though no error happened.
+    # @example
+    #   mogrify = MiniMagick::Tool::Mogrify.new
+    #   # build the command
+    #   mogrify.call do |stdout, stderr, status|
+    #     # ...
+    #   end
+    #
+    # @yield [Array] Optionally yields stdout, stderr, and exit status
     #
-    # @return [String] Output of the command
+    # @return [String] Returns the output of the command
     #
-    def call(whiny = @whiny, options = {})
+    def call(*args)
+      options = args[-1].is_a?(Hash) ? args.pop : {}
+      warn "Passing whiny to MiniMagick::Tool#call is deprecated and will be removed in MiniMagick 5, use MiniMagick::Tool.new(whiny: false) instead." if args.any?
+      whiny = args.fetch(0, @whiny)
+
+      options[:whiny] = whiny
+      options[:stderr] = false if block_given?
+
       shell = MiniMagick::Shell.new
-      shell.run(command, options.merge(whiny: whiny)).strip
+      stdout, stderr, status = shell.run(command, options)
+      yield stdout, stderr, status if block_given?
+
+      stdout.strip
     end
 
     ##
@@ -171,6 +187,19 @@ module MiniMagick
       self << ")"
     end
 
+    ##
+    # Adds ImageMagick's pseudo-filename `-` for standard input.
+    #
+    # @example
+    #   identify = MiniMagick::Tool::Identify.new
+    #   identify.stdin
+    #   identify.call(stdin: image_content)
+    #   # executes `identify -` with the given standard input
+    #
+    def stdin
+      self << "-"
+    end
+
     ##
     # Define creator operator methods
     #
@@ -185,6 +214,16 @@ module MiniMagick
       end
     end
 
+    ##
+    # This option is a valid ImageMagick option, but it's also a Ruby method,
+    # so we need to override it so that it correctly acts as an option method.
+    #
+    def clone(*args)
+      self << '-clone'
+      self.merge!(args)
+      self
+    end
+
     ##
     # Any undefined method will be transformed into a CLI option
     #
@@ -206,9 +245,9 @@ module MiniMagick
 
     def self.option_methods
       @option_methods ||= (
-        tool = new
+        tool = new(whiny: false)
         tool << "-help"
-        help_page = tool.call(false, stderr: false)
+        help_page = tool.call(stderr: false)
 
         cli_options = help_page.scan(/^\s+-[a-z\-]+/).map(&:strip)
         if tool.name == "mogrify" && MiniMagick.graphicsmagick?

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 3
-    TINY  = 6
+    MINOR = 5
+    TINY  = 1
     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.3.6
+  version: 4.5.1
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,7 +76,6 @@ files:
 - lib/mini_magick/configuration.rb
 - lib/mini_magick/image.rb
 - lib/mini_magick/image/info.rb
-- lib/mini_magick/logger.rb
 - lib/mini_magick/shell.rb
 - lib/mini_magick/tool.rb
 - lib/mini_magick/tool/animate.rb
@@ -113,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick

data/lib/mini_magick/logger.rb

@@ -1,38 +0,0 @@
-require "benchmark"
-
-module MiniMagick
-  ##
-  # Responsible for logging commands to stdout (activated when
-  # `MiniMagick.debug` is set to `true`). Implements a simplified Logger
-  # interface.
-  #
-  # @private
-  #
-  class Logger
-
-    attr_accessor :format
-
-    def initialize(io)
-      @io     = io
-      @format = "[%<duration>.2fs] %<command>s"
-    end
-
-    def debug(command, &action)
-      benchmark(action) do |duration|
-        output(duration: duration, command: command) if MiniMagick.debug
-      end
-    end
-
-    def output(data)
-      printf @io, "#{format}\n", data
-    end
-
-    def benchmark(action)
-      return_value = nil
-      duration = Benchmark.realtime { return_value = action.call }
-      yield duration
-      return_value
-    end
-
-  end
-end