Fixes for Ruby 3.0

Author: Mattia Roccoberton

lib/active_storage/service/db_service.rb

@@ -2,7 +2,7 @@
 
 module ActiveStorage
   class Service::DBService < Service
-    def initialize(**_options)
+    def initialize(**)
       @chunk_size = ENV.fetch('ASDB_CHUNK_SIZE') { 1.megabytes }
     end
 

spec/rails_helper.rb

@@ -37,6 +37,7 @@
   config.before(:suite) do
     intro = ('-' * 80)
     intro << "\n"
+    intro << "- Ruby:          #{RUBY_VERSION}\n"
     intro << "- Rails:         #{Rails.version}\n"
     intro << "- ActiveStorage: #{ActiveStorage.version}\n"
     intro << "- DB_TEST:       #{ENV['DB_TEST']}\n"

spec/service/active_storage/service/db_service_spec.rb

@@ -15,8 +15,7 @@
   let(:checksum) { Digest::MD5.base64digest(fixture_data) }
   let(:key) { SecureRandom.base58(24) }
   let(:service) { described_class.configure(:tmp, tmp: { service: 'DB' }) }
-  let(:upload_options) { {} }
-  let(:upload) { service.upload(key, StringIO.new(fixture_data), upload_options) }
+  let(:upload) { service.upload(key, StringIO.new(fixture_data)) }
 
   before do
     allow(ENV).to receive(:fetch).and_call_original
@@ -119,7 +118,7 @@
     end
 
     context 'with the checksum' do
-      let(:upload_options) { { checksum: checksum } }
+      let(:upload) { service.upload(key, StringIO.new(fixture_data), checksum: checksum) }
 
       it 'uploads the data' do
         expect(upload).to be_kind_of ActiveStorageDB::File
@@ -129,7 +128,8 @@
     end
 
     context 'with an invalid checksum' do
-      let(:upload_options) { { checksum: Digest::MD5.base64digest('some other data') } }
+      let(:checksum) { Digest::MD5.base64digest('some other data') }
+      let(:upload) { service.upload(key, StringIO.new(fixture_data), checksum: checksum) }
 
       it 'fails to upload the data' do
         expect { upload }.to raise_exception ActiveStorage::IntegrityError
@@ -159,10 +159,14 @@
   end
 
   describe '.url_for_direct_upload' do
-    subject { service.url_for_direct_upload(key, url_options) }
-
-    let(:url_options) do
-      { expires_in: 5.minutes, content_type: content_type, content_length: fixture_data.size, checksum: checksum }
+    subject do
+      service.url_for_direct_upload(
+        key,
+        expires_in: 5.minutes,
+        content_type: content_type,
+        content_length: fixture_data.size,
+        checksum: checksum
+      )
     end
 
     before do