mini_magick 1.0.1 → 1.1.0

data/README

@@ -48,16 +48,24 @@ Want to manipulate an image at its source (You won't have to write it out becaus
 image = MiniMagick::Image.new("input.jpg")
 image.resize "100x100"
 
+Want to get some meta-information out?
+
+image = MiniMagick::Image.from_file("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 found here http://www.imagemagick.org/script/command-line-options.php#format
+
 Requirements
 ------------
 You must have ImageMagick installed.
 
-
 How To Install
 --------------
-(I've only tested this on OS X and Linux)
+If you downloaded the plugin version, just drop the plugin into RAILS_ROOT/plugins/
+
+If you installed this as a gem, then to get it to work add <require "mini_magick"> to RAILS_ROOT/config/environment.rb
 
-I've packaged up MiniMagick as a rails plugin. Just unzip the file to the /vendor/plugins directory of your rails folder and you have access to all the magick.
+If you have just downloaded this files then copy the mini_magick.rb file into your RAILS_ROOT/lib directory and add <require "mini-magick"> to RAILS_ROOT/config/environment.rb
 
 MiniMagick does NOT require rails though. All the code you need to use MiniMagick is located in the mini_magick/lib/mini_magick.rb file.
 

data/lib/mini_magick.rb

@@ -3,35 +3,20 @@ require "tempfile"
 require "stringio"
 
 module MiniMagick
+  class MiniMagickError < Exception; end
   
-  VERSION = '1.0.1'
-  
-  class MiniMagickError < Exception
-  end
+  VERSION = '1.1.0'
     
   class Image
     attr :path
 
-    # Attributes
-    # ----------    
-    def width
-      info[:width]
-    end
-
-    def height
-      info[:height]
-    end
-
-    def format
-      info[:format]
-    end
-
     # Class Methods
     # -------------
     class <<self
       def from_blob(blob)      
         begin
           tmp = Tempfile.new("minimagic")
+          tmp.binmode 
           tmp.write(blob)         
         ensure
           tmp.close
@@ -42,7 +27,7 @@ module MiniMagick
       
       # Use this if you don't want to overwrite the image file
       def from_file(image_path)      
-        File.open(image_path, "r") do |f|
+        File.open(image_path, "rb") do |f|
           self.from_blob(f.read)
         end
       end
@@ -50,24 +35,49 @@ module MiniMagick
     
     # Instance Methods
     # ----------------    
-    def initialize(input_path)
-      
+    def initialize(input_path)      
       @path = input_path
       
       # Ensure that the file is an image
       run_command("identify #{@path}")      
     end
+    
+    def [](value)
+      # Why do I go to the trouble of putting in newline chars? Because otherwise animated gifs screw everything up
+      case value.to_s
+      when "format"
+        run_command("identify", "-format", "%m\\\\n", @path).split("\n")[0]
+      when "height"
+        run_command("identify", "-format", "%h\\\\n", @path).split("\n")[0].to_i
+      when "width"
+        run_command("identify", "-format", "%w\\\\n", @path).split("\n")[0].to_i
+      when "original_at"
+        # 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              
+      else
+        run_command('identify', '-format', "\"#{value}\"", @path)
+      end
+    end
+    
+    # This is a 'special' command because it needs to change @path to reflect the new extension
+    def format(format)
+      run_command("mogrify", "-format", format, @path)
+      @path = @path.sub(/\.\w+$/, ".#{format}")
+      
+      raise "Unable to format to #{format}" unless File.exists?(@path)
+    end
         
-    def write(output_path)      
-      open(output_path, "w") do |output_file|
-        open(@path) do |image_file|
+    def write(output_path)        
+      open(output_path, "wb") do |output_file|
+        open(@path, "rb") do |image_file|
           output_file.write(image_file.read)
         end
-      end      
+      end
     end
       
-    # Any message that sent that is unknown is sent through morgrify 
-    #
+    # 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
@@ -84,19 +94,11 @@ module MiniMagick
     # Private (Don't look in here!)
     # -----------------------------
     private
-    
-    def info
-      info_array = run_command("identify", @path).split
-      info = {
-        :format => info_array[1],
-        :width => info_array[2].match(/^\d+/)[0].to_i,
-        :height => info_array[2].match(/\d+$/)[0].to_i 
-      }
-    end
-    
+        
     def run_command(command, *args)
       args = args.collect {|a| a.to_s}
       output = `#{command} #{args.join(' ')}`
+      
       if $? != 0
         raise MiniMagickError, "ImageMagick command (#{command} #{args.join(' ')}) failed: Error Given #{$?}"
       else

data/test/mini_magick_test.rb

@@ -1,12 +1,5 @@
-begin
-  # Rails context
-  require File.dirname(__FILE__) + '/../../../../test/test_helper'
-rescue LoadError => e
-  # Normal Ruby context
-  $:.unshift(File.dirname(__FILE__) + "/../lib/")
-  require 'test/unit'
-  require 'mini_magick'
-end
+require 'test/unit'
+require File.join(File.dirname(__FILE__), '../lib/mini_magick')
 
 class ImageTest < Test::Unit::TestCase
   include MiniMagick
@@ -15,6 +8,8 @@ class ImageTest < Test::Unit::TestCase
 
   SIMPLE_IMAGE_PATH = CURRENT_DIR + "simple.gif"
   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"
   
   def test_image_from_blob
     File.open(SIMPLE_IMAGE_PATH, "r") do |f|
@@ -47,21 +42,26 @@ class ImageTest < Test::Unit::TestCase
       image = Image.new(NOT_AN_IMAGE_PATH)
     end
   end
-  
-  def test_image_info
+    
+  def test_image_meta_info
     image = Image.new(SIMPLE_IMAGE_PATH)
-    assert_equal 150, image.width
-    assert_equal 55, image.height
-    assert_match(/^gif$/i, image.format)
+    assert_equal 150, image[:width]
+    assert_equal 55, image[:height]
+    assert_match(/^gif$/i, image[:format])
+  end
+  
+  def test_gif_with_jpg_format
+    image = Image.new(GIF_WITH_JPG_EXT)    
+    assert_equal "gif", image[:format].downcase
   end
   
   def test_image_resize
     image = Image.from_file(SIMPLE_IMAGE_PATH)
     image.resize "20x30!"
 
-    assert_equal 20, image.width
-    assert_equal 30, image.height
-    assert_match(/^gif$/i, image.format)
+    assert_equal 20, image[:width]
+    assert_equal 30, image[:height]
+    assert_match(/^gif$/i, image[:format])
   end 
   
   def test_image_combine_options_resize_blur
@@ -71,10 +71,24 @@ class ImageTest < Test::Unit::TestCase
       c.blur 50
     end
 
-    assert_equal 20, image.width
-    assert_equal 30, image.height
-    assert_match(/^gif$/i, image.format)
-  end 
+    assert_equal 20, image[:width]
+    assert_equal 30, image[:height]
+    assert_match(/^gif$/i, image[:format])
+  end
+  
+  def test_exif
+    image = Image.from_file(EXIF_IMAGE_PATH)
+    assert_equal('0220', image["exif:ExifVersion"])
+    image = Image.from_file(SIMPLE_IMAGE_PATH)
+    assert_equal('', image["EXIF:ExifVersion"])
+  end
+  
+  def test_original_at
+    image = Image.from_file(EXIF_IMAGE_PATH)
+    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])
+  end
 end 
 
 class CommandBuilderTest < Test::Unit::TestCase

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mini_magick
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2006-02-25 00:00:00 -05:00
+  version: 1.1.0
+date: 2006-04-16 00:00:00 -04:00
 summary: Manipulate images with minimal use of memory.
 require_paths: 
 - lib
@@ -32,9 +32,11 @@ files:
 - README
 - MIT-LICENSE
 - lib/mini_magick.rb
+- test/actually_a_gif.jpg
 - test/mini_magick_test.rb
 - test/not_an_image.php
 - test/simple.gif
+- test/trogdor.jpg
 test_files: []
 
 rdoc_options: []