Fix kwarg changes in ruby 3.0

Author: cjcolvar

lib/valkyrie/persistence/fedora/ordered_list.rb

@@ -156,7 +156,7 @@ class HeadSentinel < Sentinel
       # @param parent [Valkyrie::Persistence::Fedora::OrderedList]
       # @param next_node [ListNode]
       # @param prev_node [ListNode]
-      def initialize(*args)
+      def initialize(*args, **kwargs)
         super
         @next ||= TailSentinel.new(parent, prev_node: self)
       end
@@ -166,7 +166,7 @@ class TailSentinel < Sentinel
       # @param parent [Valkyrie::Persistence::Fedora::OrderedList]
       # @param next_node [ListNode]
       # @param prev_node [ListNode]
-      def initialize(*args)
+      def initialize(*args, **kwargs)
         super
         prev.next = self if prev&.next != self
       end

spec/support/fedora_helper.rb

@@ -37,7 +37,7 @@ def fedora_auth
   end
 
   def wipe_fedora!(base_path:, fedora_version: 4)
-    Valkyrie::Persistence::Fedora::MetadataAdapter.new(fedora_adapter_config(base_path: base_path, fedora_version: fedora_version)).persister.wipe!
+    Valkyrie::Persistence::Fedora::MetadataAdapter.new(**fedora_adapter_config(base_path: base_path, fedora_version: fedora_version)).persister.wipe!
   end
 end
 

spec/valkyrie/persistence/fedora/metadata_adapter_spec.rb

@@ -6,7 +6,7 @@
   [4, 5, 6].each do |fedora_version|
     context "fedora #{fedora_version}" do
       let(:version) { fedora_version }
-      let(:adapter) { described_class.new(fedora_adapter_config(base_path: "test_fed", fedora_version: version)) }
+      let(:adapter) { described_class.new(**fedora_adapter_config(base_path: "test_fed", fedora_version: version)) }
       it_behaves_like "a Valkyrie::MetadataAdapter"
 
       describe "#schema" do
@@ -15,7 +15,7 @@
         end
 
         context "with a custom schema" do
-          let(:adapter) { described_class.new(fedora_adapter_config(base_path: "test_fed", schema: "custom-schema", fedora_version: version)) }
+          let(:adapter) { described_class.new(**fedora_adapter_config(base_path: "test_fed", schema: "custom-schema", fedora_version: version)) }
           specify { expect(adapter.schema).to eq("custom-schema") }
         end
       end

spec/valkyrie/persistence/fedora/persister/model_converter_spec.rb

@@ -7,7 +7,7 @@
       let(:version) { fedora_version }
       let(:adapter) do
         Valkyrie::Persistence::Fedora::MetadataAdapter.new(
-          fedora_adapter_config(base_path: "test_fed", schema: schema, fedora_version: version)
+          **fedora_adapter_config(base_path: "test_fed", schema: schema, fedora_version: version)
         )
       end
 

spec/valkyrie/persistence/fedora/persister_spec.rb

@@ -9,7 +9,7 @@
 
       let(:adapter) do
         Valkyrie::Persistence::Fedora::MetadataAdapter.new(
-          fedora_adapter_config(
+          **fedora_adapter_config(
             base_path: "test_fed",
             schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(title: RDF::URI("http://example.com/title")),
             fedora_version: version

spec/valkyrie/persistence/fedora/query_service_spec.rb

@@ -6,7 +6,7 @@
   [4, 5, 6].each do |fedora_version|
     context "fedora #{fedora_version}" do
       let(:version) { fedora_version }
-      let(:adapter) { Valkyrie::Persistence::Fedora::MetadataAdapter.new(fedora_adapter_config(base_path: "test_fed", fedora_version: version)) }
+      let(:adapter) { Valkyrie::Persistence::Fedora::MetadataAdapter.new(**fedora_adapter_config(base_path: "test_fed", fedora_version: version)) }
       let(:persister) { adapter.persister }
       let(:query_service) { adapter.query_service }
       it_behaves_like "a Valkyrie query provider"

spec/valkyrie/storage/fedora_spec.rb

@@ -17,7 +17,7 @@ class Valkyrie::Specs::FedoraCustomResource < Valkyrie::Resource
       wipe_fedora!(base_path: "test", fedora_version: 4)
     end
 
-    let(:storage_adapter) { described_class.new(fedora_adapter_config(base_path: 'test', fedora_version: 4)) }
+    let(:storage_adapter) { described_class.new(**fedora_adapter_config(base_path: 'test', fedora_version: 4)) }
     let(:file) { fixture_file_upload('files/example.tif', 'image/tiff') }
 
     it_behaves_like "a Valkyrie::StorageAdapter"
@@ -50,7 +50,7 @@ class Valkyrie::Specs::FedoraCustomResource < Valkyrie::Resource
       wipe_fedora!(base_path: "test", fedora_version: 5)
     end
 
-    let(:storage_adapter) { described_class.new(fedora_adapter_config(base_path: 'test', fedora_version: 5)) }
+    let(:storage_adapter) { described_class.new(**fedora_adapter_config(base_path: 'test', fedora_version: 5)) }
     let(:file) { fixture_file_upload('files/example.tif', 'image/tiff') }
 
     it_behaves_like "a Valkyrie::StorageAdapter"
@@ -91,7 +91,7 @@ class Valkyrie::Specs::FedoraCustomResource < Valkyrie::Resource
       end
       context 'when using default transformer' do
         context 'and basepath is passed in' do
-          let(:storage_adapter) { described_class.new(fedora_adapter_config(base_path: 'test', fedora_version: 5)) }
+          let(:storage_adapter) { described_class.new(**fedora_adapter_config(base_path: 'test', fedora_version: 5)) }
 
           it 'produces a valid URI' do
             expected_uri = 'fedora://localhost:8998/rest/test/AN1D4UHA/original'
@@ -100,7 +100,7 @@ class Valkyrie::Specs::FedoraCustomResource < Valkyrie::Resource
         end
 
         context "when basepath uses default (e.g. '/')" do
-          let(:storage_adapter) { described_class.new(fedora_adapter_config(base_path: '/', fedora_version: 5)) }
+          let(:storage_adapter) { described_class.new(**fedora_adapter_config(base_path: '/', fedora_version: 5)) }
 
           it 'produces a valid URI' do
             expected_uri = RDF::URI.new('fedora://localhost:8998/rest/AN1D4UHA/original')
@@ -128,7 +128,7 @@ class Valkyrie::Specs::FedoraCustomResource < Valkyrie::Resource
             RDF::URI.new(base_url + (head.scan(/..?/).first(4) + [id]).join('/'))
           end
         end
-        let(:storage_adapter) { described_class.new(fedora_adapter_config(base_path: 'test', fedora_version: 5)) }
+        let(:storage_adapter) { described_class.new(**fedora_adapter_config(base_path: 'test', fedora_version: 5)) }
 
         it 'produces a valid URI' do
           expected_uri = 'fedora://localhost:8998/rest/test/AN/1D/4U/HA/AN1D4UHA/original'