mini_magick 3.2.1 → 3.3

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rdoc/task'
+require 'rubygems/package_task'
 
 $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'mini_magick'
@@ -27,6 +27,8 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 spec = eval(File.read('mini_magick.gemspec'))
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
+  pkg.need_zip = true
+  pkg.need_tar = true
 end

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.3

data/lib/mini_magick.rb

@@ -133,7 +133,7 @@ module MiniMagick
       # @return [Image] The created image
       def create(ext = nil, validate = true, &block)
         begin
-          tempfile = Tempfile.new(['mini_magick', ext.to_s])
+          tempfile = Tempfile.new(['mini_magick', ext.to_s.downcase])
           tempfile.binmode
           block.call(tempfile)
           tempfile.close
@@ -164,7 +164,7 @@ module MiniMagick
     end
 
     def escaped_path
-      "\"#{Pathname.new(@path).to_s}\""
+      Pathname.new(@path).to_s.inspect
     end
 
     # Checks to make sure that MiniMagick can read the file and understand it.
@@ -288,9 +288,7 @@ module MiniMagick
     def write(output_to)
       if output_to.kind_of?(String) || !output_to.respond_to?(:write)
         FileUtils.copy_file @path, output_to
-        # We need to escape the output path if it contains a space
-        escaped_output_to = output_to.to_s.gsub(' ', '\\ ')
-        run_command "identify", escaped_output_to # Verify that we have a good image
+        run_command "identify", output_to.to_s.inspect # Verify that we have a good image
       else # stream
         File.open(@path, "rb") do |f|
           f.binmode
@@ -311,6 +309,11 @@ module MiniMagick
     ensure
       f.close if f
     end
+    
+    def mime_type
+      format = self[:format]
+      "image/"+format.downcase
+    end
 
     # 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)

data/test/image_test.rb

@@ -16,7 +16,9 @@ class ImageTest < Test::Unit::TestCase
   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"
+  CAP_EXT_PATH      = CURRENT_DIR + "trogdor_capitalized.JPG"
   ANIMATION_PATH    = CURRENT_DIR + "animation.gif"
+  PNG_PATH          = CURRENT_DIR + "png.png"
 
   def test_image_from_blob
     File.open(SIMPLE_IMAGE_PATH, "rb") do |f|
@@ -62,6 +64,11 @@ 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"
+  end
 
   def test_image_write
     output_path = "output.gif"
@@ -275,7 +282,7 @@ class ImageTest < Test::Unit::TestCase
     img.gravity "Center"
     img.crop "480x480"
     img.resize "250x250"
-    img.write CURRENT_DIR + "output.png"
+    img.write "/tmp/output.png"
   end
 
   def test_throw_format_error
@@ -300,7 +307,7 @@ class ImageTest < Test::Unit::TestCase
     assert_equal "png", image[:format].downcase
     assert_equal columns, image[:width]
     assert_equal rows, image[:height]
-    image.write(CURRENT_DIR + "imported_pixels_image.png")
+    image.write("/tmp/imported_pixels_image.png")
   end
 
   def test_import_pixels_custom_format
@@ -316,7 +323,20 @@ class ImageTest < Test::Unit::TestCase
     assert_equal format, image[:format].downcase
     assert_equal columns, image[:width]
     assert_equal rows, image[:height]
-    image.write(CURRENT_DIR + "imported_pixels_image." + format)
+    image.write("/tmp/imported_pixels_image." + format)
+  end
+
+  def test_mime_type
+    gif =         Image.open(SIMPLE_IMAGE_PATH)
+    jpeg =        Image.open(EXIF_IMAGE_PATH)
+    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
+    assert_equal "image/tiff",  tiff.mime_type
+    assert_equal "image/gif",   hidden_gif.mime_type
   end
-
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mini_magick
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 2
-  - 1
-  version: 3.2.1
+  prerelease: 
+  version: "3.3"
 platform: ruby
 authors: 
 - Corey Johnson
@@ -16,21 +12,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +01:00
+date: 2011-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subexec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
+        version: 0.1.0
   type: :runtime
   version_requirements: *id001
 description: ""
@@ -51,6 +44,18 @@ files:
 - Rakefile
 - lib/mini_gmagick.rb
 - lib/mini_magick.rb
+- test/actually_a_gif.jpg
+- test/animation.gif
+- test/command_builder_test.rb
+- test/composited.jpg
+- test/image_test.rb
+- test/leaves (spaced).tiff
+- test/not_an_image.php
+- test/png.png
+- test/simple-minus.gif
+- test/simple.gif
+- test/trogdor.jpg
+- test/trogdor_capitalized.JPG
 has_rdoc: true
 homepage: http://github.com/probablycorey/mini_magick
 licenses: []
@@ -61,23 +66,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
@@ -89,6 +92,8 @@ test_files:
 - test/image_test.rb
 - test/leaves (spaced).tiff
 - test/not_an_image.php
+- test/png.png
 - test/simple-minus.gif
 - test/simple.gif
 - test/trogdor.jpg
+- test/trogdor_capitalized.JPG