mini_magick 3.5.0 → 3.6.0

data/lib/mini_magick.rb

@@ -7,6 +7,7 @@ require 'shellwords'
 module MiniMagick
   class << self
     attr_accessor :processor
+    attr_accessor :processor_path
     attr_accessor :timeout
 
 
@@ -106,8 +107,8 @@ module MiniMagick
         image = create(".dat", validate = false) { |f| f.write(blob) }
         # Use ImageMagick to convert the raw data file to an image file of the desired format:
         converted_image_path = image.path[0..-4] + format
-        argument = "-size #{columns}x#{rows} -depth #{depth} #{map}:#{image.path} #{converted_image_path}"
-        cmd = CommandBuilder.new("convert", argument) #Example: convert -size 256x256 -depth 16 gray:blob.dat blob.png
+        arguments = ["-size", "#{columns}x#{rows}", "-depth", "#{depth}", "#{map}:#{image.path}", "#{converted_image_path}"]
+        cmd = CommandBuilder.new("convert", *arguments) #Example: convert -size 256x256 -depth 16 gray:blob.dat blob.png
         image.run(cmd)
         # Update the image instance with the path of the properly formatted image, and return:
         image.path = converted_image_path
@@ -186,10 +187,6 @@ module MiniMagick
       @tempfile = tempfile # ensures that the tempfile will stick around until this image is garbage collected.
     end
 
-    def escaped_path
-      Pathname.new(@path).to_s.inspect
-    end
-
     # Checks to make sure that MiniMagick can read the file and understand it.
     #
     # This uses the 'identify' command line utility to check the file. If you are having
@@ -198,7 +195,7 @@ module MiniMagick
     #
     # @return [Boolean]
     def valid?
-      run_command("identify", @path)
+      run_command("identify", path)
       true
     rescue MiniMagick::Invalid
       false
@@ -224,29 +221,29 @@ module MiniMagick
       # Why do I go to the trouble of putting in newlines? Because otherwise animated gifs screw everything up
       case value.to_s
       when "colorspace"
-        run_command("identify", "-format", format_option("%r"), escaped_path).split("\n")[0].strip
+        run_command("identify", "-format", '%r\n', path).split("\n")[0].strip
       when "format"
-        run_command("identify", "-format", format_option("%m"), escaped_path).split("\n")[0]
+        run_command("identify", "-format", '%m\n', path).split("\n")[0]
       when "height"
-        run_command("identify", "-format", format_option("%h"), escaped_path).split("\n")[0].to_i
+        run_command("identify", "-format", '%h\n', path).split("\n")[0].to_i
       when "width"
-        run_command("identify", "-format", format_option("%w"), escaped_path).split("\n")[0].to_i
+        run_command("identify", "-format", '%w\n', path).split("\n")[0].to_i
       when "dimensions"
-        run_command("identify", "-format", format_option("%w %h"), escaped_path).split("\n")[0].split.map{|v|v.to_i}
+        run_command("identify", "-format", '%w %h\n', path).split("\n")[0].split.map{|v|v.to_i}
       when "size"
-        File.size(@path) # Do this because calling identify -format "%b" on an animated gif fails!
+        File.size(path) # Do this because calling identify -format "%b" on an animated gif fails!
       when "original_at"
         # Get the EXIF original capture as a Time object
         Time.local(*self["EXIF:DateTimeOriginal"].split(/:|\s+/)) rescue nil
       when /^EXIF\:/i
-        result = run_command('identify', '-format', "\"%[#{value}]\"", escaped_path).chop
+        result = run_command('identify', '-format', "%[#{value}]", path).chop
         if result.include?(",")
           read_character_data(result)
         else
           result
         end
       else
-        run_command('identify', '-format', "\"#{value}\"", escaped_path).split("\n")[0]
+        run_command('identify', '-format', value, path).split("\n")[0]
       end
     end
 
@@ -256,7 +253,7 @@ module MiniMagick
     #
     # @return [String] Whatever the result from the command line is. May not be terribly useful.
     def <<(*args)
-      run_command("mogrify", *args << escaped_path)
+      run_command("mogrify", *args << path)
     end
 
     # This is used to change the format of the image. That is, from "tiff to jpg" or something like that.
@@ -282,17 +279,17 @@ module MiniMagick
       c = CommandBuilder.new('mogrify', '-format', format)
       yield c if block_given?
       if page
-        c << @path + "[#{page}]"
+        c << "#{path}[#{page}]"
       else
-        c << @path
+        c << path
       end
       run(c)
 
-      old_path = @path.dup
-      @path.sub!(/(\.\w*)?$/, ".#{format}")
-      File.delete(old_path) if old_path != @path
+      old_path = path
+      self.path = path.sub(/(\.\w*)?$/, ".#{format}")
+      File.delete(old_path) if old_path != path
 
