Commit 1df1b030 by Prem Sichanugrist

Make sure that `aws-sdk` is installed by checking for AWS::Core instead

parent ac822448
......@@ -79,11 +79,11 @@ module Paperclip
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] || {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment