mini_magick 3.4 → 3.6.0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005 Corey Johnson probablycorey@gmail.com
+Copyright (c) 2005-2013 Corey Johnson probablycorey@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mini_magick/version.rb

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

data/lib/mini_magick.rb

@@ -2,10 +2,12 @@ require 'tempfile'
 require 'subexec'
 require 'stringio'
 require 'pathname'
+require 'shellwords'
 
 module MiniMagick
   class << self
     attr_accessor :processor
+    attr_accessor :processor_path
     attr_accessor :timeout
 
 
@@ -20,21 +22,21 @@ module MiniMagick
         self.processor = "gm"
       end
     end
-    
+
     def image_magick_version
       @@version ||= Gem::Version.create(`mogrify --version`.split(" ")[2].split("-").first)
     end
-    
+
     def minimum_image_magick_version
       @@minimum_version ||= Gem::Version.create("6.6.3")
     end
-    
+
     def valid_version_installed?
       image_magick_version >= minimum_image_magick_version
     end
   end
 
-  MOGRIFY_COMMANDS = %w{adaptive-blur adaptive-resize adaptive-sharpen adjoin affine alpha annotate antialias append authenticate auto-gamma auto-level auto-orient background bench iterations bias black-threshold blue-primary point blue-shift factor blur border bordercolor brightness-contrast caption string cdl filename channel type charcoal radius chop clip clamp clip-mask filename clip-path id clone index clut contrast-stretch coalesce colorize color-matrix colors colorspace type combine comment string compose operator composite compress type contrast convolve coefficients crop cycle amount decipher filename debug events define format:option deconstruct delay delete index density depth despeckle direction type dissolve display server dispose method distort type coefficients dither method draw string edge radius emboss radius encipher filename encoding type endian type enhance equalize evaluate operator evaluate-sequence operator extent extract family name fft fill filter type flatten flip floodfill flop font name format string frame function name fuzz distance fx expression gamma gaussian-blur geometry gravity type green-primary point help identify ifft implode amount insert index intent type interlace type interline-spacing interpolate method interword-spacing kerning label string lat layers method level limit type linear-stretch liquid-rescale log format loop iterations mask filename mattecolor median radius modulate monitor monochrome morph morphology method kernel motion-blur negate noise radius normalize opaque ordered-dither NxN orient type page paint radius ping pointsize polaroid angle posterize levels precision preview type print string process image-filter profile filename quality quantize quiet radial-blur angle raise random-threshold low,high red-primary point regard-warnings region remap filename render repage resample resize respect-parentheses roll rotate degrees sample sampling-factor scale scene seed segments selective-blur separate sepia-tone threshold set attribute shade degrees shadow sharpen shave shear sigmoidal-contrast size sketch solarize threshold splice spread radius strip stroke strokewidth stretch type style type swap indexes swirl degrees texture filename threshold thumbnail tile filename tile-offset tint transform transparent transparent-color transpose transverse treedepth trim type type undercolor unique-colors units type unsharp verbose version view vignette virtual-pixel method wave weight type white-point point white-threshold write filename}
+  MOGRIFY_COMMANDS = %w{adaptive-blur adaptive-resize adaptive-sharpen adjoin affine alpha annotate antialias append attenuate authenticate auto-gamma auto-level auto-orient backdrop background bench bias black-point-compensation black-threshold blend blue-primary blue-shift blur border bordercolor borderwidth brightness-contrast cache caption cdl channel charcoal chop clamp clip clip-mask clip-path clone clut coalesce colorize colormap color-matrix colors colorspace combine comment compose composite compress contrast contrast-stretch convolve crop cycle debug decipher deconstruct define delay delete density depth descend deskew despeckle direction displace display dispose dissimilarity-threshold dissolve distort dither draw duplicate edge emboss encipher encoding endian enhance equalize evaluate evaluate-sequence extent extract family features fft fill filter flatten flip floodfill flop font foreground format frame function fuzz fx gamma gaussian-blur geometry gravity green-primary hald-clut help highlight-color iconGeometry iconic identify ift immutable implode insert intent interlace interpolate interline-spacing interword-spacing kerning label lat layers level level-colors limit linear-stretch linewidth liquid-rescale list log loop lowlight-color magnify map mask mattecolor median metric mode modulate monitor monochrome morph morphology mosaic motion-blur name negate noise normalize opaque ordered-dither orient page paint path pause pen perceptible ping pointsize polaroid poly posterize precision preview print process profile quality quantize quiet radial-blur raise random-threshold red-primary regard-warnings region remap remote render repage resample resize respect-parentheses reverse roll rotate sample sampling-factor scale scene screen seed segment selective-blur separate sepia-tone set shade shadow shared-memory sharpen shave shear sigmoidal-contrast silent size sketch smush snaps solarize sparse-color splice spread statistic stegano stereo stretch strip stroke strokewidth style subimage-search swap swirl synchronize taint text-font texture threshold thumbnail tile tile-offset tint title transform transparent transparent-color transpose transverse treedepth trim type undercolor unique-colors units unsharp update verbose version view vignette virtual-pixel visual watermark wave weight white-point white-threshold window window-group write}
 
   IMAGE_CREATION_OPERATORS = %w{canvas caption gradient label logo pattern plasma radial radient rose text tile xc }
 
