Merge remote branch 'andrewkolesnikov/master'

Conflicts: lib/dm-paperclip/storage.rb
johnny · Apr 22, 2010 · f380a09 · f380a09
2 parents c810030 + 4238a28
commit f380a09
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/dm-paperclip/storage.rb b/lib/dm-paperclip/storage.rb
@@ -176,8 +176,14 @@ def parse_credentials creds
         creds = find_credentials(creds).to_mash.stringify_keys!
         if defined? Merb && Merb.respond_to?(:env)
           (creds[Merb.env] || creds).symbolize_keys
-        else
+        elsif defined? RAILS_ENV
           (creds[RAILS_ENV] || creds).symbolize_keys
+        elsif defined? Rails && Rails.respond_to(:env)
+          (creds[Rails.env] || creds).symbolize_keys
+        elsif defined? RACK_ENV
+          (creds[RACK_ENV] || creds).symbolize_keys
+        else
+          creds.symbolize_keys
         end
       end