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

Use kwarg when Psych::VERSION >= 3.1.0 #98

Merged
merged 1 commit into from
Nov 19, 2022
Merged

Use kwarg when Psych::VERSION >= 3.1.0 #98

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
12 changes: 10 additions & 2 deletions lib/paperclip/storage/s3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,9 @@ def copy_to_local_file(style, local_dest_path)
def find_credentials(creds)
case creds
when File
YAML::safe_load(ERB.new(File.read(creds.path)).result, [], [], true)
load_credentials_from_file(creds.path)
when String, Pathname
YAML::safe_load(ERB.new(File.read(creds)).result, [], [], true)
load_credentials_from_file(creds)
when Hash
creds
when NilClass
Expand All @@ -445,6 +445,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 use_secure_protocol?(style_name)
s3_protocol(style_name) == "https"
end
Expand Down