-      unless File.exists?(@path)
+      unless File.exists?(path)
         raise MiniMagick::Error, "Unable to format to #{format}"
       end
     end
@@ -311,10 +308,10 @@ module MiniMagick
     # Writes the temporary image that we are using for processing to the output path
     def write(output_to)
       if output_to.kind_of?(String) || !output_to.respond_to?(:write)
-        FileUtils.copy_file @path, output_to
-        run_command "identify", output_to.to_s.inspect # Verify that we have a good image
+        FileUtils.copy_file path, output_to
+        run_command "identify", output_to.to_s # Verify that we have a good image
       else # stream
-        File.open(@path, "rb") do |f|
+        File.open(path, "rb") do |f|
           f.binmode
           while chunk = f.read(8192)
             output_to.write(chunk)
@@ -327,7 +324,7 @@ module MiniMagick
     # Gives you raw image data back
     # @return [String] binary string
     def to_blob
-      f = File.new @path
+      f = File.new path
       f.binmode
       f.read
     ensure
@@ -360,17 +357,12 @@ module MiniMagick
     def combine_options(tool = "mogrify", &block)
       c = CommandBuilder.new(tool)
 
-      c << @path if tool.to_s == "convert"
+      c << path if tool.to_s == "convert"
       block.call(c)
-      c << @path
+      c << path
       run(c)
     end
 
-    # Check to see if we are running on win32 -- we need to escape things differently
-    def windows?
-      RUBY_PLATFORM =~ /mswin|mingw|cygwin/
-    end
-
     def composite(other_image, output_extension = 'jpg', &block)
       begin
         second_tempfile = Tempfile.new(output_extension)
@@ -389,11 +381,6 @@ module MiniMagick
       return Image.new(second_tempfile.path, second_tempfile)
     end
 
-    # Outputs a carriage-return delimited format string for Unix and Windows
-    def format_option(format)
-      windows? ? "\"#{format}\\n\"" : "\"#{format}\\\\n\""
-    end
-
     def run_command(command, *args)
       # -ping "efficiently determine image characteristics."
       if command == 'identify'
@@ -445,8 +432,6 @@ module MiniMagick
   end
 
   class CommandBuilder
-    attr_reader :args
-
     def initialize(tool, *options)
       @tool = tool
       @args = []
@@ -454,7 +439,15 @@ module MiniMagick
     end
 
     def command
-      "#{MiniMagick.processor} #{@tool} #{@args.join(' ')}".strip
+      com = "#{@tool} #{args.join(' ')}".strip
+      com = "#{MiniMagick.processor} #{com}" unless MiniMagick.processor.nil?
+
+      com = File.join MiniMagick.processor_path, com unless MiniMagick.processor_path.nil?
+      com.strip
+    end
+
+    def args
+      @args.map(&:shellescape)
     end
 
     # Add each mogrify command in both underscore and dash format
@@ -493,7 +486,7 @@ module MiniMagick
       push(@args.pop.gsub(/^-/, '+'))
       if options.any?
         options.each do |o|
-          push escape_string(o)
+          push o
         end
       end
     end
@@ -502,15 +495,11 @@ module MiniMagick
       push "-#{command}"
       if options.any?
         options.each do |o|
-          push escape_string(o)
+          push o
         end
       end
     end
 
-    def escape_string(value)
-      Shellwords.escape(value.to_s)
-    end
-
     def add_creation_operator(command, *options)
       creation_command = command
       if options.any?

data/lib/mini_magick/version.rb

@@ -1,3 +1,3 @@
 module MiniMagick
-  VERSION = "3.5.0"
+  VERSION = "3.6.0"
 end

data/test/command_builder_test.rb

@@ -3,6 +3,16 @@ require 'test_helper'
 class CommandBuilderTest < Test::Unit::TestCase
   include MiniMagick
 
+  def setup
+    @processor_path = MiniMagick.processor_path
+    @processor = MiniMagick.processor
+  end
+
+  def teardown
+    MiniMagick.processor_path = @processor_path
+    MiniMagick.processor = @processor
+  end
+
   def test_basic
     c = CommandBuilder.new("test")
     c.resize "30x40"
@@ -26,7 +36,7 @@ class CommandBuilderTest < Test::Unit::TestCase
   def test_plus_modifier_and_multiple_options
     c = CommandBuilder.new("test")
     c.distort.+ 'srt', '0.6 20'
-    assert_equal '+distort srt 0.6\ 20', c.args.join(" ")
+    assert_equal '\+distort srt 0.6\ 20', c.args.join(" ")
   end
 
   def test_valid_command
@@ -63,4 +73,18 @@ class CommandBuilderTest < Test::Unit::TestCase
     assert_equal 'test -set colorspace\ RGB', c.command
   end
 
