Merge pull request #919 from pod4lib/update-dependencies

Update dependencies

Gemfile.lock

@@ -140,7 +140,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    debug (1.6.2)
+    debug (1.6.3)
       irb (>= 1.3.6)
       reline (>= 0.3.1)
     deep_merge (1.2.2)
@@ -169,7 +169,7 @@ GEM
       zeitwerk (~> 2.6)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.9.0)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (0.3.0)
@@ -178,7 +178,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.9, >= 0.9)
       zeitwerk (~> 2.6)
-    dry-schema (1.11.2)
+    dry-schema (1.11.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.16, >= 0.16)
       dry-core (~> 0.9, >= 0.9)
@@ -220,7 +220,7 @@ GEM
       activesupport (>= 5.2)
     hashdiff (1.0.1)
     highline (2.0.3)
-    honeybadger (4.12.2)
+    honeybadger (5.0.0)
     http (5.1.0)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
@@ -290,16 +290,16 @@ GEM
       net-protocol
     net-protocol (0.1.3)
       timeout
-    net-scp (4.0.0.rc1)
+    net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-smtp (0.3.2)
       net-protocol
     net-ssh (7.0.1)
     nio4r (2.5.8)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-darwin)
+    nokogiri (1.13.9-x86_64-darwin)
       racc (~> 1.4)
     okcomputer (1.18.4)
     orm_adapter (0.5.0)
@@ -377,7 +377,7 @@ GEM
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (6.0.0)
+    rspec-rails (6.0.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -386,26 +386,26 @@ GEM
       rspec-mocks (~> 3.11)
       rspec-support (~> 3.11)
     rspec-support (3.11.1)
-    rubocop (1.36.0)
+    rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.16.1)
+    rubocop-rails (2.17.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.13.2)
+    rubocop-rspec (2.14.1)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     rubyzip (2.3.2)

app/controllers/marc_records_controller.rb

@@ -6,8 +6,6 @@ class MarcRecordsController < ApplicationController
   load_and_authorize_resource through: :organization
   protect_from_forgery with: :null_session, if: :jwt_token
 
-  def show; end
-
   def index
     @marc_records = @marc_records.where(marc001: index_params[:marc001]) if index_params[:marc001]
     if index_params[:stream]
@@ -17,6 +15,8 @@ def index
     @marc_records = @marc_records.page(index_params[:page])
   end
 
+  def show; end
+
   def marc21
     response.headers['Content-Disposition'] = "filename=#{@organization.slug}-#{@marc_record.marc001}.mrc"
     render body: @marc_record.marc.to_marc, content_type: 'application/marc'

app/controllers/organization_users_controller.rb

@@ -8,28 +8,28 @@ class OrganizationUsersController < ApplicationController
 
   def index; end
 
-  def destroy
+  # rubocop:disable Metrics/AbcSize
+  def update
     authorize! :manage, @organization
-    @user.destroy
+    @user.remove_role(params[:remove_role], @organization) if params[:remove_role].present?
+    @user.add_role(params[:add_role], @organization) if params[:add_role].present?
 
     respond_to do |format|
-      format.html { redirect_to organization_users_url(@organization), notice: 'User was successfully removed.' }
+      format.html { redirect_to organization_users_url(@organization), notice: 'User role was successfully updated.' }
       format.json { head :no_content }
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
-  # rubocop:disable Metrics/AbcSize
-  def update
+  def destroy
     authorize! :manage, @organization
-    @user.remove_role(params[:remove_role], @organization) if params[:remove_role].present?
-    @user.add_role(params[:add_role], @organization) if params[:add_role].present?
+    @user.destroy
 
     respond_to do |format|
-      format.html { redirect_to organization_users_url(@organization), notice: 'User role was successfully updated.' }
+      format.html { redirect_to organization_users_url(@organization), notice: 'User was successfully removed.' }
       format.json { head :no_content }
     end
   end
-  # rubocop:enable Metrics/AbcSize
 
   def load_user
     @user = User.find(params[:id]) || User.new

spec/features/edit_profile_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'editing your user profile', type: :feature do
+RSpec.describe 'editing your user profile' do
   context 'with a user' do
     let(:user) { create(:user, email: '[email protected]') }
 

spec/features/homepage_summary_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'homepage summary', type: :feature do
+RSpec.describe 'homepage summary' do
   let(:provider) { create(:organization, name: 'Provider', provider: true) }
   let(:upload1) { create(:upload, :marc_xml, organization: provider, stream: provider.default_stream) }
   let(:upload2) { create(:upload, :marc21_multi_record, organization: provider, stream: provider.default_stream) }

spec/features/nav_dropdown_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Using the dropdown menu in the navbar', type: :feature do
+RSpec.describe 'Using the dropdown menu in the navbar' do
   let(:organization) { create(:organization, name: 'Best University') }
   let(:user) { create(:user) }
 

spec/features/normalized_download_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Downloading normalized files from POD', type: :feature do
+RSpec.describe 'Downloading normalized files from POD' do
   let(:organization) { create(:organization, code: 'best-org') }
   let(:stream) { create(:stream, organization: organization, default: true) }
   let(:user) { create(:user) }

spec/features/oai_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'OAI-PMH', type: :feature do
+RSpec.describe 'OAI-PMH' do
   let(:organization) { create(:organization, name: 'My Org', slug: 'my-org') }
   let(:user) { create(:user) }
 

