Skip to content
Browse files

Formatting in storage.rb

  • Loading branch information...
1 parent 9e71b21 commit ca481b4a12afcde418aacf500532118f12cc208c @jyurek jyurek committed Feb 1, 2009
Showing with 4 additions and 4 deletions.
  1. +4 −4 lib/paperclip/storage.rb
View
8 lib/paperclip/storage.rb
@@ -118,11 +118,11 @@ def self.extended base
require 'right_aws'
base.instance_eval do
@s3_credentials = parse_credentials(@options[:s3_credentials])
- @bucket = @options[:bucket] || @s3_credentials[:bucket]
- @s3_options = @options[:s3_options] || {}
+ @bucket = @options[:bucket] || @s3_credentials[:bucket]
+ @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_protocol = @options[:s3_protocol] || (@s3_permissions == 'public-read' ? 'http' : 'https')
+ @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|

0 comments on commit ca481b4

Please sign in to comment.
Something went wrong with that request. Please try again.