Skip to content

Commit

Permalink
Removes dead code
Browse files Browse the repository at this point in the history
* `AWS::Core` is an AWS SDK v1 API, we can drop it
* We don't use the "I attach a" cucumber step
  • Loading branch information
tute committed Mar 24, 2016
1 parent 895581b commit 3b4fd33
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
6 changes: 0 additions & 6 deletions cucumber/paperclip_steps.rb

This file was deleted.

15 changes: 0 additions & 15 deletions lib/paperclip/storage/s3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,6 @@ def self.extended base
raise LoadError, "paperclip does not support aws-sdk versions 2.0.0 - 2.0.33. Please upgrade aws-sdk to a newer version."
end

# Overriding log formatter to make sure it return a UTF-8 string
if defined?(::Aws::Core::LogFormatter)
::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
elsif defined?(::Aws::Core::ClientLogging)
::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])
Expand Down

0 comments on commit 3b4fd33

Please sign in to comment.