spec/features/providers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Viewing provider information', type: :feature do
+RSpec.describe 'Viewing provider information' do
   let(:organization) { create(:organization, name: 'Best org', code: 'best-org') }
   let(:user) { create(:user) }
 

spec/features/unprivileged_user_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Downloading normalzed files from POD', type: :feature do
+RSpec.describe 'Downloading normalzed files from POD' do
   let(:organization) { create(:organization, name: 'Best org', code: 'best-org') }
   let(:user) { create(:user) }
 

spec/features/upload_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'uploading files to POD', type: :feature do
+RSpec.describe 'uploading files to POD' do
   context 'with an organization user' do
     let(:organization) { create(:organization, name: 'Best University') }
     let(:stream) { create(:stream, organization: organization) }

spec/helpers/dashboard_helper_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe DashboardHelper, type: :helper do
+RSpec.describe DashboardHelper do
   let(:organization) { create(:organization) }
   let(:uploads) do
     [

spec/helpers/organizations_helper_spec.rb

@@ -12,6 +12,6 @@
 #     end
 #   end
 # end
-RSpec.describe OrganizationsHelper, type: :helper do
+RSpec.describe OrganizationsHelper do
   pending "add some examples to (or delete) #{__FILE__}"
 end

spec/helpers/uploads_helper_spec.rb

@@ -12,6 +12,6 @@
 #     end
 #   end
 # end
-RSpec.describe UploadsHelper, type: :helper do
+RSpec.describe UploadsHelper do
   pending "add some examples to (or delete) #{__FILE__}"
 end

spec/jobs/attach_remote_file_to_upload_job_spec.rb

@@ -11,7 +11,7 @@ def meta
   end
 end
 
-RSpec.describe AttachRemoteFileToUploadJob, type: :job do
+RSpec.describe AttachRemoteFileToUploadJob do
   include ActiveJob::TestHelper
 
   before do

spec/jobs/cleanup_and_remove_data_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe CleanupAndRemoveDataJob, type: :job do
+RSpec.describe CleanupAndRemoveDataJob do
   let(:organization) { create(:organization) }
 
   describe 'archives older streams for an organization after a quarter of not being updated' do

spec/jobs/extract_files_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ExtractFilesJob, type: :job do
+RSpec.describe ExtractFilesJob do
   let!(:upload) { create(:upload, :tar_gz) }
 
   it 'creates additional uploads for each extracted file' do

spec/jobs/extract_marc_record_metadata_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ExtractMarcRecordMetadataJob, type: :job do
+RSpec.describe ExtractMarcRecordMetadataJob do
   include ActiveJob::TestHelper
 
   let(:upload) { create(:upload, :binary_marc) }

spec/jobs/generate_delta_dump_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe GenerateDeltaDumpJob, type: :job do
+RSpec.describe GenerateDeltaDumpJob do
   let(:organization) { create(:organization) }
 
   before do

spec/jobs/generate_full_dump_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe GenerateFullDumpJob, type: :job do
+RSpec.describe GenerateFullDumpJob do
   let(:organization) { create(:organization) }
 
   before do

spec/jobs/generate_interstream_delta_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe GenerateInterstreamDeltaJob, type: :job do
+RSpec.describe GenerateInterstreamDeltaJob do
   let(:organization) { create(:organization) }
 
   before do

spec/jobs/reanalyze_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ReanalyzeJob, type: :job do
+RSpec.describe ReanalyzeJob do
   let(:organization) { create(:organization) }
 
   context 'with a stream' do

spec/jobs/update_organization_statistics_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UpdateOrganizationStatisticsJob, type: :job do
+RSpec.describe UpdateOrganizationStatisticsJob do
   let(:organization) { create(:organization) }
   let(:first_upload) { build(:upload, :binary_marc) }
   let(:second_upload) { build(:upload, :binary_marc) }

spec/mailers/contact_emails_mailer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ContactEmailsMailer, type: :mailer do
+RSpec.describe ContactEmailsMailer do
   let(:contact_email) { build(:contact_email) }
 
   describe 'confirm_email' do

spec/models/contact_email_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ContactEmail, type: :model do
+RSpec.describe ContactEmail do
   subject(:contact_email) { build(:contact_email, organization: organization) }
 
   let(:organization) { build(:organization) }

spec/models/default_stream_history_spec.rb

@@ -2,6 +2,6 @@
 
 require 'rails_helper'
 
-RSpec.describe DefaultStreamHistory, type: :model do
+RSpec.describe DefaultStreamHistory do
   pending "add some examples to (or delete) #{__FILE__}"
 end

spec/models/interstream_delta_spec.rb

@@ -2,6 +2,6 @@
 
 require 'rails_helper'
 
-RSpec.describe InterstreamDelta, type: :model do
+RSpec.describe InterstreamDelta do
   pending "add some examples to (or delete) #{__FILE__}"
 end

spec/models/job_tracker_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe JobTracker, type: :model do
+RSpec.describe JobTracker do
   subject(:job_tracker) do
     described_class.new(attributes.merge(job_class: 'whatever',
                                          job_id: job_id,

spec/models/marc_profile_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe MarcProfile, type: :model do
+RSpec.describe MarcProfile do
   let(:upload) { create(:upload, :binary_marc) }
   let(:blob) { upload.files.first.blob }
 

spec/models/marc_record_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe MarcRecord, type: :model do
+RSpec.describe MarcRecord do
   subject(:marc_record) { described_class.new(marc: record, upload: upload, **attr) }
 
   let(:attr) { {} }