Make Storage::S3.parse_credentials use of Rails.env optional.

Closes #389, Closes #390

Make Storage::S3.parse_credentials use of Rails.env optional.
Closes #389, Closes #390
ff0910dc · Jason Whittle · Prem Sichanugrist · 791b70d7 · ff0910dc
Commit ff0910dc authored Jan 10, 2011 by Jason Whittle Committed by Prem Sichanugrist Jun 30, 2011
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

lib/paperclip/storage/s3.rb
+2 -1

No files found.
--- a/lib/paperclip/storage/s3.rb
+++ b/lib/paperclip/storage/s3.rb
@@ -135,7 +135,8 @@ module Paperclip
      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)