Simplify the getters to not use memoization and fix generator test

Author: fractaledmind

lib/litestream.rb

@@ -62,27 +62,27 @@ def verify!(database_path)
     # use method instead of attr_accessor to ensure
     # this works if variable set after Litestream is loaded
     def username
-      @username ||= ENV["LITESTREAM_USERNAME"] || @@username || "litestream"
+      ENV["LITESTREAM_USERNAME"] || @@username || "litestream"
     end
 
     def password
-      @password ||= ENV["LITESTREAM_PASSWORD"] || @@password
+      ENV["LITESTREAM_PASSWORD"] || @@password
     end
 
     def queue
-      @queue ||= ENV["LITESTREAM_QUEUE"] || @@queue || "default"
+      ENV["LITESTREAM_QUEUE"] || @@queue || "default"
     end
 
     def replica_bucket
-      @replica_bucket ||= @@replica_bucket || configuration.replica_bucket
+      @@replica_bucket || configuration.replica_bucket
     end
 
     def replica_key_id
-      @replica_key_id ||= @@replica_key_id || configuration.replica_key_id
+      @@replica_key_id || configuration.replica_key_id
     end
 
     def replica_access_key
-      @replica_access_key ||= @@replica_access_key || configuration.replica_access_key
+      @@replica_access_key || configuration.replica_access_key
     end
 
     def replicate_process

test/generators/test_install.rb

@@ -28,9 +28,9 @@ def after_teardown
     end
 
     assert_file "config/initializers/litestream.rb" do |content|
-      assert_match "config.replica_bucket = litestream_credentials.replica_bucket", content
-      assert_match "config.replica_key_id = litestream_credentials.replica_key_id", content
-      assert_match "config.replica_access_key = litestream_credentials.replica_access_key", content
+      assert_match "config.litestream.replica_bucket = litestream_credentials&.replica_bucket", content
+      assert_match "config.litestream.replica_key_id = litestream_credentials&.replica_key_id", content
+      assert_match "config.litestream.replica_access_key = litestream_credentials&.replica_access_key", content
     end
   end
 end