Make a few updates for latest Rubocop (#908)

petergoldstein · Apr 25, 2022 · 8ad238d · 8ad238d
1 parent 313c2d8
commit 8ad238d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/dalli/protocol/base.rb b/lib/dalli/protocol/base.rb
@@ -127,11 +127,11 @@ def pipeline_complete?
       end
 
       def username
-        @options[:username] || ENV['MEMCACHE_USERNAME']
+        @options[:username] || ENV.fetch('MEMCACHE_USERNAME', nil)
       end
 
       def password
-        @options[:password] || ENV['MEMCACHE_PASSWORD']
+        @options[:password] || ENV.fetch('MEMCACHE_PASSWORD', nil)
       end
 
       def require_auth?

diff --git a/lib/dalli/servers_arg_normalizer.rb b/lib/dalli/servers_arg_normalizer.rb
@@ -40,7 +40,7 @@ def self.normalize_servers(arg)
     def self.apply_defaults(arg)
       return arg unless arg.nil?
 
-      ENV[ENV_VAR_NAME] || DEFAULT_SERVERS
+      ENV.fetch(ENV_VAR_NAME, nil) || DEFAULT_SERVERS
     end
 
     def self.validate_type(arg)