resolver.rb in ddtrace-0.46.0

- old
+ new

@@ -54,15 +54,13 @@
             return options if options[:_parsed]
 
             defaults = DEFAULTS.dup
             options = options.dup
 
-            defaults.keys.each do |key|
+            defaults.each_key do |key|
               # Fill in defaults if needed
-              if defaults[key].respond_to?(:call)
-                defaults[key] = defaults[key].call
-              end
+              defaults[key] = defaults[key].call if defaults[key].respond_to?(:call)
 
               # Symbolize only keys that are needed
               options[key] = options[key.to_s] if options.key?(key.to_s)
             end
 
@@ -71,13 +69,14 @@
 
             # Override defaults from URL if given
             if url
               uri = URI(url)
 
-              if uri.scheme == 'unix'
+              case uri.scheme
+              when 'unix'
                 defaults[:path] = uri.path
-              elsif uri.scheme == 'redis' || uri.scheme == 'rediss'
+              when 'redis', 'rediss'
                 defaults[:scheme]   = uri.scheme
                 defaults[:host]     = uri.host if uri.host
                 defaults[:port]     = uri.port if uri.port
                 defaults[:password] = CGI.unescape(uri.password) if uri.password
                 defaults[:db]       = uri.path[1..-1].to_i if uri.path
@@ -88,10 +87,10 @@
 
               # defaults[:ssl] = true if uri.scheme == "rediss"
             end
 
             # Use default when option is not specified or nil
-            defaults.keys.each do |key|
+            defaults.each_key do |key|
               options[key] = defaults[key] if options[key].nil?
             end
 
             if options[:path]
               # Unix socket