Merge pull request #1804 from psu-libraries/niftany-upgrade

granta03 · web-flow · commit b82be3b24bbf · 2025-09-16T08:57:25.000-04:00
Niftany Upgrade to 0.12.1
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -45,6 +45,7 @@ Metrics/CyclomaticComplexity:
 Metrics/ClassLength:
   Exclude:
     - 'app/models/work_version.rb'
+    - 'app/services/merge_collection.rb'
 
 Rails/DynamicFindBy:
   Exclude:
@@ -161,3 +162,9 @@ Layout/LineLength:
 RSpec/ReceiveMessages:
   Exclude:
     - 'spec/decorators/resource_decorator_spec.rb'
+
+Naming/PredicateMethod:
+  Enabled: false
+
+Capybara/NegationMatcherAfterVisit:
+  Enabled: false
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -94,7 +94,7 @@ GEM
       faraday (>= 1.0, < 3.0)
       faraday-net_http_persistent
       net-http-persistent
-    ast (2.4.2)
+    ast (2.4.3)
     aws-eventstream (1.3.1)
     aws-partitions (1.1050.0)
     aws-sdk-core (3.218.1)
@@ -231,14 +231,14 @@ GEM
     faraday-net_http_persistent (2.0.2)
       faraday-net_http (< 3)
       net-http-persistent (~> 4.0)
-    ffi (1.17.1-aarch64-linux-gnu)
-    ffi (1.17.1-aarch64-linux-musl)
-    ffi (1.17.1-arm-linux-gnu)
-    ffi (1.17.1-arm-linux-musl)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86_64-darwin)
-    ffi (1.17.1-x86_64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-musl)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -284,7 +284,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.12.2)
+    json (2.13.2)
     jsonb_accessor (1.3.10)
       activerecord (>= 5.0)
       activesupport (>= 5.0)
@@ -303,7 +303,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.5)
     launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
@@ -366,7 +366,7 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    niftany (0.12.0)
+    niftany (0.12.1)
       colorize (~> 1.1.0)
       erb_lint (~> 0.9.0)
       rubocop (~> 1.72)
