mbailey-paperclip 2.3.2.1 → 2.3.3

data/lib/paperclip/attachment.rb

@@ -92,7 +92,7 @@ module Paperclip
       instance_write(:file_name,       uploaded_file.original_filename.strip)
       instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
       instance_write(:file_size,       uploaded_file.size.to_i)
-      instance_write(:file_hash,       uploaded_file.file_hash)
+      instance_write(:fingerprint,     uploaded_file.fingerprint)
       instance_write(:updated_at,      Time.now)
 
       @dirty = true
@@ -101,7 +101,7 @@ module Paperclip
 
       # Reset the file size if the original file was reprocessed.
       instance_write(:file_size, @queued_for_write[:original].size.to_i)
-      instance_write(:file_hash, @queued_for_write[:original].file_hash)
+      instance_write(:fingerprint, @queued_for_write[:original].fingerprint)
     ensure
       uploaded_file.close if close_uploaded_file
     end
@@ -179,9 +179,9 @@ module Paperclip
     end
 
     # Returns the hash of the file as originally assigned, and lives in the
-    # <attachment>_file_hash attribute of the model.
-    def file_hash
-      instance_read(:file_hash) || (@queued_for_write[:original] && @queued_for_write[:original].file_hash)
+    # <attachment>_fingerprint attribute of the model.
+    def fingerprint
+      instance_read(:fingerprint) || (@queued_for_write[:original] && @queued_for_write[:original].fingerprint)
     end
 
     # Returns the content_type of the file as originally assigned, and lives

data/lib/paperclip/interpolations.rb

@@ -88,9 +88,9 @@ module Paperclip
       attachment.instance.id
     end
 
-    # Returns the file hash of the instance.
-    def file_hash attachment, style_name
-      attachment.file_hash
+    # Returns the fingerprint of the instance.
+    def fingerprint attachment, style_name
+      attachment.fingerprint
     end
 
     # Returns the id of the instance in a split path form. e.g. returns

data/lib/paperclip/upfile.rb

@@ -34,7 +34,7 @@ module Paperclip
     end
 
     # Returns the hash of the file.
-    def file_hash
+    def fingerprint
       Digest::MD5.hexdigest(self.read)
     end
   end
@@ -42,15 +42,15 @@ end
 
 if defined? StringIO
   class StringIO
-    attr_accessor :original_filename, :content_type, :file_hash
+    attr_accessor :original_filename, :content_type, :fingerprint
     def original_filename
       @original_filename ||= "stringio.txt"
     end
     def content_type
       @content_type ||= "text/plain"
     end
-    def file_hash
-      @file_hash ||= Digest::MD5.hexdigest(self.string)
+    def fingerprint
+      @fingerprint ||= Digest::MD5.hexdigest(self.string)
     end
   end
 end

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.3.2.1" unless defined? Paperclip::VERSION
+  VERSION = "2.3.3" unless defined? Paperclip::VERSION
 end

data/test/attachment_test.rb

@@ -446,8 +446,8 @@ class AttachmentTest < Test::Unit::TestCase
       @not_file = mock
       @tempfile = mock
       @not_file.stubs(:nil?).returns(false)
-      @not_file.stubs(:file_hash).returns('bd94545193321376b70136f8b223abf8')
-      @tempfile.stubs(:file_hash).returns('bd94545193321376b70136f8b223abf8')
+      @not_file.stubs(:fingerprint).returns('bd94545193321376b70136f8b223abf8')
+      @tempfile.stubs(:fingerprint).returns('bd94545193321376b70136f8b223abf8')
       @not_file.expects(:size).returns(10)
       @tempfile.expects(:size).returns(10)
       @not_file.expects(:to_tempfile).returns(@tempfile)
@@ -757,9 +757,9 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
 
-    context "and avatar_file_hash column" do
+    context "and avatar_fingerprint column" do
       setup do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_file_hash, :string
+        ActiveRecord::Base.connection.add_column :dummies, :avatar_fingerprint, :string
         rebuild_class
         @dummy = Dummy.new
       end
@@ -768,16 +768,16 @@ class AttachmentTest < Test::Unit::TestCase
         assert_nothing_raised { @dummy.avatar = @file }
       end
 
-      should "return the right value when sent #avatar_file_hash" do
+      should "return the right value when sent #avatar_fingerprint" do
         @dummy.avatar = @file
-        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_file_hash
+        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_fingerprint
       end
 
-      should "return the right value when saved, reloaded, and sent #avatar_file_hash" do
+      should "return the right value when saved, reloaded, and sent #avatar_fingerprint" do
         @dummy.avatar = @file
         @dummy.save
         @dummy = Dummy.find(@dummy.id)
-        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_file_hash
+        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_fingerprint
       end
     end
   end

data/test/helper.rb

@@ -86,7 +86,7 @@ def rebuild_model options = {}
     table.column :avatar_content_type, :string
     table.column :avatar_file_size, :integer
     table.column :avatar_updated_at, :datetime
-    table.column :avatar_file_hash, :string
+    table.column :avatar_fingerprint, :string
   end
   rebuild_class options
 end
@@ -106,7 +106,7 @@ class FakeModel
                 :avatar_file_size,
                 :avatar_last_updated,
                 :avatar_content_type,
-                :avatar_file_hash,
+                :avatar_fingerprint,
                 :id
 
   def errors

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mbailey-paperclip
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 3
-  - 2
-  - 1
-  version: 2.3.2.1
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - Jon Yurek