Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup code merged in previous PR #135 #139

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cleanup code merged in previous PR #135 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/paperclip/storage/fog.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,9 @@ def host_name_for_directory
def find_credentials(creds)
case creds
when File
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
YAML::safe_load(ERB.new(File.read(creds.path)).result, aliases: true)
else
YAML::safe_load(ERB.new(File.read(creds.path)).result)
end
load_credentials_from_file(creds.path)
when String, Pathname
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
YAML::safe_load(ERB.new(File.read(creds)).result, aliases: true)
else
YAML::safe_load(ERB.new(File.read(creds)).result)
end
load_credentials_from_file(creds.path)
when Hash
creds
else
Expand All @@ -236,6 +228,14 @@ def find_credentials(creds)
end
end

def load_credentials_from_file(path)
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
YAML::safe_load(ERB.new(File.read(path)).result, aliases: true)
else
YAML::safe_load(ERB.new(File.read(path)).result, [], [], true)
end
end

def connection
@connection ||= ::Fog::Storage.new(fog_credentials)
end
Expand Down
13 changes: 3 additions & 10 deletions lib/paperclip/storage/s3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# coding: utf-8
module Paperclip
module Storage
# Amazon's S3 file hosting service is a scalable, easy place to store files for
Expand Down Expand Up @@ -433,17 +434,9 @@ def copy_to_local_file(style, local_dest_path)
def find_credentials(creds)
case creds
when File
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
YAML::safe_load(ERB.new(File.read(creds.path)).result, aliases: true)
else
YAML::safe_load(ERB.new(File.read(creds.path)).result)
end
load_credentials_from_file(creds.path)
when String, Pathname
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
YAML::safe_load(ERB.new(File.read(creds)).result, aliases: true)
else
YAML::safe_load(ERB.new(File.read(creds)).result)
end
load_credentials_from_file(creds)
when Hash
creds
when NilClass
Expand Down