mbailey-paperclip 2.3.2 → 2.3.2.1

data/lib/paperclip/attachment.rb

@@ -15,6 +15,7 @@ module Paperclip
         :default_url       => "/:attachment/:style/missing.png",
         :default_style     => :original,
         :storage           => :filesystem,
+        :include_updated_timestamp => true,
         :whiny             => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
       }
     end
@@ -39,6 +40,7 @@ module Paperclip
       @default_url       = options[:default_url]
       @default_style     = options[:default_style]
       @storage           = options[:storage]
+      @include_updated_timestamp = options[:include_updated_timestamp]
       @whiny             = options[:whiny_thumbnails] || options[:whiny]
       @convert_options   = options[:convert_options]
       @processors        = options[:processors]
@@ -90,6 +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(:updated_at,      Time.now)
 
       @dirty = true
@@ -98,6 +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)
     ensure
       uploaded_file.close if close_uploaded_file
     end
@@ -109,7 +113,7 @@ module Paperclip
     # security, however, for performance reasons.  set
     # include_updated_timestamp to false if you want to stop the attachment
     # update time appended to the url
-    def url style_name = default_style, include_updated_timestamp = true
+    def url(style_name = default_style, include_updated_timestamp = @include_updated_timestamp)
       url = original_filename.nil? ? interpolate(@default_url, style_name) : interpolate(@url, style_name)
       include_updated_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url
     end
@@ -174,6 +178,12 @@ module Paperclip
       instance_read(:file_size) || (@queued_for_write[:original] && @queued_for_write[:original].size)
     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)
+    end
+
     # Returns the content_type of the file as originally assigned, and lives
     # in the <attachment>_content_type attribute of the model.
     def content_type

data/lib/paperclip/interpolations.rb

@@ -88,6 +88,11 @@ module Paperclip
       attachment.instance.id
     end
 
+    # Returns the file hash of the instance.
+    def file_hash attachment, style_name
+      attachment.file_hash
+    end
+
     # Returns the id of the instance in a split path form. e.g. returns
     # 000/001/234 for an id of 1234.
     def id_partition attachment, style_name

data/lib/paperclip/upfile.rb

@@ -32,18 +32,26 @@ module Paperclip
     def size
       File.size(self)
     end
+
+    # Returns the hash of the file.
+    def file_hash
+      Digest::MD5.hexdigest(self.read)
+    end
   end
 end
 
 if defined? StringIO
   class StringIO
-    attr_accessor :original_filename, :content_type
+    attr_accessor :original_filename, :content_type, :file_hash
     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)
+    end
   end
 end
 

data/lib/paperclip/version.rb

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

data/lib/paperclip.rb

@@ -26,6 +26,7 @@
 # See the +has_attached_file+ documentation for more details.
 
 require 'erb'
+require 'digest'
 require 'tempfile'
 require 'paperclip/version'
 require 'paperclip/upfile'

data/test/attachment_test.rb

@@ -446,6 +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.expects(:size).returns(10)
       @tempfile.expects(:size).returns(10)
       @not_file.expects(:to_tempfile).returns(@tempfile)
@@ -754,5 +756,29 @@ class AttachmentTest < Test::Unit::TestCase
         assert_equal @file.size, @dummy.avatar.size
       end
     end
+
+    context "and avatar_file_hash column" do
+      setup do
+        ActiveRecord::Base.connection.add_column :dummies, :avatar_file_hash, :string
+        rebuild_class
+        @dummy = Dummy.new
+      end
+
+      should "not error when assigned an attachment" do
+        assert_nothing_raised { @dummy.avatar = @file }
+      end
+
+      should "return the right value when sent #avatar_file_hash" do
+        @dummy.avatar = @file
+        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_file_hash
+      end
+
+      should "return the right value when saved, reloaded, and sent #avatar_file_hash" do
+        @dummy.avatar = @file
+        @dummy.save
+        @dummy = Dummy.find(@dummy.id)
+        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_file_hash
+      end
+    end
   end
 end

data/test/helper.rb

@@ -86,6 +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
   end
   rebuild_class options
 end
@@ -105,6 +106,7 @@ class FakeModel
                 :avatar_file_size,
                 :avatar_last_updated,
                 :avatar_content_type,
+                :avatar_file_hash,
                 :id
 
   def errors

metadata

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