mini_magick 1.2.5 → 1.3.1

data/README.rdoc

@@ -1,6 +1,9 @@
 = MiniMagick
 
-A ruby wrapper for ImageMagick command line.
+NOTE: I'm not actively using MiniMagick anymore and am looking to hand it off
+to someone with more interest. Contact me through github if that person is you!
+
+A ruby wrapper for ImageMagick or GraphicsMagick command line.
 
 
 == Why?
@@ -69,4 +72,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.1

data/lib/mini_gmagick.rb

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

data/lib/mini_magick.rb

@@ -1,12 +1,14 @@
-require "open-uri"
-require "stringio"
-require "fileutils"
-require "open3"
-
-require File.join(File.dirname(__FILE__), '/image_temp_file')
+require 'tempfile'
+require 'subexec'
 
 module MiniMagick
-  class MiniMagickError < RuntimeError; end
+  class << self
+    attr_accessor :processor
+    attr_accessor :timeout
+  end
+  
+  class Error < RuntimeError; end
+  class Invalid < StandardError; end
 
   class Image
     attr :path
@@ -18,7 +20,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
@@ -84,14 +86,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 +101,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)
@@ -143,22 +151,38 @@ 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`
-
-      if $?.exitstatus != 0
-        raise MiniMagickError, "ImageMagick command (#{command.inspect}) failed: #{{:status_code => $?, :output => output}.inspect}"
+      command = "#{MiniMagick.processor} #{command} #{args.join(' ')}".strip
+      sub = Subexec.run(command, :timeout => MiniMagick.timeout)
+      
+      if sub.exitstatus != 0
+        # Clean up after ourselves in case of an error
+        destroy!
+        
+        # Raise the appropriate error
+        if sub.output =~ /no decode delegate/i || sub.output =~ /did not return an image/i
+          raise Invalid, sub.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 => sub.exitstatus, :output => sub.output}.inspect}"
+        end
       else
-        output
+        sub.output
       end
     end
+    
+    def destroy!
+      return if tempfile.nil?
+      File.unlink(tempfile.path)
+      @tempfile = nil
+    end
   end
 
   class CommandBuilder

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 'mini_magick'
 
 class CommandBuilderTest < Test::Unit::TestCase
   include MiniMagick

data/test/image_test.rb

@@ -1,5 +1,8 @@
+require 'rubygems'
 require 'test/unit'
-require File.join(File.dirname(__FILE__), '../lib/mini_magick')
+require 'mini_magick'
+
+MiniMagick.processor = :gm
 
 class ImageTest < Test::Unit::TestCase
   include MiniMagick
@@ -7,6 +10,7 @@ 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"
@@ -16,15 +20,18 @@ class ImageTest < Test::Unit::TestCase
   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 +44,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,6 +60,7 @@ 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
@@ -58,22 +68,26 @@ class ImageTest < Test::Unit::TestCase
     assert_equal "tiff", image[:format].downcase
     assert_equal 295, image[:width]
     assert_equal 242, 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 +97,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 +107,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 +120,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 +138,7 @@ 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
 
   def test_original_at
@@ -118,17 +146,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 +167,13 @@ 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)
-    end
-  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

metadata

@@ -1,71 +1,107 @@
 --- !ruby/object:Gem::Specification 
 name: mini_magick
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  hash: 25
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Corey Johnson
+- Peter Kieltyka
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 +00:00
+date: 2010-07-08 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: 
-email: probablycorey@gmail.com
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: subexec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id001
+description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
+email: 
+- probablycorey@gmail.com
+- peter@nulayer.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- MIT-LICENSE
 - README.rdoc
-- Rakefile
 - VERSION
-- lib/image_temp_file.rb
+- MIT-LICENSE
+- Rakefile
+- lib/mini_gmagick.rb
 - lib/mini_magick.rb
-- mini_magick.gemspec
 - test/actually_a_gif.jpg
 - test/animation.gif
 - test/command_builder_test.rb
-- test/image_temp_file_test.rb
 - test/image_test.rb
 - test/leaves.tiff
 - test/not_an_image.php
+- test/simple-minus.gif
 - test/simple.gif
 - test/trogdor.jpg
 has_rdoc: true
-homepage: http://github.com/probablycorey/mini_magick
+homepage: http://github.com/pkieltyka/mini_magick
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: mini-magick
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
-summary: Manipulate images with minimal use of memory.
+specification_version: 3
+summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files: 
+- test/actually_a_gif.jpg
+- test/animation.gif
 - test/command_builder_test.rb
-- test/image_temp_file_test.rb
 - test/image_test.rb
+- test/leaves.tiff
+- test/not_an_image.php
+- test/simple-minus.gif
+- test/simple.gif
+- test/trogdor.jpg

data/.gitignore

@@ -1 +0,0 @@
-/pkg

data/lib/image_temp_file.rb

@@ -1,9 +0,0 @@
-require "tempfile"
-
-module MiniMagick
-  class ImageTempFile < Tempfile
-    def make_tmpname(ext, n)
-      'mini_magick%d-%d%s' % [$$, n, ext ? ".#{ext}" : '']
-    end
-  end
-end

data/mini_magick.gemspec

@@ -1,55 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{mini_magick}
-  s.version = "1.2.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Corey Johnson"]
-  s.date = %q{2009-05-27}
-  s.email = %q{probablycorey@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/image_temp_file.rb",
-     "lib/mini_magick.rb",
-     "mini_magick.gemspec",
-     "test/actually_a_gif.jpg",
-     "test/animation.gif",
-     "test/command_builder_test.rb",
-     "test/image_temp_file_test.rb",
-     "test/image_test.rb",
-     "test/leaves.tiff",
-     "test/not_an_image.php",
-     "test/simple.gif",
-     "test/trogdor.jpg"
-  ]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/probablycorey/mini_magick}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{mini-magick}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Manipulate images with minimal use of memory.}
-  s.test_files = [
-    "test/command_builder_test.rb",
-     "test/image_temp_file_test.rb",
-     "test/image_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end

data/test/image_temp_file_test.rb

@@ -1,17 +0,0 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), '../lib/image_temp_file')
-
-class ImageTempFileTest < Test::Unit::TestCase
-  include MiniMagick
-
-  def test_multiple_calls_yield_different_files
-    first = ImageTempFile.new('test')
-    second = ImageTempFile.new('test')
-    assert_not_equal first.path, second.path
-  end
-
-  def test_temp_file_has_given_extension
-    assert_match /^[^.]+\.jpg$/, ImageTempFile.new('jpg').path
-    assert_match /^[^.]+\.png$/, ImageTempFile.new('png').path
-  end
-end