mini_magick 1.2.5 → 1.3.3

data/README.rdoc

@@ -1,7 +1,8 @@
 = MiniMagick
 
-A ruby wrapper for ImageMagick command line.
+A ruby wrapper for ImageMagick or GraphicsMagick command line.
 
+Tested on both Ruby 1.9.2 and Ruby 1.8.7.
 
 == Why?
 
@@ -69,4 +70,4 @@ http://www.imagemagick.org/script/command-line-options.php#format
 
 == Requirements
 
-You must have ImageMagick installed.
+You must have ImageMagick or GraphicsMagick installed.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rake/gempackagetask'
 
 $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'mini_magick'
@@ -10,7 +11,7 @@ task :default => :test
 
 desc 'Test the mini_magick plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
@@ -25,44 +26,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-# Jewler tasks
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "mini_magick"
-    gemspec.summary = "Manipulate images with minimal use of memory."
-    gemspec.email = "probablycorey@gmail.com"
-    gemspec.homepage = "http://github.com/probablycorey/mini_magick"
-    gemspec.authors = ["Corey Johnson"]
-    gemspec.rubyforge_project = "mini-magick"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+spec = eval(File.read('mini_magick.gemspec'))
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
 end

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.3.3

data/lib/mini_gmagick.rb

@@ -0,0 +1,2 @@
+require 'mini_magick'
+MiniMagick.processor = :gm

data/lib/mini_magick.rb

@@ -1,12 +1,22 @@
-require "open-uri"
-require "stringio"
-require "fileutils"
-require "open3"
-
-require File.join(File.dirname(__FILE__), '/image_temp_file')
+require 'tempfile'
 
 module MiniMagick
-  class MiniMagickError < RuntimeError; end
+  class << self
+    attr_accessor :processor
+    attr_accessor :use_subexec
+    attr_accessor :timeout
+  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 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 quantizespace 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}
+  
+  # Subexec only works with 1.9
+  if RUBY_VERSION[0..2].to_f < 1.8
+    self.use_subexec = true
+    require 'subexec'
+  end
+  
+  class Error < RuntimeError; end
+  class Invalid < StandardError; end
 
   class Image
     attr :path
@@ -18,7 +28,7 @@ module MiniMagick
     class << self
       def from_blob(blob, ext = nil)
         begin
-          tempfile = ImageTempFile.new(ext)
+          tempfile = Tempfile.new(['mini_magick', ext.to_s])
           tempfile.binmode
           tempfile.write(blob)
         ensure
@@ -65,7 +75,12 @@ module MiniMagick
         # Get the EXIF original capture as a Time object
         Time.local(*self["EXIF:DateTimeOriginal"].split(/:|\s+/)) rescue nil
       when /^EXIF\:/i
-        run_command('identify', '-format', "\"%[#{value}]\"", @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}\"", @path).split("\n")[0]
       end
@@ -84,14 +99,14 @@ module MiniMagick
       run_command("mogrify", "-format", format, @path)
 
       old_path = @path.dup
-      @path.sub!(/(\.\w+)?$/, ".#{format}")
+      @path.sub!(/(\.\w*)?$/, ".#{format}")
       File.delete(old_path) unless old_path == @path
 
       unless File.exists?(@path)
         begin
           FileUtils.copy_file(@path.sub(".#{format}", "-#{page}.#{format}"), @path)
-        rescue e
-          raise MiniMagickError, "Unable to format to #{format}; #{e}" unless File.exist?(@path)
+        rescue => ex
+          raise MiniMagickError, "Unable to format to #{format}; #{ex}" unless File.exist?(@path)
         end
       end
     ensure
@@ -99,6 +114,12 @@ module MiniMagick
         File.unlink(fname)
       end
     end
+    
+    # Collapse images with sequences to the first frame (ie. animated gifs) and
+    # preserve quality
+    def collapse!
+      run_command("mogrify", "-quality", "100", "#{path}[0]")
+    end
 
     # Writes the temporary image that we are using for processing to the output path
     def write(output_path)
@@ -118,9 +139,15 @@ module MiniMagick
     # If an unknown method is called then it is sent through the morgrify program
     # Look here to find all the commands (http://www.imagemagick.org/script/mogrify.php)
     def method_missing(symbol, *args)
-      args.push(@path) # push the path onto the end
-      run_command("mogrify", "-#{symbol}", *args)
-      self
+      guessed_command_name = symbol.to_s.gsub('_','-')
+
+      if MOGRIFY_COMMANDS.include?(guessed_command_name)
+        args.push(@path) # push the path onto the end
+        run_command("mogrify", "-#{guessed_command_name}", *args)
+        self
+      else
+        super(symbol, *args)
+      end
     end
 
     # You can use multiple commands together using this method
@@ -143,22 +170,57 @@ module MiniMagick
     def run_command(command, *args)
       args.collect! do |arg|        
         # args can contain characters like '>' so we must escape them, but don't quote switches
