Skip to content

Commit

Permalink
Make sure that aws-sdk is installed by checking for AWS::Core instead
Browse files Browse the repository at this point in the history
  • Loading branch information
sikachu committed Dec 14, 2011
1 parent ac82244 commit 1df1b03
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/paperclip/storage/s3.rb
Expand Up @@ -79,11 +79,11 @@ module Storage
module S3
def self.extended base
begin
require 'aws/s3'
require 'aws-sdk'
rescue LoadError => e
e.message << " (You may need to install the aws-sdk gem)"
raise e
end unless defined?(AWS::S3)
end unless defined?(AWS::Core)

base.instance_eval do
@s3_options = @options[:s3_options] || {}
Expand Down

0 comments on commit 1df1b03

Please sign in to comment.