Skip to content

Commit fb7fab9

Browse files
committed
supporting latest faraday version
1 parent 8a6a1f0 commit fb7fab9

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

lib/splitclient-rb/engine/api/client.rb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
module SplitIoClient
44
module Api
55
class Client
6-
RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
7-
86
def initialize(config)
9-
@config = config
7+
@config = config
8+
9+
check_faraday_compatibility
1010
end
1111

1212
def get_api(url, api_key, params = {}, cache_control_headers = false)
@@ -64,6 +64,14 @@ def common_headers(api_key)
6464
'SplitSDKVersion' => "#{@config.language}-#{@config.version}",
6565
}
6666
end
67+
68+
def check_faraday_compatibility
69+
version = Faraday::VERSION.split('.')[0]
70+
71+
require 'faraday/net_http_persistent' if version.to_i >= 2
72+
rescue StandardError => e
73+
@config.logger.warn(e)
74+
end
6775
end
6876
end
6977
end

lib/splitclient-rb/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module SplitIoClient
2-
VERSION = '8.0.0'
2+
VERSION = '8.0.1.pre.rc1'
33
end

splitclient-rb.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ Gem::Specification.new do |spec|
5151

5252
spec.add_runtime_dependency 'bitarray', '~> 1.3'
5353
spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
54-
spec.add_runtime_dependency 'faraday', '>= 1.1', '< 2.0'
54+
spec.add_runtime_dependency 'faraday', '>= 1.1', '< 3.0'
5555
spec.add_runtime_dependency 'json', '>= 1.8', '< 3.0'
5656
spec.add_runtime_dependency 'jwt', '>= 1.0.0', '< 3.0'
5757
spec.add_runtime_dependency 'lru_redux', '~> 1.1'
58-
spec.add_runtime_dependency 'net-http-persistent', '>= 2.9', '< 5.0'
5958
spec.add_runtime_dependency 'redis', '>= 4.0.0', '< 5.0'
6059
spec.add_runtime_dependency 'socketry', '>= 0.4', '< 1.0'
6160
spec.add_runtime_dependency 'thread_safe', '~> 0.3'
61+
spec.add_runtime_dependency 'net-http-persistent', '>= 2.9', '< 5.0'
62+
spec.add_runtime_dependency 'faraday-net_http_persistent', '>= 1.0', '< 3.0'
6263
end

0 commit comments

Comments
 (0)