+  def test_processor_path
+    MiniMagick.processor_path = "/a/strange/path"
+    c = CommandBuilder.new('test')
+    c.auto_orient
+    assert_equal c.command, "/a/strange/path/test -auto-orient"
+  end
+
+  def test_processor_path_with_processor
+    MiniMagick.processor_path = "/a/strange/path"
+    MiniMagick.processor = "processor"
+    c = CommandBuilder.new('test')
+    c.auto_orient
+    assert_equal c.command, "/a/strange/path/processor test -auto-orient"
+  end
 end

data/test/image_test.rb

@@ -199,6 +199,16 @@ class ImageTest < Test::Unit::TestCase
     image.destroy!
   end
 
+  def test_image_combine_options_with_filename_with_special_characters_in_it
+    image = Image.new(SPECIAL_CHARS_IMAGE_PATH)
+    assert_nothing_raised do
+      image.combine_options("identify") do |c|
+        c.ping
+      end
+    end
+    image.destroy!
+  end
+
   def test_exif
     image = Image.open(EXIF_IMAGE_PATH)
     assert_equal('0220', image["exif:ExifVersion"])
@@ -236,6 +246,23 @@ class ImageTest < Test::Unit::TestCase
     image.destroy!
   end
 
+  def test_change_format_of_image_with_special_characters
+    tempfile = Tempfile.new('magick with special! "chars\'')
+
+    File.open(SIMPLE_IMAGE_PATH, 'rb') do |f|
+      tempfile.write(f.read)
+      tempfile.rewind
+    end
+
+    image = Image.new(tempfile.path)
+    image.format('png')
+    assert File.exists?(image.path)
+    image.destroy!
+
+    File.delete(image.path)
+    tempfile.unlink
+  end
+
   def test_bad_method_bug
     image = Image.open(TIFF_IMAGE_PATH)
     begin

data/test/test_helper.rb

@@ -7,15 +7,16 @@ require File.expand_path('../../lib/mini_magick', __FILE__)
 
 module MiniMagickTestFiles
   test_files = File.expand_path(File.dirname(__FILE__) + "/files")
-  SIMPLE_IMAGE_PATH    = test_files + "/simple.gif"
-  MINUS_IMAGE_PATH     = test_files + "/simple-minus.gif"
-  TIFF_IMAGE_PATH      = test_files + "/leaves (spaced).tiff"
-  NOT_AN_IMAGE_PATH    = test_files + "/not_an_image.php"
-  GIF_WITH_JPG_EXT     = test_files + "/actually_a_gif.jpg"
-  EXIF_IMAGE_PATH      = test_files + "/trogdor.jpg"
-  CAP_EXT_PATH         = test_files + "/trogdor_capitalized.JPG"
-  ANIMATION_PATH       = test_files + "/animation.gif"
-  PNG_PATH             = test_files + "/png.png"
-  COMP_IMAGE_PATH      = test_files + "/composited.jpg"
-  ERRONEOUS_IMAGE_PATH = test_files + "/erroneous.jpg"
+  SIMPLE_IMAGE_PATH        = test_files + "/simple.gif"
+  MINUS_IMAGE_PATH         = test_files + "/simple-minus.gif"
+  SPECIAL_CHARS_IMAGE_PATH = test_files + "/special! \"chars'.gif"
+  TIFF_IMAGE_PATH          = test_files + "/leaves (spaced).tiff"
+  NOT_AN_IMAGE_PATH        = test_files + "/not_an_image.php"
+  GIF_WITH_JPG_EXT         = test_files + "/actually_a_gif.jpg"
+  EXIF_IMAGE_PATH          = test_files + "/trogdor.jpg"
+  CAP_EXT_PATH             = test_files + "/trogdor_capitalized.JPG"
+  ANIMATION_PATH           = test_files + "/animation.gif"
+  PNG_PATH                 = test_files + "/png.png"
+  COMP_IMAGE_PATH          = test_files + "/composited.jpg"
+  ERRONEOUS_IMAGE_PATH     = test_files + "/erroneous.jpg"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subexec
@@ -85,6 +85,7 @@ files:
 - test/files/png.png
 - test/files/simple-minus.gif
 - test/files/simple.gif
+- test/files/special! "chars'.gif
 - test/files/trogdor.jpg
 - test/files/trogdor_capitalized.JPG
 - test/image_test.rb
@@ -109,7 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- You must have ImageMagick or GraphicsMagick installed
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
@@ -126,9 +128,11 @@ test_files:
 - test/files/png.png
 - test/files/simple-minus.gif
 - test/files/simple.gif
+- test/files/special! "chars'.gif
 - test/files/trogdor.jpg
 - test/files/trogdor_capitalized.JPG
 - test/image_test.rb
 - test/leaves (spaced).tiff
 - test/test_helper.rb
 - test/trogdor_capitalized.JPG
+has_rdoc: