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

Update find_signed to find_signed! for Rails 6.1 #94

Merged
merged 1 commit into from
Dec 16, 2020
Merged

Update find_signed to find_signed! for Rails 6.1 #94

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: 11 additions & 1 deletion lib/active_storage_validations/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@ def metadata
def read_image
is_string = file.is_a?(String)
if is_string || file.is_a?(ActiveStorage::Blob)
blob = is_string ? ActiveStorage::Blob.find_signed(file) : file
if is_string
# If Rails 5.2 or 6.0, use `find_signed`
if Rails::VERSION::MAJOR < 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR == 0)
blob = ActiveStorage::Blob.find_signed(file)
# If Rails 6.1 or higher, use `find_signed!`
elsif Rails::VERSION::MAJOR > 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1)
blob = ActiveStorage::Blob.find_signed!(file)
end
else
blob = file
end

tempfile = Tempfile.new(["ActiveStorage-#{blob.id}-", blob.filename.extension_with_delimiter])
tempfile.binmode
Expand Down