Correctly set style when interpolating :hash

lib/paperclip/attachment.rb

@@ -212,10 +212,10 @@ module Paperclip
 
 
     # Returns a unique hash suitable for obfuscating the URL of an otherwise
     # Returns a unique hash suitable for obfuscating the URL of an otherwise
     # publicly viewable attachment.
     # publicly viewable attachment.
-    def hash
+    def hash(style_name = default_style)
       raise ArgumentError, "Unable to generate hash without :hash_secret" unless @hash_secret
       raise ArgumentError, "Unable to generate hash without :hash_secret" unless @hash_secret
       require 'openssl' unless defined?(OpenSSL)
       require 'openssl' unless defined?(OpenSSL)
-      data = interpolate(@hash_data)
+      data = interpolate(@hash_data, style_name)
       OpenSSL::HMAC.hexdigest(OpenSSL::Digest.const_get(@hash_digest).new, @hash_secret, data)
       OpenSSL::HMAC.hexdigest(OpenSSL::Digest.const_get(@hash_digest).new, @hash_secret, data)
     end
     end
 
 

lib/paperclip/interpolations.rb

@@ -49,7 +49,7 @@ module Paperclip
 
 
     # Returns the timestamp as defined by the <attachment>_updated_at field
     # Returns the timestamp as defined by the <attachment>_updated_at field
     # in the server default time zone unless :use_global_time_zone is set
     # in the server default time zone unless :use_global_time_zone is set
-    # to false.  Note that a Rails.config.time_zone change will still 
+    # to false.  Note that a Rails.config.time_zone change will still
     # invalidate any path or URL that uses :timestamp.  For a
     # invalidate any path or URL that uses :timestamp.  For a
     # time_zone-agnostic timestamp, use #updated_at.
     # time_zone-agnostic timestamp, use #updated_at.
     def timestamp attachment, style_name
     def timestamp attachment, style_name
@@ -107,7 +107,7 @@ module Paperclip
     # Returns a the attachment hash.  See Paperclip::Attachment#hash for
     # Returns a the attachment hash.  See Paperclip::Attachment#hash for
     # more details.
     # more details.
     def hash attachment, style_name
     def hash attachment, style_name
-      attachment.hash
+      attachment.hash(style_name)
     end
     end
 
 
     # Returns the id of the instance in a split path form. e.g. returns
     # Returns the id of the instance in a split path form. e.g. returns

test/attachment_test.rb

@@ -96,7 +96,7 @@ class AttachmentTest < Test::Unit::TestCase
       assert_equal "1024.omg/1024-bbq/1024what/000/001/024.wtf", @dummy.avatar.path
       assert_equal "1024.omg/1024-bbq/1024what/000/001/024.wtf", @dummy.avatar.path
     end
     end
   end
   end
-  
+
   context "An attachment with :timestamp interpolations" do
   context "An attachment with :timestamp interpolations" do
     setup do
     setup do
       @file = StringIO.new("...")
       @file = StringIO.new("...")
@@ -117,7 +117,7 @@ class AttachmentTest < Test::Unit::TestCase
         assert_equal @dummy.avatar_updated_at.in_time_zone(@zone_default).to_s, @dummy.avatar.path
         assert_equal @dummy.avatar_updated_at.in_time_zone(@zone_default).to_s, @dummy.avatar.path
       end
       end
     end
     end
-    
+
     context "using per-thread time zone" do
     context "using per-thread time zone" do
       setup do
       setup do
         rebuild_model :path => ":timestamp", :use_default_time_zone => false
         rebuild_model :path => ":timestamp", :use_default_time_zone => false
@@ -130,12 +130,12 @@ class AttachmentTest < Test::Unit::TestCase
       end
       end
     end
     end
   end
   end
-  
+
   context "An attachment with :hash interpolations" do
   context "An attachment with :hash interpolations" do
     setup do
     setup do
       @file = StringIO.new("...")
       @file = StringIO.new("...")
     end
     end
-    
+
     should "raise if no secret is provided" do
     should "raise if no secret is provided" do
       @attachment = attachment :path => ":hash"
       @attachment = attachment :path => ":hash"
       @attachment.assign @file
       @attachment.assign @file
@@ -153,19 +153,24 @@ class AttachmentTest < Test::Unit::TestCase
         @attachment.instance.id = 1234
         @attachment.instance.id = 1234
         @attachment.assign @file
         @attachment.assign @file
       end
       end
-      
+
       should "interpolate the hash data" do
       should "interpolate the hash data" do
-        @attachment.expects(:interpolate).with(@attachment.options[:hash_data]).returns("interpolated_stuff")
+        @attachment.expects(:interpolate).with(@attachment.options[:hash_data],anything).returns("interpolated_stuff")
         @attachment.hash
         @attachment.hash
       end
       end
-      
+
       should "result in the correct interpolation" do
       should "result in the correct interpolation" do
         assert_equal "fake_models/avatars/1234/original/1234567890", @attachment.send(:interpolate,@attachment.options[:hash_data])
         assert_equal "fake_models/avatars/1234/original/1234567890", @attachment.send(:interpolate,@attachment.options[:hash_data])
       end
       end
-      
+
       should "result in a correct hash" do
       should "result in a correct hash" do
         assert_equal "d22b617d1bf10016aa7d046d16427ae203f39fce", @attachment.path
         assert_equal "d22b617d1bf10016aa7d046d16427ae203f39fce", @attachment.path
       end
       end
+
+      should "generate a hash digest with the correct style" do
+        OpenSSL::HMAC.expects(:hexdigest).with(anything, anything, "fake_models/avatars/1234/medium/1234567890")
+        @attachment.path("medium")
+      end
     end
     end
   end
   end
 
 
@@ -558,7 +563,7 @@ class AttachmentTest < Test::Unit::TestCase
       assert_equal "sheep_say_bæ.png", @dummy.avatar.original_filename
       assert_equal "sheep_say_bæ.png", @dummy.avatar.original_filename
     end
     end
   end
   end
-  
+
   context "Attachment with uppercase extension and a default style" do
   context "Attachment with uppercase extension and a default style" do
     setup do
     setup do
       @old_defaults = Paperclip::Attachment.default_options.dup
       @old_defaults = Paperclip::Attachment.default_options.dup
@@ -571,7 +576,7 @@ class AttachmentTest < Test::Unit::TestCase
       @instance.stubs(:id).returns 123
       @instance.stubs(:id).returns 123
 
 
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "uppercase.PNG"), 'rb')
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "uppercase.PNG"), 'rb')
-      
+
       styles = {:styles => { :large  => ["400x400", :jpg],
       styles = {:styles => { :large  => ["400x400", :jpg],
                              :medium => ["100x100", :jpg],
                              :medium => ["100x100", :jpg],
                              :small => ["32x32#", :jpg]},
                              :small => ["32x32#", :jpg]},
@@ -584,7 +589,7 @@ class AttachmentTest < Test::Unit::TestCase
       @attachment.assign(@file)
       @attachment.assign(@file)
       @attachment.save
       @attachment.save
     end
     end
-    
+
     teardown do
     teardown do
       @file.close
       @file.close
       Paperclip::Attachment.default_options.merge!(@old_defaults)
       Paperclip::Attachment.default_options.merge!(@old_defaults)