From 1cf4011b20ceb4997e8792d59e2a66fe617cd9f7 Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Tue, 24 Jan 2023 14:44:33 -0500 Subject: [PATCH] Fix kwarg changes in ruby 3.0 --- lib/valkyrie/persistence/fedora/ordered_list.rb | 4 ++-- spec/support/fedora_helper.rb | 2 +- .../persistence/fedora/metadata_adapter_spec.rb | 4 ++-- .../fedora/persister/model_converter_spec.rb | 2 +- spec/valkyrie/persistence/fedora/persister_spec.rb | 2 +- spec/valkyrie/persistence/fedora/query_service_spec.rb | 2 +- spec/valkyrie/storage/fedora_spec.rb | 10 +++++----- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/valkyrie/persistence/fedora/ordered_list.rb b/lib/valkyrie/persistence/fedora/ordered_list.rb index 57371469f..2af7ab7f1 100644 --- a/lib/valkyrie/persistence/fedora/ordered_list.rb +++ b/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 diff --git a/spec/support/fedora_helper.rb b/spec/support/fedora_helper.rb index 9380ef454..11c7a4f23 100644 --- a/spec/support/fedora_helper.rb +++ b/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 diff --git a/spec/valkyrie/persistence/fedora/metadata_adapter_spec.rb b/spec/valkyrie/persistence/fedora/metadata_adapter_spec.rb index 38998e550..e486469f8 100644 --- a/spec/valkyrie/persistence/fedora/metadata_adapter_spec.rb +++ b/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 diff --git a/spec/valkyrie/persistence/fedora/persister/model_converter_spec.rb b/spec/valkyrie/persistence/fedora/persister/model_converter_spec.rb index dd980a284..47dc7de3d 100644 --- a/spec/valkyrie/persistence/fedora/persister/model_converter_spec.rb +++ b/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 diff --git a/spec/valkyrie/persistence/fedora/persister_spec.rb b/spec/valkyrie/persistence/fedora/persister_spec.rb index 05766d6e0..c954c69ef 100644 --- a/spec/valkyrie/persistence/fedora/persister_spec.rb +++ b/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 diff --git a/spec/valkyrie/persistence/fedora/query_service_spec.rb b/spec/valkyrie/persistence/fedora/query_service_spec.rb index 208ec5f46..2c25b62d4 100644 --- a/spec/valkyrie/persistence/fedora/query_service_spec.rb +++ b/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" diff --git a/spec/valkyrie/storage/fedora_spec.rb b/spec/valkyrie/storage/fedora_spec.rb index fe75f4279..c3433b1a4 100644 --- a/spec/valkyrie/storage/fedora_spec.rb +++ b/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'