Merge pull request #438 from splitio/development

[8.0.1] Development into master

Author: sanzmauro

CHANGES.txt

@@ -1,5 +1,8 @@
 CHANGES
 
+8.0.1 (Jul 20, 2022)
+- Updated dependencies to support faraday > 2.0
+
 8.0.0 (May 10, 2022)
 - BREAKING CHANGE: Deprecated support for ruby 2.3 and 2.4 versions. The minimum ruby version required is 2.5 now.
 - Updated redis command for config telemetry, using hset instead of rpush now.

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

@@ -3,10 +3,10 @@
 module SplitIoClient
   module Api
     class Client
-      RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
-
       def initialize(config)
-        @config = config        
+        @config = config
+
+        check_faraday_compatibility
       end
 
       def get_api(url, api_key, params = {}, cache_control_headers = false)
@@ -64,6 +64,14 @@ def common_headers(api_key)
           'SplitSDKVersion' => "#{@config.language}-#{@config.version}",
         }
       end
+
+      def check_faraday_compatibility
+        version = Faraday::VERSION.split('.')[0]
+
+        require 'faraday/net_http_persistent' if version.to_i >= 2
+      rescue StandardError => e
+        @config.logger.warn(e)
+      end
     end
   end
 end

lib/splitclient-rb/engine/sync_manager.rb

@@ -47,13 +47,13 @@ def start_thread
           connected = false
 
           if @config.streaming_enabled
-            @config.logger.debug('Starting Straming mode ...')
+            @config.logger.debug('Starting Streaming mode ...')
             start_push_status_monitor
             connected = @push_manager.start_sse
           end
 
           unless connected
-            @config.logger.debug('Starting polling mode ...')
+            @config.logger.debug('Starting Polling mode ...')
             @synchronizer.start_periodic_fetch
             record_telemetry(Telemetry::Domain::Constants::SYNC_MODE, SYNC_MODE_POLLING)
           end

lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '8.0.0'
+  VERSION = '8.0.1'
 end

splitclient-rb.gemspec

@@ -51,7 +51,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'bitarray', '~> 1.3'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_runtime_dependency 'faraday', '>= 1.1', '< 2.0'
+  spec.add_runtime_dependency 'faraday', '>= 1.1', '< 3.0'
+  spec.add_runtime_dependency 'faraday-net_http_persistent', '>= 1.0', '< 3.0'
   spec.add_runtime_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_runtime_dependency 'jwt', '>= 1.0.0', '< 3.0'
   spec.add_runtime_dependency 'lru_redux', '~> 1.1'