Updates to packages and test

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'
@@ -50,8 +50,7 @@ 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'
+  spec.add_development_dependency 'sanitize', '~> 6.0'
 
 end

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'])

lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '1.1.5'
+    VERSION = '1.1.6'
   end
 end

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
@@ -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
@@ -358,10 +358,10 @@ 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
 
-end
+end

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('<EDS_USER>') { ENV['EDS_USER'] }
   c.filter_sensitive_data('<EDS_PASS>') { ENV['EDS_PASS'] }
 end
-
-MinitestVcr::Spec.configure!