From d43ac3726ceb3af2e273bfb4214c33f3bb2963aa Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 3 Apr 2025 16:02:45 -0500 Subject: [PATCH 1/5] Upgrade to sanitize 6 --- ebsco-eds.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebsco-eds.gemspec b/ebsco-eds.gemspec index 9a872be..0b24c37 100644 --- a/ebsco-eds.gemspec +++ b/ebsco-eds.gemspec @@ -52,6 +52,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'vcr', '~> 5.0', '>= 5.0.0' spec.add_development_dependency 'minitest-vcr', '~> 1.4', '>= 1.4.0' spec.add_development_dependency 'webmock', '~> 3.6' - spec.add_development_dependency 'sanitize', '~> 5.0' + spec.add_development_dependency 'sanitize', '~> 6.0' end From 96f24748f343215fd75264f698086d86112634d6 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 3 Apr 2025 16:22:32 -0500 Subject: [PATCH 2/5] Remove minitest-vcr and update test dates minitest-vcr hasn't been maintained in 10 years and doesn't seem to do anything for us --- ebsco-eds.gemspec | 1 - test/solr_query_test.rb | 6 +++--- test/test_helper.rb | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ebsco-eds.gemspec b/ebsco-eds.gemspec index 9a872be..2eb15b5 100644 --- a/ebsco-eds.gemspec +++ b/ebsco-eds.gemspec @@ -50,7 +50,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'simplecov', '~> 0.17.0' spec.add_development_dependency 'codecov', '~> 0.1' spec.add_development_dependency 'vcr', '~> 5.0', '>= 5.0.0' - spec.add_development_dependency 'minitest-vcr', '~> 1.4', '>= 1.4.0' spec.add_development_dependency 'webmock', '~> 3.6' spec.add_development_dependency 'sanitize', '~> 5.0' diff --git a/test/solr_query_test.rb b/test/solr_query_test.rb index 2d59112..0ae3714 100644 --- a/test/solr_query_test.rb +++ b/test/solr_query_test.rb @@ -347,9 +347,9 @@ def test_solr_date_range_max_year_cleanup range = results.to_solr.fetch('date_range',{}) refute_empty range assert range[:mindate] == '1000-01' - assert range[:maxdate] == '2023-01' + assert range[:maxdate] == '2026-01' assert range[:minyear] == '1000' - assert range[:maxyear] == '2023' + assert range[:maxyear] == '2026' session.end end end @@ -364,4 +364,4 @@ def test_auto_correct_in_spellcheck_response end end -end \ No newline at end of file +end diff --git a/test/test_helper.rb b/test/test_helper.rb index 13cb97b..be2936b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,7 +11,6 @@ require 'active_support' require 'fileutils' require 'vcr' -require 'minitest-vcr' Dotenv.load('.env.test') @@ -33,5 +32,3 @@ c.filter_sensitive_data('') { ENV['EDS_USER'] } c.filter_sensitive_data('') { ENV['EDS_PASS'] } end - -MinitestVcr::Spec.configure! From ca4eb64f0c111f1561f42aa379b330662fc6438c Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 3 Apr 2025 16:46:16 -0500 Subject: [PATCH 3/5] Update to Faraday 2 --- ebsco-eds.gemspec | 4 ++-- lib/ebsco/eds/session.rb | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ebsco-eds.gemspec b/ebsco-eds.gemspec index ec74184..af407a7 100644 --- a/ebsco-eds.gemspec +++ b/ebsco-eds.gemspec @@ -31,9 +31,9 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.4' - spec.add_dependency 'faraday', '< 2.0' + spec.add_dependency 'faraday', '~> 2.0' spec.add_dependency 'faraday-detailed_logger', '~> 2.0' - spec.add_dependency 'faraday_middleware', '~> 1.0' + spec.add_dependency 'faraday-net_http_persistent', '~> 2.0' spec.add_dependency 'bibtex-ruby', '>= 5.1.0', '< 7.0' spec.add_dependency 'citeproc', '>= 1.0.4', '< 2.0' spec.add_dependency 'csl', '>= 1.4.0', '< 1.6' diff --git a/lib/ebsco/eds/session.rb b/lib/ebsco/eds/session.rb index 6092aa5..6332dd7 100644 --- a/lib/ebsco/eds/session.rb +++ b/lib/ebsco/eds/session.rb @@ -4,9 +4,8 @@ require 'net/http/persistent' require 'faraday' require 'faraday/detailed_logger' -require 'faraday_middleware' -require 'faraday/adapter/net_http_persistent' require 'faraday_eds_middleware' +require 'faraday/net_http_persistent' require 'logger' require 'json' require 'active_support' @@ -128,7 +127,7 @@ def initialize(options = {}) else @guest = true end - + (ENV.has_key? 'EDS_USE_CACHE') ? if %w(n N no No false False).include?(ENV['EDS_USE_CACHE']) From 4138a18f3fc6237d8f7a3b36d9e0b95be7e4e4ca Mon Sep 17 00:00:00 2001 From: Michael Abrahamson Date: Mon, 7 Apr 2025 08:56:09 -0500 Subject: [PATCH 4/5] Cleans up test failures --- test/solr_query_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/solr_query_test.rb b/test/solr_query_test.rb index 0ae3714..de99b41 100644 --- a/test/solr_query_test.rb +++ b/test/solr_query_test.rb @@ -217,7 +217,7 @@ def test_spellcheck 'hl'=>'off' } results = session.search(query) refute_nil results.to_solr - assert results.to_solr.to_s.include?('"suggestion"=>[{"word"=>"bleeding", "freq"=>1}]}]') + assert results.to_solr.to_s.include?('"suggestion" => [{"word" => "bleeding", "freq" => 1}]}]') session.end end end @@ -236,8 +236,8 @@ def test_auto_correction 'auto_correct' => true} results = session.search(query) refute_nil results.to_solr - assert results.to_solr.to_s.include?('"correction"=>[{"word"=>"string theory", "freq"=>1}]}]') - assert results.to_solr.to_s.include?('"suggestion"=>[{"word"=>"string thery", "freq"=>1}]}]') + assert results.to_solr.to_s.include?('"correction" => [{"word" => "string theory", "freq" => 1}]}]') + assert results.to_solr.to_s.include?('"suggestion" => [{"word" => "string thery", "freq" => 1}]}]') session.end end end @@ -358,8 +358,8 @@ def test_auto_correct_in_spellcheck_response VCR.use_cassette('solr_query_test/profile_1/test_auto_correct_in_spellcheck_response', :allow_playback_repeats => true) do session = EBSCO::EDS::Session.new({use_cache: false, profile: 'eds-api'}) results = session.search({query: 'string thery', results_per_page: 1, auto_correct: true}) - assert results.to_solr.to_s.include?('"corrections"=>["string", {"numFound"=>1, "startOffset"=>0, "endOffset"=>7, "origFreq"=>0, "correction"=>[{"word"=>"string theory", "freq"=>1}]') - assert results.to_solr.to_s.include?('"suggestions"=>["string", {"numFound"=>1, "startOffset"=>0, "endOffset"=>7, "origFreq"=>0, "suggestion"=>[{"word"=>"string thery", "freq"=>1}]}]') + assert results.to_solr.to_s.include?('"corrections" => ["string", {"numFound" => 1, "startOffset" => 0, "endOffset" => 7, "origFreq" => 0, "correction" => [{"word" => "string theory", "freq" => 1}]') + assert results.to_solr.to_s.include?('"suggestions" => ["string", {"numFound" => 1, "startOffset" => 0, "endOffset" => 7, "origFreq" => 0, "suggestion" => [{"word" => "string thery", "freq" => 1}]}]') session.end end end From 41243e34b562662586f9937319e8fc3c9221ec6a Mon Sep 17 00:00:00 2001 From: Michael Abrahamson Date: Mon, 7 Apr 2025 09:24:21 -0500 Subject: [PATCH 5/5] Update version.rb --- lib/ebsco/eds/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ebsco/eds/version.rb b/lib/ebsco/eds/version.rb index 82891a6..d792b8e 100644 --- a/lib/ebsco/eds/version.rb +++ b/lib/ebsco/eds/version.rb @@ -1,5 +1,5 @@ module EBSCO module EDS - VERSION = '1.1.5' + VERSION = '1.1.6' end end