Add compatibility with Ruby 3

.circleci/config.yml

@@ -34,6 +34,9 @@ workflows:
   version: 2
   ci:
     jobs:
+      - test:
+          name: "ruby3-0"
+          ruby_version: "3.0.0"
       - test:
           name: "ruby2-7"
           ruby_version: "2.7.0"

lib/iiif_manifest/manifest_service_locator.rb

@@ -195,13 +195,13 @@ def iiif_autocomplete_service_factory
 
     class InjectedFactory
       attr_reader :factory, :hash_args
-      def initialize(factory, hash_args)
+      def initialize(factory, **hash_args)
         @hash_args = hash_args
         @factory = factory
       end
 
       def new(*args)
-        factory.new(*args, hash_args)
+        factory.new(*args, **hash_args)
       end
     end
   end

spec/lib/iiif_manifest/manifest_factory_spec.rb

@@ -85,13 +85,9 @@ def display_image
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'returns a sequence' do
-        allow(IIIFManifest::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
 
         result
-
-        expect(IIIFManifest::ManifestBuilder::CanvasBuilder).to have_received(:new)
-          .exactly(1).times.with(file_presenter, anything, anything)
       end
       it 'builds a structure if it can' do
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
@@ -115,7 +111,6 @@ def display_image
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'does not have a rendering on the sequence' do
-        allow(IIIFManifest::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
         expect(result['sequences'][0]['rendering']).to eq []
       end
@@ -155,7 +150,6 @@ def sequence_rendering
       end
 
       it 'has a rendering on the sequence' do
-        allow(IIIFManifest::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
 
         expect(result['sequences'][0]['rendering']).to eq [{
@@ -168,7 +162,6 @@ def sequence_rendering
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'does not have a metadata element' do
-        allow(IIIFManifest::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
         expect(result['metadata']).to eq nil
       end
@@ -197,7 +190,6 @@ def sequence_rendering
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'does not have a service element' do
-        allow(IIIFManifest::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
         expect(result['service']).to eq nil
       end

spec/lib/iiif_manifest/v3/manifest_factory_spec.rb

@@ -108,13 +108,10 @@ def display_image
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'returns items' do
-        allow(IIIFManifest::V3::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
 
         result
 
-        expect(IIIFManifest::V3::ManifestBuilder::CanvasBuilder).to have_received(:new)
-          .exactly(1).times.with(file_presenter, anything, anything)
         expect(result['items'].length).to eq 1
         expect(result['items'].first['type']).to eq 'Canvas'
         expect(result['items'].first['id']).to eq 'http://test.host/books/book-77/manifest/canvas/test-22'
@@ -153,7 +150,6 @@ def display_image
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'does not have a rendering on the sequence' do
-        allow(IIIFManifest::V3::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
         expect(result['rendering']).to eq []
       end
@@ -195,7 +191,6 @@ def sequence_rendering
       end
 
       it 'has a rendering on the canvas' do
-        allow(IIIFManifest::V3::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
 
         expect(result['rendering']).to eq [{
@@ -210,7 +205,6 @@ def sequence_rendering
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'does not have a metadata element' do
-        allow(IIIFManifest::V3::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
         expect(result['metadata']).to eq nil
       end
@@ -251,7 +245,6 @@ def sequence_rendering
       let(:file_presenter) { DisplayImagePresenter.new }
 
       it 'does not have a service element' do
-        allow(IIIFManifest::V3::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
         expect(result['service']).to eq nil
       end
@@ -416,7 +409,6 @@ def display_content
           end
         end
 
-        allow(IIIFManifest::V3::ManifestBuilder::CanvasBuilder).to receive(:new).and_call_original
         allow(book_presenter).to receive(:file_set_presenters).and_return([file_presenter])
       end