Skip to content

Update faraday#128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmabrahamson merged 4 commits into from
Apr 7, 2025
Merged

Update faraday #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d43ac37
Upgrade to sanitize 6
jcoyne Apr 3, 2025
96f2474
Remove minitest-vcr and update test dates
jcoyne Apr 3, 2025
070354b
Merge branch 'sanitize' into update-faraday
jcoyne Apr 3, 2025
ca4eb64
Update to Faraday 2
jcoyne Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ebsco-eds.gemspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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'
Expand All@@ -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
5 changes: 2 additions & 3 deletions lib/ebsco/eds/session.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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'
Expand DownExpand Up@@ -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'])
Expand Down
6 changes: 3 additions & 3 deletions test/solr_query_test.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -364,4 +364,4 @@ def test_auto_correct_in_spellcheck_response
end
end

end
end
3 changes: 0 additions & 3 deletions test/test_helper.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@
require 'active_support'
require 'fileutils'
require 'vcr'
require 'minitest-vcr'

Dotenv.load('.env.test')

Expand All@@ -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!