@@ -62,7 +64,9 @@ module MiniMagick
       def read(stream, ext = nil)
         if stream.is_a?(String)
           stream = StringIO.new(stream)
-        elsif stream.is_a?(File)
+        elsif stream.is_a?(StringIO)
+          # Do nothing, we want a StringIO-object
+        elsif stream.respond_to? :path
           if File.respond_to?(:binread)
             stream = StringIO.new File.binread(stream.path.to_s)
           else
@@ -103,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
@@ -183,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
@@ -195,7 +195,7 @@ module MiniMagick
     #
     # @return [Boolean]
     def valid?
-      run_command("identify", @path)
+      run_command("identify", path)
       true
     rescue MiniMagick::Invalid
       false
@@ -221,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", "-quiet", "-format", format_option("%r"), escaped_path).split("\n")[0]
+        run_command("identify", "-format", '%r\n', path).split("\n")[0].strip
       when "format"
-        run_command("identify", "-quiet", "-format", format_option("%m"), escaped_path).split("\n")[0]
+        run_command("identify", "-format", '%m\n', path).split("\n")[0]
       when "height"
-        run_command("identify", "-quiet", "-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", "-quiet", "-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", "-quiet", "-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', '-quiet', '-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', '-quiet', '-format', "\"#{value}\"", escaped_path).split("\n")[0]
+        run_command('identify', '-format', value, path).split("\n")[0]
       end
     end
 
@@ -253,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.
@@ -267,29 +267,30 @@ module MiniMagick
     # pages (starting with 0).  You can choose which page you want to manipulate.  We default to the
     # first page.
     #
+    # If you would like to convert between animated formats, pass nil as your
+    # page and ImageMagick will copy all of the pages.
+    #
     # @param format [String] The target format... like 'jpg', 'gif', 'tiff', etc.
-    # @param page [Integer] If this is an animated gif, say which 'page' you want with an integer. Leave as default if you don't care.
+    # @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.
     # @return [nil]
     def format(format, page = 0)
       c = CommandBuilder.new('mogrify', '-format', format)
       yield c if block_given?
-      c << @path
+      if page
+        c << "#{path}[#{page}]"
+      else
+        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)
-        begin
-          FileUtils.copy_file(@path.sub(".#{format}", "-#{page}.#{format}"), @path)
-        rescue => ex
-          raise MiniMagick::Error, "Unable to format to #{format}; #{ex}" unless File.exist?(@path)
-        end
-      end
-    ensure
-      Dir[@path.sub(/(\.\w+)?$/, "-[0-9]*.#{format}")].each do |fname|
-        File.unlink(fname)
+      unless File.exists?(path)
+        raise MiniMagick::Error, "Unable to format to #{format}"
       end
     end
 
@@ -307,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)
@@ -323,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
@@ -339,7 +340,7 @@ module MiniMagick
     # Look here to find all the commands (http://www.imagemagick.org/script/mogrify.php)
     def method_missing(symbol, *args)
       combine_options do |c|
-        c.method_missing(symbol, *args)
+        c.send(symbol, *args)
       end
     end
 
@@ -353,20 +354,15 @@ module MiniMagick
     #   end
     #
     # @yieldparam command [CommandBuilder]
-    def combine_options(tool = :mogrify, &block)
+    def combine_options(tool = "mogrify", &block)
       c = CommandBuilder.new(tool)
 
-      c << @path if tool == :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)
@@ -385,15 +381,11 @@ 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'
         args.unshift '-ping'
+        args.unshift '-quiet' unless MiniMagick.processor.to_s == 'gm'
       end
 
       run(CommandBuilder.new(command, *args))
@@ -440,31 +432,53 @@ module MiniMagick
   end
 
   class CommandBuilder
-    attr :args
-    attr :command
-
-    def initialize(command, *options)
-      @command = command
+    def initialize(tool, *options)
+      @tool = tool
       @args = []
       options.each { |arg| push(arg) }
     end
 
     def command
-      "#{MiniMagick.processor} #{@command} #{@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
 
-    def method_missing(symbol, *options)
-      guessed_command_name = symbol.to_s.gsub('_','-')
-      if guessed_command_name == "format"
-        raise Error, "You must call 'format' on the image object directly!"
-      elsif MOGRIFY_COMMANDS.include?(guessed_command_name)
-        add_command(guessed_command_name, *options)
+    # Add each mogrify command in both underscore and dash format
+    MOGRIFY_COMMANDS.each do |mogrify_command|
+
+      # Example of what is generated here:
+      #
+      # def auto_orient(*options)
+      #   add_command("auto-orient", *options)
+      #   self
+      # end
+      # alias_method :"auto-orient", :auto_orient
+
+      dashed_command      = mogrify_command.to_s.gsub("_","-")
+      underscored_command = mogrify_command.to_s.gsub("-","_")
+
+      define_method(underscored_command) do |*options|
+        add_command(__method__.to_s.gsub("_","-"), *options)
         self
-      elsif IMAGE_CREATION_OPERATORS.include?(guessed_command_name)
-        add_creation_operator(guessed_command_name, *options)
+      end
+      alias_method dashed_command, underscored_command
+    end
+
+    def format(*options)
+      raise Error, "You must call 'format' on the image object directly!"
+    end
+
+    IMAGE_CREATION_OPERATORS.each do |operator|
+      define_method operator do |*options|
+        add_creation_operator(__method__.to_s, *options)
         self
-      else
-        super(symbol, *args)
       end
     end
 
@@ -472,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
@@ -481,14 +495,10 @@ module MiniMagick
       push "-#{command}"
       if options.any?
         options.each do |o|
-          push escape_string(o)
+          push o
         end
       end
     end
-    
-    def escape_string(value)
-      '"' + value + '"'
-    end
 
     def add_creation_operator(command, *options)
       creation_command = command

data/test/command_builder_test.rb

@@ -3,10 +3,26 @@ 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"
-    assert_equal "-resize \"30x40\"", c.args.join(" ")
+    assert_equal '-resize 30x40', c.args.join(" ")
+  end
+
+  def test_full_command
+    c = CommandBuilder.new("test")
+    c.resize "30x40"
+    assert_equal "test -resize 30x40", c.command
   end
 
   def test_complicated
@@ -14,15 +30,15 @@ class CommandBuilderTest < Test::Unit::TestCase
     c.resize "30x40"
     c.alpha "1 3 4"
     c.resize "mome fingo"
-    assert_equal "-resize \"30x40\" -alpha \"1 3 4\" -resize \"mome fingo\"", c.args.join(" ")
+    assert_equal '-resize 30x40 -alpha 1\ 3\ 4 -resize mome\ fingo', c.args.join(" ")
   end
 
   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
     begin
       c = CommandBuilder.new("test", "path")
@@ -38,10 +54,37 @@ class CommandBuilderTest < Test::Unit::TestCase
     c.auto_orient
     assert_equal "-auto-orient", c.args.join(" ")
   end
-  
+
+  def test_dashed_via_send
+    c = CommandBuilder.new("test")
+    c.send("auto-orient")
+    assert_equal "-auto-orient", c.args.join(" ")
+  end
+
   def test_canvas
     c = CommandBuilder.new('test')
     c.canvas 'black'
     assert_equal "canvas:black", c.args.join
   end
