Skip to content

Commit

Permalink
Formatting tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Yurek committed Dec 23, 2008
1 parent dfb603d commit 06a5d77
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/paperclip/storage.rb
Expand Up @@ -114,7 +114,7 @@ def self.extended base
@s3_options = @options[:s3_options] || {}
@s3_permissions = @options[:s3_permissions] || 'public-read'
@s3_protocol = @options[:s3_protocol] || (@s3_permissions == 'public-read' ? 'http' : 'https')
@s3_headers = @options[:s3_headers] || {}
@s3_headers = @options[:s3_headers] || {}
@url = ":s3_path_url" unless @url.to_s.match(/^:s3.*url$/)
end
base.class.interpolations[:s3_path_url] = lambda do |attachment, style|
Expand Down
5 changes: 4 additions & 1 deletion test/storage_test.rb
Expand Up @@ -153,7 +153,10 @@ class StorageTest < Test::Unit::TestCase
@key_mock = stub
@bucket_mock.expects(:key).returns(@key_mock)
@key_mock.expects(:data=)
@key_mock.expects(:put).with(nil, 'public-read', 'Content-type' => 'image/png', 'Cache-Control' => 'max-age=31557600')
@key_mock.expects(:put).with(nil,
'public-read',
'Content-type' => 'image/png',
'Cache-Control' => 'max-age=31557600')
@dummy.save
end

Expand Down

0 comments on commit 06a5d77

Please sign in to comment.