From ff0910dc1fc75e64e7ec6dc2302308bfc856d98b Mon Sep 17 00:00:00 2001 From: Jason Whittle Date: Mon, 10 Jan 2011 18:14:09 -0500 Subject: [PATCH] Make Storage::S3.parse_credentials use of Rails.env optional. Closes #389, Closes #390 --- lib/paperclip/storage/s3.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/paperclip/storage/s3.rb b/lib/paperclip/storage/s3.rb index c0ded322d..1530466d1 100644 --- a/lib/paperclip/storage/s3.rb +++ b/lib/paperclip/storage/s3.rb @@ -135,7 +135,8 @@ def s3_host_alias def parse_credentials creds creds = find_credentials(creds).stringify_keys - (creds[Rails.env] || creds).symbolize_keys + env = Object.const_defined?(:Rails) ? Rails.env : nil + (creds[env] || creds).symbolize_keys end def exists?(style = default_style)