+
+  def test_set
+    c = CommandBuilder.new("test")
+    c.set "colorspace RGB"
+    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

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'digest/md5'
 
 #MiniMagick.processor = :gm
 
@@ -14,6 +15,19 @@ class ImageTest < Test::Unit::TestCase
     end
   end
 
+  def test_image_from_tempfile
+    tempfile = Tempfile.new('magick')
+
+    File.open(SIMPLE_IMAGE_PATH, 'rb') do |f|
+      tempfile.write(f.read)
+      tempfile.rewind
+    end
+
+    image = Image.read(tempfile)
+    assert image.valid?
+    image.destroy!
+  end
+
   def test_image_open
     image = Image.open(SIMPLE_IMAGE_PATH)
     assert image.valid?
@@ -52,7 +66,7 @@ class ImageTest < Test::Unit::TestCase
     assert image.valid?
     image.destroy!
   end
-  
+
   def test_reformat_with_capitalized_extension
     image = Image.open(CAP_EXT_PATH)
     image.format "jpg"
@@ -111,11 +125,20 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 150, image[:width]
     assert_equal 55, image[:height]
     assert_equal [150, 55], image[:dimensions]
-    assert_equal 'PseudoClassRGB', image[:colorspace]
+    assert_true String == image[:colorspace].class
     assert_match(/^gif$/i, image[:format])
     image.destroy!
   end
 
+  def test_erroneous_image_meta_info
+    image = Image.new(ERRONEOUS_IMAGE_PATH)
+    assert_equal 10, image[:width]
+    assert_equal 10, image[:height]
+    assert_equal [10, 10], image[:dimensions]
+    assert_equal('JPEG', image[:format])
+    image.destroy!
+  end
+
   def test_tiff
     image = Image.new(TIFF_IMAGE_PATH)
     assert_equal "tiff", image[:format].to_s.downcase
@@ -176,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"])
@@ -213,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
@@ -231,16 +281,10 @@ class ImageTest < Test::Unit::TestCase
       result = image.composite(Image.open(TIFF_IMAGE_PATH)) do |c|
         c.gravity "center"
       end
-      assert `diff -s #{result.path} test/files/composited.jpg`.include?("identical")
+      assert_true File.exists?(result.path)
     else
       puts "Need at least version #{MiniMagick.minimum_image_magick_version} of ImageMagick"
     end
-    #TODO - need to write test that works cross platform
-    #I thought the following would work but there is a 4 byte difference between the files.
-    #Not sure if it's caused from this test breaking for the right reason though..
-    #assert File.identical?(result.path, COMP_IMAGE_PATH)
-    #This following test will only work on Linux
-    assert `diff -s #{result.path} #{COMP_IMAGE_PATH}`.include?("identical") unless RUBY_PLATFORM =~ /mswin|mingw|cygwin/
   end
 
   # http://github.com/probablycorey/mini_magick/issues#issue/8
@@ -330,7 +374,7 @@ class ImageTest < Test::Unit::TestCase
     png =         Image.open(PNG_PATH)
     tiff =        Image.open(TIFF_IMAGE_PATH)
     hidden_gif =  Image.open(GIF_WITH_JPG_EXT)
-    
+
     assert_equal "image/gif",   gif.mime_type
     assert_equal "image/jpeg",  jpeg.mime_type
     assert_equal "image/png",   png.mime_type

data/test/test_helper.rb

@@ -7,14 +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"
+  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.4'
+  version: 3.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subexec
-  requirement: &70171864234000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70171864234000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70171864233600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171864233600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70171864233140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +55,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171864233140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - probablycorey@gmail.com
@@ -55,28 +70,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.rdoc
-- VERSION
 - MIT-LICENSE
 - Rakefile
 - lib/mini_gmagick.rb
+- lib/mini_magick/version.rb
 - lib/mini_magick.rb
 - test/command_builder_test.rb
 - test/files/actually_a_gif.jpg
 - test/files/animation.gif
 - test/files/composited.jpg
+- test/files/erroneous.jpg
 - test/files/leaves (spaced).tiff
 - test/files/not_an_image.php
 - 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
