From 8daa6082fb4817584f697d905099c605766ade47 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Thu, 18 Sep 2025 14:24:00 -0400 Subject: [PATCH 1/7] Add ruby 3.4 to test matrix --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 5c00be79..7d30ec42 100644 --- a/.github/workflows/ruby.yml +++ b/.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: From 80b5774be7422b0eb6629bfdad75e7cdddd9d2ac Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Thu, 18 Sep 2025 14:25:37 -0400 Subject: [PATCH 2/7] Permit using rails 7.2.x via gemspec --- trln_argon.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trln_argon.gemspec b/trln_argon.gemspec index ba800307..63a5099e 100644 --- a/trln_argon.gemspec +++ b/trln_argon.gemspec @@ -18,7 +18,7 @@ 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' From 104e17727590bd21eabe6bac5057001910ce7628 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Thu, 18 Sep 2025 14:37:40 -0400 Subject: [PATCH 3/7] Constrain blacklight-hierarchy gem below 6.6. - 6.6.0+ introduces a JS rewrite that does not work for TRLN Argon --- trln_argon.gemspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/trln_argon.gemspec b/trln_argon.gemspec index 63a5099e..667c6556 100644 --- a/trln_argon.gemspec +++ b/trln_argon.gemspec @@ -21,7 +21,9 @@ Gem::Specification.new do |s| 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' From 5871f7df4db6e663a093d8db68bd47cc573b1573 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Thu, 18 Sep 2025 14:39:45 -0400 Subject: [PATCH 4/7] Constrain view-component gem below 4.0. - 4.0+ requires ruby 3.3+ and would also necessitate changes to several files --- trln_argon.gemspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trln_argon.gemspec b/trln_argon.gemspec index 667c6556..b5edeff8 100644 --- a/trln_argon.gemspec +++ b/trln_argon.gemspec @@ -37,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' From c0bc059de3ddf739224a713376a96ffbb211aa64 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Thu, 18 Sep 2025 14:56:43 -0400 Subject: [PATCH 5/7] Get rubocop tests passing. - Note: only doing the bare minimum here to limit the complexity of updating to Rails 7.2 --- config/initializers/blacklight_advanced_search.rb | 2 +- lib/trln_argon/controller_override.rb | 8 ++++---- lib/trln_argon/solr_document/work_entry.rb | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/initializers/blacklight_advanced_search.rb b/config/initializers/blacklight_advanced_search.rb index 006bcb7c..eebce962 100644 --- a/config/initializers/blacklight_advanced_search.rb +++ b/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 diff --git a/lib/trln_argon/controller_override.rb b/lib/trln_argon/controller_override.rb index 3286e268..9f648bd9 100644 --- a/lib/trln_argon/controller_override.rb +++ b/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 diff --git a/lib/trln_argon/solr_document/work_entry.rb b/lib/trln_argon/solr_document/work_entry.rb index 5e5685ae..2229e76b 100644 --- a/lib/trln_argon/solr_document/work_entry.rb +++ b/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) From 6b295aa95bad695d31b06ffcf2fba85194428468 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Thu, 18 Sep 2025 16:09:51 -0400 Subject: [PATCH 6/7] Bump version to 3.0.17 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ec187c44..d19cf84f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.16 +3.0.17 From d455d743bfc9fe1ec194f0e0807417553929ea62 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Tue, 30 Sep 2025 17:00:27 -0400 Subject: [PATCH 7/7] Bump version to 3.5.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d19cf84f..1545d966 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.17 +3.5.0