@@ -422,8 +422,8 @@ GEM
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -432,6 +432,7 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
+    prism (1.4.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -526,7 +527,7 @@ GEM
     recaptcha (5.19.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    regexp_parser (2.10.0)
+    regexp_parser (2.11.2)
     reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -566,39 +567,43 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.72.2)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
-    rubocop-performance (1.24.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.25.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.72.1, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rails (2.30.2)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.72.1, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rspec (3.5.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.7.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec_rails (2.30.0)
-      rubocop (~> 1.61)
-      rubocop-rspec (~> 3, >= 3.0.1)
+      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.3)
       ffi (~> 1.12)
@@ -668,7 +673,7 @@ GEM
     timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
+    unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uppy-s3_multipart (1.2.1)
diff --git a/app/controllers/api/v1/rest_controller.rb b/app/controllers/api/v1/rest_controller.rb
@@ -41,7 +41,9 @@ def authenticate_request!
         end
 
         def api_token
-          @api_token ||= ApiToken.find_by(token: api_key_header)
+          return @api_token if defined?(@api_token)
+
+          @api_token = ApiToken.find_by(token: api_key_header)
         end
 
         def api_key_header
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -3,6 +3,7 @@
 class ApplicationController < ActionController::Base
   # Adds a few additional behaviors into the application controller
   include Blacklight::Controller
+
   layout 'frontend'
 
   # Authorization
diff --git a/app/forms/autocomplete_work_form.rb b/app/forms/autocomplete_work_form.rb
@@ -2,6 +2,7 @@
 
 class AutocompleteWorkForm
   include ActiveModel::Model
+
   attr_accessor :doi
 
   validate :doi, :valid_doi?
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
@@ -10,7 +10,7 @@ def self.instance
   private
 
     def enforce_singleton
-      return if self.class.count.zero?
+      return if self.class.none?
 
       raise ArgumentError, "#{self.class} is a singleton"
     end
diff --git a/app/reports/all_work_versions_report.rb b/app/reports/all_work_versions_report.rb
@@ -103,7 +103,7 @@ def rows
     def work_versions
       WorkVersion
         .includes(:work)
-        .order('work_id, id asc')
+        .order(:work_id, :id)
     end
 
     # Returns a hash of { work_version_id => num_views }
diff --git a/app/services/delete_collection.rb b/app/services/delete_collection.rb
@@ -40,6 +40,8 @@ def successful?
   private
 
     def collection
-      @collection ||= Collection.find_by(uuid: uuid)
+      return @collection if defined?(@collection)
+
+      @collection = Collection.find_by(uuid: uuid)
     end
 end
diff --git a/app/services/destroy_work_version.rb b/app/services/destroy_work_version.rb
@@ -5,7 +5,7 @@ def self.call(work_version, force: false)
     work_version.force_destroy = force
     parent_work = work_version.work
 
-    if parent_work.versions.count == 1
+    if parent_work.versions.one?
       WorkVersion.transaction do
         work_version.destroy!
         parent_work.destroy!
diff --git a/app/services/merge_collection.rb b/app/services/merge_collection.rb
@@ -69,7 +69,9 @@ def validate
   private
 
     def collection
-      @collection ||= Collection.find_by(uuid: uuid)
+      return @collection if defined?(@collection)
+
+      @collection = Collection.find_by(uuid: uuid)
     end
 
     def canonical_work
diff --git a/app/services/migrate_collection_ids.rb b/app/services/migrate_collection_ids.rb
@@ -50,11 +50,15 @@ def successful?
   private
 
     def collection
-      @collection ||= Collection.find_by(uuid: collection_uuid)
+      return @collection if defined?(@collection)
+
+      @collection = Collection.find_by(uuid: collection_uuid)
     end
 
     def work
-      @work ||= Work.find_by(uuid: work_uuid)
+      return @work if defined?(@work)
+
+      @work = Work.find_by(uuid: work_uuid)
     end
 
     def migrate_legacy_identifiers(legacy_ids)
diff --git a/app/validators/datacite_doi_validator.rb b/app/validators/datacite_doi_validator.rb
@@ -4,6 +4,6 @@ class DataciteDoiValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return if Doi.valid_datacite_doi?(value)
 
-    record.errors.add(attribute, (options[:message] || :invalid_doi))
+    record.errors.add(attribute, options[:message] || :invalid_doi)
   end
 end
diff --git a/app/validators/edtf_date_validator.rb b/app/validators/edtf_date_validator.rb
@@ -5,6 +5,6 @@ class EdtfDateValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return if EdtfDate.valid?(value)
 
-    record.errors.add(attribute, (options[:message] || :invalid_edtf))
+    record.errors.add(attribute, options[:message] || :invalid_edtf)
   end
 end
diff --git a/app/views/dashboard/works/edit.html.erb b/app/views/dashboard/works/edit.html.erb
@@ -182,7 +182,7 @@
           <div>
             <p>
               <%= t('dashboard.shared.curator_form.audit_heading') %>
-              <% curators = @work.curatorships.order('created_at DESC') %>
+              <% curators = @work.curatorships.order(created_at: :desc) %>
               <% curators&.each do |curator| %>
                 <li>
                   <%= curator.access_id %> - <%= curator.created_at.strftime('%m/%d/%Y %H:%M') %>
diff --git a/spec/features/catalog/catalog_spec.rb b/spec/features/catalog/catalog_spec.rb
@@ -50,9 +50,7 @@
           sort: 'deposited_at_dtsi desc',
           fl: ['title_tesim']
         }
-      )['response']['docs'].map do |doc|
-      doc['title_tesim']
-    end.flatten
+      )['response']['docs'].pluck('title_tesim').flatten
   end
 
   before do
diff --git a/spec/features/dashboard/work_version_form_spec.rb b/spec/features/dashboard/work_version_form_spec.rb
@@ -990,8 +990,7 @@
 
         # @note For some reason there are two 'files[]' hidden inputs, but it's only happens in the test environment.
         page
-          .all('.uppy-Dashboard-input', visible: false)
-          .first
+          .first('.uppy-Dashboard-input', visible: false)
           .attach_file(Rails.root.join('spec', 'fixtures', 'image.png'))
 
         # Wait for alt text form
