Accommodate Rails 7.2 & Ruby 3.4

.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3']
+        ruby: ['3.0', '3.1', '3.2', '3.3', '3.4']
     name: Ruby ${{ matrix.ruby }}
 
     steps:

VERSION

@@ -1 +1 @@
-3.0.16
+3.5.0

config/initializers/blacklight_advanced_search.rb

@@ -23,7 +23,7 @@ def build_nested_query(embeddables, solr_params = {}, options = {})
                             collected_embeddables
                           )
                         )
-          return ('_query_:"' + bs_escape(inner_query) + '"') if options[:always_nested]
+          return '_query_:"' + bs_escape(inner_query) + '"' if options[:always_nested]
           return inner_query
         end
       end

lib/trln_argon/controller_override.rb

@@ -712,11 +712,11 @@ def action_documents
         solr_response.documents
       end
 
-      # rubocop:disable Naming/PredicateName
+      # rubocop:disable Naming/PredicatePrefix
       def has_search_parameters?
         %i[q f f_inclusive op search_field range doc_ids].any? { |p| params[p].present? }
-        # rubocop:enable Naming/PredicateName
       end
+      # rubocop:enable Naming/PredicatePrefix
 
       # rubocop:disable Style/RedundantCondition
       def query_has_constraints?(localized_params = params)
@@ -732,12 +732,12 @@ def query_has_constraints?(localized_params = params)
       end
       # rubocop:enable Style/RedundantCondition
 
-      # rubocop:disable Naming/PredicateName
+      # rubocop:disable Naming/PredicatePrefix
       def is_advanced_search?(req_params = params)
         (req_params[:search_field] == blacklight_config.advanced_search[:url_key]) ||
           req_params[:f_inclusive]
       end
-      # rubocop:enable Naming/PredicateName
+      # rubocop:enable Naming/PredicatePrefix
 
       def render_ris_action?
         doc = @document || (@response.documents || []).first

lib/trln_argon/solr_document/work_entry.rb

@@ -29,11 +29,13 @@ def translated_as_work
       end
 
       # NOTE: Combines HAS_SUPPLEMENT_WORK and SUPPLEMENT_TO_WORK
-      def has_supplement_work # rubocop:disable Style/PredicateName
+      # rubocop:disable Naming/PredicatePrefix
+      def has_supplement_work
         @has_supplement_work ||= deserialize_work_entry(TrlnArgon::Fields::HAS_SUPPLEMENT_WORK).concat(
           deserialize_work_entry(TrlnArgon::Fields::SUPPLEMENT_TO_WORK)
         )
       end
+      # rubocop:enable Naming/PredicatePrefix
 
       def host_item_work
         @host_item_work ||= deserialize_work_entry(TrlnArgon::Fields::HOST_ITEM_WORK)

trln_argon.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
 
-  s.add_dependency 'rails', '>= 7.1', '< 7.2'
+  s.add_dependency 'rails', '>= 7.1', '< 8'
   s.add_dependency 'blacklight', '~> 8'
   s.add_dependency 'blacklight_advanced_search', '~> 8.0.0.alpha2'
-  s.add_dependency 'blacklight-hierarchy', '~> 6.3'
+  # Note: blacklight-hierarchy 6.6.0+ changes the JS
+  # significantly enough that it doesn't work for us.
+  s.add_dependency 'blacklight-hierarchy', '~> 6.3', '< 6.6.0'
   s.add_dependency 'blacklight_range_limit', '~> 9.0'
   s.add_dependency 'git', '>= 1.11.0', "< 2"
   s.add_dependency 'rails_autolink', '~> 1.1'
@@ -35,6 +37,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'csl-styles', '~> 1.0'
   s.add_dependency 'bibtex-ruby', '>= 4.4.6', '< 7'
   s.add_dependency 'jquery-rails', '~> 4.6'
+  # ViewComponent 4 requires ruby 3.3+
+  s.add_dependency 'view_component', '< 4'
 
   s.add_development_dependency 'rspec-rails', '~> 6'
   s.add_development_dependency 'capybara', '~> 3.29'