-        if arg !~ /^\+|\-/
+        if arg !~ /^[\+\-]/
           "\"#{arg}\""
         else
           arg.to_s
         end
       end
 
-      command = "#{command} #{args.join(' ')}"
-      output = `#{command} 2>&1`
+      command = "#{MiniMagick.processor} #{command} #{args.join(' ')}".strip
 
-      if $?.exitstatus != 0
-        raise MiniMagickError, "ImageMagick command (#{command.inspect}) failed: #{{:status_code => $?, :output => output}.inspect}"
+      if ::MiniMagick.use_subexec
+        sub = Subexec.run(command, :timeout => MiniMagick.timeout)
+        exit_status = sub.exitstatus
+        output = sub.output
+      else
+        output = `#{command} 2>&1`
+        exit_status = $?.exitstatus
+      end
+
+      if exit_status != 0
+        # Clean up after ourselves in case of an error
+        destroy!
+        
+        # Raise the appropriate error
+        if output =~ /no decode delegate/i || output =~ /did not return an image/i
+          raise Invalid, output
+        else
+          # TODO: should we do something different if the command times out ...?
+          # its definitely better for logging.. otherwise we dont really know
+          raise Error, "Command (#{command.inspect}) failed: #{{:status_code => exit_status, :output => output}.inspect}"
+        end
       else
         output
       end
     end
+    
+    def destroy!
+      return if tempfile.nil?
+      File.unlink(tempfile.path)
+      @tempfile = nil
+    end
+    
+    private
+      # Sometimes we get back a list of character values
+      def read_character_data(list_of_characters)
+        chars = list_of_characters.gsub(" ", "").split(",")
+        result = ""
+        chars.each do |val|
+          result << ("%c" % val.to_i)
+        end
+        result
+      end
   end
 
   class CommandBuilder
@@ -169,7 +231,7 @@ module MiniMagick
     end
 
     def method_missing(symbol, *args)
-      @args << "-#{symbol}"
+      @args << "-#{symbol.to_s.gsub('_','-')}"
       @args += args
     end
 

data/test/command_builder_test.rb

@@ -1,5 +1,6 @@
+require 'rubygems'
 require 'test/unit'
-require File.join(File.dirname(__FILE__), '../lib/mini_magick')
+require File.expand_path('../../lib/mini_magick', __FILE__)
 
 class CommandBuilderTest < Test::Unit::TestCase
   include MiniMagick
@@ -17,4 +18,10 @@ class CommandBuilderTest < Test::Unit::TestCase
     c.lingo "mome fingo"
     assert_equal "-resize 30x40 -input 1 3 4 -lingo mome fingo", c.args.join(" ")
   end
+
+  def test_dashed
+    c = CommandBuilder.new
+    c.auto_orient
+    assert_equal "-auto-orient", c.args.join(" ")
+  end
 end

data/test/image_test.rb

@@ -1,5 +1,8 @@
+require 'rubygems'
 require 'test/unit'
-require File.join(File.dirname(__FILE__), '../lib/mini_magick')
+require File.expand_path('../../lib/mini_magick', __FILE__)
+
+#MiniMagick.processor = :gm
 
 class ImageTest < Test::Unit::TestCase
   include MiniMagick
@@ -7,24 +10,29 @@ class ImageTest < Test::Unit::TestCase
   CURRENT_DIR = File.dirname(File.expand_path(__FILE__)) + "/"
 
   SIMPLE_IMAGE_PATH = CURRENT_DIR + "simple.gif"
+  MINUS_IMAGE_PATH = CURRENT_DIR + "simple-minus.gif"
   TIFF_IMAGE_PATH = CURRENT_DIR + "leaves.tiff"
   NOT_AN_IMAGE_PATH = CURRENT_DIR + "not_an_image.php"
   GIF_WITH_JPG_EXT = CURRENT_DIR + "actually_a_gif.jpg"
   EXIF_IMAGE_PATH = CURRENT_DIR + "trogdor.jpg"
+  ORIENTED_IMAGE_PATH = CURRENT_DIR + "oliver.jpg"
   ANIMATION_PATH = CURRENT_DIR + "animation.gif"
 
   def test_image_from_blob
     File.open(SIMPLE_IMAGE_PATH, "rb") do |f|
       image = Image.from_blob(f.read)
+      image.destroy!
     end
   end
 
   def test_image_from_file
     image = Image.from_file(SIMPLE_IMAGE_PATH)
+    image.destroy!
   end
 
   def test_image_new
     image = Image.new(SIMPLE_IMAGE_PATH)
+    image.destroy!
   end
 
   def test_image_write
@@ -37,11 +45,13 @@ class ImageTest < Test::Unit::TestCase
     ensure
       File.delete output_path
     end
+    image.destroy!
   end
 
   def test_not_an_image
-    assert_raise(MiniMagickError) do
+    assert_raise(MiniMagick::Invalid) do
       image = Image.new(NOT_AN_IMAGE_PATH)
