Browse Source

Fix ruby 2.7 warnings about keyword parameters (#12824)

ThibG 4 years ago
parent
commit
10f1450bba
2 changed files with 3 additions and 3 deletions
  1. 2 2
      app/helpers/routing_helper.rb
  2. 1 1
      lib/paperclip/blurhash_transcoder.rb

+ 2 - 2
app/helpers/routing_helper.rb

@@ -13,13 +13,13 @@ module RoutingHelper
   end
 
   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
   end
 
   def full_pack_url(source, **options)
-    full_asset_url(asset_pack_path(source, options))
+    full_asset_url(asset_pack_path(source, **options))
   end
 
   private

+ 1 - 1
lib/paperclip/blurhash_transcoder.rb

@@ -8,7 +8,7 @@ module Paperclip
       pixels   = convert(':source RGB:-', source: File.expand_path(@file.path)).unpack('C*')
       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
     end