Adding Attachment#geometry to get file's dimension

Fixes #768

lib/paperclip/attachment.rb

@@ -319,6 +319,11 @@ module Paperclip
       instance.send(getter) if responds || attr.to_s == "file_name"
       instance.send(getter) if responds || attr.to_s == "file_name"
     end
     end
 
 
+    # Returns a geometry object which you can get the image's dimension.
+    def geometry(style = :original)
+      Geometry.from_file(path(style))
+    end
+
     private
     private
 
 
     def path_option
     def path_option

lib/paperclip/geometry.rb

@@ -11,6 +11,11 @@ module Paperclip
       @modifier = modifier
       @modifier = modifier
     end
     end
 
 
+    # Returns the equality based on height, width, and modifier
+    def ==(other)
+      height == other.height && width == other.width && modifier == other.modifier
+    end
+
     # Uses ImageMagick to determing the dimensions of a file, passed in as either a
     # Uses ImageMagick to determing the dimensions of a file, passed in as either a
     # File or path.
     # File or path.
     # NOTE: (race cond) Do not reassign the 'file' variable inside this method as it is likely to be
     # NOTE: (race cond) Do not reassign the 'file' variable inside this method as it is likely to be

test/attachment_test.rb

@@ -1158,4 +1158,19 @@ class AttachmentTest < Test::Unit::TestCase
     end
     end
   end
   end
 
 
+  context "attachment's geometry" do
+    setup do
+      rebuild_model
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @dummy.avatar = @file
+      @dummy.save!
+      @attachment = @dummy.avatar
+      @geometry = Paperclip::Geometry.from_file(@file.path)
+    end
+
+    should "return a correct geometry object" do
+      assert_equal @geometry, @attachment.geometry
+    end
+  end
 end
 end

test/geometry_test.rb

 require './test/helper'
 require './test/helper'
 
 
 class GeometryTest < Test::Unit::TestCase
 class GeometryTest < Test::Unit::TestCase
-  context "Paperclip::Geometry" do
+  context "equality check" do
+    should "return true when width, height, modifier are all the same" do
+      assert_equal Paperclip::Geometry.new(100, 100, "foo"),
+        Paperclip::Geometry.new(100, 100, "foo")
+    end
+
+    should "return false if width, height, modifier are not the same" do
+      assert_not_equal Paperclip::Geometry.new(100, 100, "foo"),
+        Paperclip::Geometry.new(100, 200, "foo")
+      assert_not_equal Paperclip::Geometry.new(100, 100, "foo"),
+        Paperclip::Geometry.new(200, 100, "foo")
+      assert_not_equal Paperclip::Geometry.new(100, 100, "foo"),
+        Paperclip::Geometry.new(100, 100, "bar")
+    end
+  end
+
   should "correctly report its given dimensions" do
   should "correctly report its given dimensions" do
     assert @geo = Paperclip::Geometry.new(1024, 768)
     assert @geo = Paperclip::Geometry.new(1024, 768)
     assert_equal 1024, @geo.width
     assert_equal 1024, @geo.width
@@ -139,11 +154,13 @@ class GeometryTest < Test::Unit::TestCase
   should "let us know when a command isn't found versus a processing error" do
   should "let us know when a command isn't found versus a processing error" do
     old_path = ENV['PATH']
     old_path = ENV['PATH']
     begin
     begin
+      silence_stream(STDERR) do
         ENV['PATH'] = ''
         ENV['PATH'] = ''
         assert_raises(Paperclip::Errors::CommandNotFoundError) do
         assert_raises(Paperclip::Errors::CommandNotFoundError) do
           file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
           file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
           @geo = Paperclip::Geometry.from_file(file)
           @geo = Paperclip::Geometry.from_file(file)
         end
         end
+      end
     ensure
     ensure
       ENV['PATH'] = old_path
       ENV['PATH'] = old_path
     end
     end
@@ -202,5 +219,4 @@ class GeometryTest < Test::Unit::TestCase
       end
       end
     end
     end
   end
   end
-  end
 end
 end