Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make sure the `aws/sdk` patch got picked up

  • Loading branch information...
commit 8fb033155178247c7b63893b5452221369fbdc0f 1 parent b48ec84
@sikachu sikachu authored
Showing with 15 additions and 15 deletions.
  1. +15 −15 lib/paperclip/storage/s3.rb
View
30 lib/paperclip/storage/s3.rb
@@ -85,26 +85,26 @@ module S3
def self.extended base
begin
require 'aws-sdk'
-
- # Overriding AWS::Core::LogFormatter to make sure it return a UTF-8 string
- if AWS::VERSION >= "1.3.9"
- AWS::Core::LogFormatter.class_eval do
- def summarize_hash(hash)
- hash.map { |key, value| ":#{key}=>#{summarize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
- end
- end
- else
- AWS::Core::ClientLogging.class_eval do
- def sanitize_hash(hash)
- hash.map { |key, value| "#{sanitize_value(key)}=>#{sanitize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
- end
- end
- end
rescue LoadError => e
e.message << " (You may need to install the aws-sdk gem)"
raise e
end unless defined?(AWS::Core)
+ # Overriding AWS::Core::LogFormatter to make sure it return a UTF-8 string
+ if AWS::VERSION >= "1.3.9"
+ AWS::Core::LogFormatter.class_eval do
+ def summarize_hash(hash)
+ hash.map { |key, value| ":#{key}=>#{summarize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
+ end
+ end
+ else
+ AWS::Core::ClientLogging.class_eval do
+ def sanitize_hash(hash)
+ hash.map { |key, value| "#{sanitize_value(key)}=>#{sanitize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
+ end
+ end
+ end
+
base.instance_eval do
@s3_options = @options[:s3_options] || {}
@s3_permissions = set_permissions(@options[:s3_permissions])
Please sign in to comment.
Something went wrong with that request. Please try again.