Commit b8f061c2 by Prem Sichanugrist

Revert "Adding Attachment#geometry to get file's dimension"

It's not working correctly as expected, so let's revert this for now.

This reverts commit 51bb0f9f.
parent d61ddd5c
...@@ -319,11 +319,6 @@ module Paperclip ...@@ -319,11 +319,6 @@ 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
......
...@@ -11,11 +11,6 @@ module Paperclip ...@@ -11,11 +11,6 @@ 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
......
...@@ -1158,19 +1158,4 @@ class AttachmentTest < Test::Unit::TestCase ...@@ -1158,19 +1158,4 @@ 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment