From 3985833a1e2eea944b60b8d409d7f5a3f8fd623f Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 26 Mar 2024 11:26:55 -0400 Subject: [PATCH 1/3] Relax allowed `elasticsearch` dependency version --- chewy.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chewy.gemspec b/chewy.gemspec index 866ed3c3..ba9bd337 100644 --- a/chewy.gemspec +++ b/chewy.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.add_dependency 'activesupport', '>= 5.2' # Remove with major version bump, 8.x - spec.add_dependency 'elasticsearch', '>= 7.12.0', '< 7.14.0' + spec.add_dependency 'elasticsearch', '>= 7.12.0', '< 8' spec.add_dependency 'elasticsearch-dsl' spec.metadata['rubygems_mfa_required'] = 'true' end From 6df8aa4ef51d3ed081ae3d35615c02b487bb0038 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 30 Apr 2024 10:41:19 -0400 Subject: [PATCH 2/3] Update tracer/logger access style --- chewy.gemspec | 2 +- lib/chewy/config.rb | 4 ++-- spec/chewy/config_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chewy.gemspec b/chewy.gemspec index ba9bd337..675081dd 100644 --- a/chewy.gemspec +++ b/chewy.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.add_dependency 'activesupport', '>= 5.2' # Remove with major version bump, 8.x - spec.add_dependency 'elasticsearch', '>= 7.12.0', '< 8' + spec.add_dependency 'elasticsearch', '>= 7.14.0', '< 8' spec.add_dependency 'elasticsearch-dsl' spec.metadata['rubygems_mfa_required'] = 'true' end diff --git a/lib/chewy/config.rb b/lib/chewy/config.rb index fdae4ae4..1ec687e1 100644 --- a/lib/chewy/config.rb +++ b/lib/chewy/config.rb @@ -70,12 +70,12 @@ def initialize end def transport_logger=(logger) - Chewy.client.transport.logger = logger + Chewy.client.transport.transport.logger = logger @transport_logger = logger end def transport_tracer=(tracer) - Chewy.client.transport.tracer = tracer + Chewy.client.transport.transport.tracer = tracer @transport_tracer = tracer end diff --git a/spec/chewy/config_spec.rb b/spec/chewy/config_spec.rb index f9d31134..1d0321d8 100644 --- a/spec/chewy/config_spec.rb +++ b/spec/chewy/config_spec.rb @@ -22,7 +22,7 @@ specify do expect { subject.transport_logger = logger } - .to change { Chewy.client.transport.logger }.to(logger) + .to change { Chewy.client.transport.transport.logger }.to(logger) end specify do expect { subject.transport_logger = logger } @@ -40,7 +40,7 @@ specify do expect { subject.transport_tracer = tracer } - .to change { Chewy.client.transport.tracer }.to(tracer) + .to change { Chewy.client.transport.transport.tracer }.to(tracer) end specify do expect { subject.transport_tracer = tracer } From a247d497c61110cf01baeefd3b3beba5eb0c656e Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 1 May 2024 08:27:49 -0400 Subject: [PATCH 3/3] Add changelog notes --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 073d6114..ca237464 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ ### Changes +* [#933](https://github.com/toptal/chewy/pull/933): Relax allowed `elasticsearch` dependency versions. ([@mjankowski][]) + ### Bugs Fixed ## 7.5.1 (2024-01-30)