-homepage: http://github.com/probablycorey/mini_magick
+homepage: https://github.com/minimagick/minimagick
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -94,9 +110,10 @@ 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.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
@@ -105,14 +122,17 @@ test_files:
 - test/files/actually_a_gif.jpg
 - test/files/animation.gif
 - test/files/composited.jpg
+- test/files/erroneous.jpg
 - test/files/leaves (spaced).tiff
 - test/files/not_an_image.php
 - 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: 

data/README.rdoc

@@ -1,119 +0,0 @@
-= MiniMagick
-
-A ruby wrapper for ImageMagick or GraphicsMagick command line.
-
-Tested on both Ruby 1.9.2 and Ruby 1.8.7.
-
-== Why?
-
-I was using RMagick and loving it, but it was eating up huge amounts
-of memory. A simple script like this...
-
-  Magick::read("image.jpg") do |f|
-    f.write("manipulated.jpg")
-  end
-
-...would use over 100 Megs of Ram. On my local machine this wasn't a
-problem, but on my hosting server the ruby apps would crash because of
-their 100 Meg memory limit.
-
-
-== Solution!
-
-Using MiniMagick the ruby processes memory remains small (it spawns
-ImageMagick's command line program mogrify which takes up some memory
-as well, but is much smaller compared to RMagick)
-
-MiniMagick gives you access to all the commandline options ImageMagick
-has (Found here http://www.imagemagick.org/script/mogrify.php)
-
-
-== Examples
-
-Want to make a thumbnail from a file...
-
-  image = MiniMagick::Image.open("input.jpg")
-  image.resize "100x100"
-  image.write  "output.jpg"
-
-Want to make a thumbnail from a blob...
-
-  image = MiniMagick::Image.read(blob)
-  image.resize "100x100"
-  image.write  "output.jpg"
-  
-Got an incoming IOStream?
-
-  image = MiniMagick::Image.read(stream)
-
-Want to make a thumbnail of a remote image?
-
-  image = MiniMagick::Image.open("http://www.google.com/images/logos/logo.png")
-  image.resize "5x5"
-  image.format "gif"
-  image.write "localcopy.gif"
-
-Need to combine several options?
-
-  image = MiniMagick::Image.open("input.jpg")
-  image.combine_options do |c|
-    c.sample "50%"
-    c.rotate "-90>"
-  end
-  image.write "output.jpg"
-
-Want to composite two images? Super easy! (Aka, put a watermark on!)
-
-  image = Image.open("original.png")
-  result = image.composite(Image.open("watermark.png", "jpg") do |c|
-    c.gravity "center"
-  end
-  result.write "my_output_file.jpg"
-
-Want to manipulate an image at its source (You won't have to write it
-out because the transformations are done on that file)
-
-  image = MiniMagick::Image.new("input.jpg")
-  image.resize "100x100"
-
-Want to get some meta-information out?
-
-  image = MiniMagick::Image.open("input.jpg")
-  image[:width]               # will get the width (you can also use :height and :format)
-  image["EXIF:BitsPerSample"] # It also can get all the EXIF tags
-  image["%m:%f %wx%h"]        # Or you can use one of the many options of the format command
-
-Want to use an internal image creation to create a big black square?
-
-  image = MiniMagick::Image.create 'jpg', false do |c|
-    c.size '1024x1024' # creates image option '-size 1024x1024'
-    c.canvas 'black'   # creates image creation operator 'canvas:black'
-  end
-
-For more on the format command see
-http://www.imagemagick.org/script/command-line-options.php#format
-
-
-== Windows Users
-
-When passing in a blob or IOStream, Windows users need to make sure they read the file in as binary.
-
-  #This way works on Windows
-  buffer = StringIO.new(File.open(IMAGE_PATH,"rb") { |f| f.read })
-  MiniMagick::Image.read(buffer)
-
-  #You may run into problems doing it this way
-  buffer = StringIO.new(File.read(IMAGE_PATH))
-
-
-== Using GraphicsMagick
-
-Simply set 
-
-  MiniMagick.processor = :gm
-  
-And you are sorted.
-
-== Requirements
-
-You must have ImageMagick or GraphicsMagick installed.

data/VERSION

@@ -1 +0,0 @@
-3.4