Fix ruby 2.7 warnings about keyword parameters (#12824)
This commit is contained in:
parent
57e2833f6a
commit
10f1450bba
@ -13,13 +13,13 @@ module RoutingHelper
|
|||||||
end
|
end
|
||||||
|
|
||||||
def full_asset_url(source, **options)
|
def full_asset_url(source, **options)
|
||||||
source = ActionController::Base.helpers.asset_url(source, options) unless use_storage?
|
source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
|
||||||
|
|
||||||
URI.join(root_url, source).to_s
|
URI.join(root_url, source).to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
def full_pack_url(source, **options)
|
def full_pack_url(source, **options)
|
||||||
full_asset_url(asset_pack_path(source, options))
|
full_asset_url(asset_pack_path(source, **options))
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
@ -8,7 +8,7 @@ module Paperclip
|
|||||||
pixels = convert(':source RGB:-', source: File.expand_path(@file.path)).unpack('C*')
|
pixels = convert(':source RGB:-', source: File.expand_path(@file.path)).unpack('C*')
|
||||||
geometry = options.fetch(:file_geometry_parser).from_file(@file)
|
geometry = options.fetch(:file_geometry_parser).from_file(@file)
|
||||||
|
|
||||||
attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, options[:blurhash] || {})
|
attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, **(options[:blurhash] || {}))
|
||||||
|
|
||||||
@file
|
@file
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user