0
@@ -236,8 +236,8 @@ module Technoweenie # :nodoc:
0
         #
0
         #   @photo.authenticated_s3_url('thumbnail', :expires_in => 5.hours, :use_ssl => true)
0
         def authenticated_s3_url(*args)
0
-          thumbnail = args.first.is_a?(String) ? args.first : nil
0
-          options   = args.last.is_a?(Hash)    ? args.last  : {}
0
+          options   = args.extract_options!
0
+          thumbnail = args.shift
0
           S3Object.url_for(full_filename(thumbnail), bucket_name, options)
0
         end
0
 

0
@@ -49,6 +49,18 @@ class S3Test < Test::Unit::TestCase
0
     end
0
 
0
     test_against_subclass :test_should_create_authenticated_url, S3Attachment
0
+    
0
+    def test_should_create_authenticated_url_for_thumbnail(klass = S3Attachment)
0
+      attachment_model klass
0
+      attachment = upload_file :filename => '/files/rails.png'
0
+      ['large', :large].each do |thumbnail|
0
+        assert_match(
0
+          /^http.+rails_large\.png.+AWSAccessKeyId.+Expires.+Signature/, 
0
+          attachment.authenticated_s3_url(thumbnail), 
0
+          "authenticated_s3_url failed with #{thumbnail.class} parameter"
0
+        )
0
+      end
0
+    end
0
 
0
     def test_should_save_attachment(klass = S3Attachment)
0
       attachment_model klass