Commit d591a648 by Mike Burns

Fix the formatting.

parent 5ec9a737
...@@ -120,7 +120,7 @@ module Paperclip ...@@ -120,7 +120,7 @@ module Paperclip
end end
end end
def parse_credentials creds def parse_credentials(creds)
creds = find_credentials(creds).stringify_keys creds = find_credentials(creds).stringify_keys
env = Object.const_defined?(:Rails) ? Rails.env : nil env = Object.const_defined?(:Rails) ? Rails.env : nil
(creds[env] || creds).symbolize_keys (creds[env] || creds).symbolize_keys
...@@ -128,7 +128,7 @@ module Paperclip ...@@ -128,7 +128,7 @@ module Paperclip
private private
def find_credentials creds def find_credentials(creds)
case creds case creds
when File when File
YAML::load(ERB.new(File.read(creds.path)).result) YAML::load(ERB.new(File.read(creds.path)).result)
......
...@@ -38,7 +38,6 @@ class FogTest < Test::Unit::TestCase ...@@ -38,7 +38,6 @@ class FogTest < Test::Unit::TestCase
end end
end end
context "with default values for path and url" do context "with default values for path and url" do
setup do setup do
rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" }, rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
......
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