+      image.destroy!
     end
   end
 
@@ -51,29 +61,34 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 55, image[:height]
     assert_equal [150, 55], image[:dimensions]
     assert_match(/^gif$/i, image[:format])
+    image.destroy!
   end
 
   def test_tiff
     image = Image.new(TIFF_IMAGE_PATH)
     assert_equal "tiff", image[:format].downcase
-    assert_equal 295, image[:width]
-    assert_equal 242, image[:height]
+    assert_equal 50, image[:width]
+    assert_equal 41, image[:height]
+    image.destroy!
   end
 
-  def test_animation_pages
-    image = Image.from_file(ANIMATION_PATH)
-    image.format "png", 0
-    assert_equal "png", image[:format].downcase
-  end
+  # def test_animation_pages
+  #   image = Image.from_file(ANIMATION_PATH)
+  #   image.format "png", 0
+  #   assert_equal "png", image[:format].downcase
+  #   image.destroy!
+  # end
 
-  def test_animation_size
-    image = Image.from_file(ANIMATION_PATH)
-    assert_equal image[:size], 76631
-  end
+  # def test_animation_size
+  #   image = Image.from_file(ANIMATION_PATH)
+  #   assert_equal image[:size], 76631
+  #   image.destroy!
+  # end
 
   def test_gif_with_jpg_format
     image = Image.new(GIF_WITH_JPG_EXT)
     assert_equal "gif", image[:format].downcase
+    image.destroy!
   end
 
   def test_image_resize
@@ -83,6 +98,7 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 20, image[:width]
     assert_equal 30, image[:height]
     assert_match(/^gif$/i, image[:format])
+    image.destroy!
   end
 
   def test_image_resize_with_minimum
@@ -92,6 +108,7 @@ class ImageTest < Test::Unit::TestCase
 
     assert_equal original_width, image[:width]
     assert_equal original_height, image[:height]
+    image.destroy!
   end
 
   def test_image_combine_options_resize_blur
@@ -104,6 +121,17 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 20, image[:width]
     assert_equal 30, image[:height]
     assert_match(/^gif$/i, image[:format])
+    image.destroy!
+  end
+  
+  def test_image_combine_options_with_filename_with_minusses_in_it
+    image = Image.from_file(SIMPLE_IMAGE_PATH)
+    assert_nothing_raised do
+      image.combine_options do |c|
+        c.draw "image Over 0,0 10,10 '#{MINUS_IMAGE_PATH}'"
+      end
+    end
+    image.destroy!
   end
 
   def test_exif
@@ -111,6 +139,16 @@ class ImageTest < Test::Unit::TestCase
     assert_equal('0220', image["exif:ExifVersion"])
     image = Image.from_file(SIMPLE_IMAGE_PATH)
     assert_equal('', image["EXIF:ExifVersion"])
+    image.destroy!
+  end
+  
+  # The test here isn't really to check to see if 
+  # the auto-orient function of ImageMagick works,
+  # but to make sure we can send dashed commands.
+  def test_auto_rotate
+    image = Image.from_file(EXIF_IMAGE_PATH)
+    image.auto_orient
+    image.destroy!
   end
 
   def test_original_at
@@ -118,17 +156,20 @@ class ImageTest < Test::Unit::TestCase
     assert_equal(Time.local('2005', '2', '23', '23', '17', '24'), image[:original_at])
     image = Image.from_file(SIMPLE_IMAGE_PATH)
     assert_nil(image[:original_at])
+    image.destroy!
   end
 
   def test_tempfile_at_path
     image = Image.from_file(TIFF_IMAGE_PATH)
     assert_equal image.path, image.tempfile.path
+    image.destroy!
   end
 
   def test_tempfile_at_path_after_format
     image = Image.from_file(TIFF_IMAGE_PATH)
     image.format('png')
     assert_equal image.path, image.tempfile.path
+    image.destroy!
   end
 
   def test_previous_tempfile_deleted_after_format
@@ -136,12 +177,25 @@ class ImageTest < Test::Unit::TestCase
     before = image.path.dup
     image.format('png')
     assert !File.exist?(before)
+    image.destroy!
   end
-
-  def test_mini_magick_error_when_referencing_not_existing_page
-    image = Image.from_file(ANIMATION_PATH)
-    assert_raises MiniMagickError do
-      image.format('png', 31415)
+  
+  def test_bad_method_bug
+    image = Image.from_file(TIFF_IMAGE_PATH)
+    begin
+      image.to_blog
+    rescue NoMethodError
+      assert true
     end
+    image.to_blob
+    assert true #we made it this far without error
+    image.destroy!
   end
+
+  # def test_mini_magick_error_when_referencing_not_existing_page
+  #   image = Image.from_file(ANIMATION_PATH)
+  #   image.format('png')
+  #   assert_equal image[:format], 'PNG'
+  #   image.destroy!
+  # end
 end