@@ -1036,8 +1035,7 @@
 
         # Try to re-upload the same file again
         page
-          .all('.uppy-Dashboard-input', visible: false)
-          .first
+          .first('.uppy-Dashboard-input', visible: false)
           .attach_file(Rails.root.join('spec', 'fixtures', 'image.png'))
 
         within('.uppy-Informer') do
@@ -1078,8 +1076,7 @@
 
         # Try to re-upload the same file again
         page
-          .all('.uppy-Dashboard-input', visible: false)
-          .first
+          .first('.uppy-Dashboard-input', visible: false)
           .attach_file(Rails.root.join('spec', 'fixtures', 'ipsum.pdf'))
 
         within('.uppy-Informer') do
diff --git a/spec/features/discovery_search_spec.rb b/spec/features/discovery_search_spec.rb
@@ -53,7 +53,7 @@
       visit search_catalog_path(format: :json)
 
       expect(
-        results['data'].map { |record| record['id'] }
+        results['data'].pluck('id')
       ).to contain_exactly(
         public_work.uuid,
         previous_embargoed_work.uuid,
diff --git a/spec/features/resources_spec.rb b/spec/features/resources_spec.rb
@@ -35,7 +35,7 @@
         expect(page.find('meta[name="citation_publication_date"]', visible: false)[:content])
           .to eq Date.edtf(v2.published_date).year.to_s
         all_authors = page.all(:css, 'meta[name="citation_author"]', visible: false)
-        expect(all_authors.map { |a| a[:content] }).to match_array v2.creators.map(&:display_name)
+        expect(all_authors.pluck(:content)).to match_array v2.creators.map(&:display_name)
 
         # Description is rendered as html
         expect(page).to have_link('markdown', href: 'https://daringfireball.net/projects/markdown/')
diff --git a/spec/models/collection_work_membership_spec.rb b/spec/models/collection_work_membership_spec.rb
@@ -77,7 +77,7 @@
       let(:work) { create(:work) }
 
       before do
-        collection.works << (create(:work))
+        collection.works << create(:work)
         collection.save
       end
 
diff --git a/spec/models/concerns/all_dois_spec.rb b/spec/models/concerns/all_dois_spec.rb
@@ -13,6 +13,7 @@ def self.validates(*args)
       end
 
       include AllDois
+
       fields_with_dois :doi, :identifier, :other
 
       def doi
diff --git a/spec/models/work_spec.rb b/spec/models/work_spec.rb
@@ -719,7 +719,7 @@
 
     context "when work's latest_published_version has multiple file_resources with thumbnail urls" do
       before do
-        work.latest_published_version.file_resources << (create(:file_resource))
+        work.latest_published_version.file_resources << create(:file_resource)
         work.save
         allow(mock_attacher).to receive(:url).with(:thumbnail).and_return 'url.com/path/file'
       end
diff --git a/spec/models/work_version_spec.rb b/spec/models/work_version_spec.rb
@@ -756,7 +756,7 @@
       let(:work) { create(:work, has_draft: true) }
 
       before do
-        work.versions.last.file_resources << (create(:file_resource))
+        work.versions.last.file_resources << create(:file_resource)
         work.versions.last.save
       end
 
@@ -780,7 +780,7 @@
       let(:work) { create(:work, versions_count: 1, has_draft: false) }
 
       before do
-        work.versions.last.file_resources << (create(:file_resource))
+        work.versions.last.file_resources << create(:file_resource)
         work.versions.last.save
       end
 
diff --git a/spec/reports/monthly_works_report_spec.rb b/spec/reports/monthly_works_report_spec.rb
diff --git a/spec/reports/user_works_report_spec.rb b/spec/reports/user_works_report_spec.rb
diff --git a/spec/support/feature_helpers/dashboard_form.rb b/spec/support/feature_helpers/dashboard_form.rb
diff --git a/spec/validators/datacite_doi_validator_spec.rb b/spec/validators/datacite_doi_validator_spec.rb
diff --git a/spec/validators/edtf_date_validator_spec.rb b/spec/validators/edtf_date_validator_spec.rb
