#185829263 : Allow faraday from 1.x (#20)

* allow faraday from 1x

* in faraday 1.0 retry and net_http_persistent is bundled in

* bump version to minor 2.1.0 since supporting faraday 1.0 is adding new feature

* remove uneeded if else

* remove unneeded space

* remove uneeded print

* clarify comment

.gitignore

@@ -13,6 +13,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+Gemfile.lock
 
 # Used by dotenv library to load environment variables.
 # .env

lib/moesif_api/http/faraday_client.rb

@@ -1,8 +1,15 @@
 require 'faraday'
-require 'faraday/net_http_persistent'
-require 'faraday/retry'
 require 'json'
 
+faraday_version = Gem.loaded_specs['faraday'].version
+
+# in faraday < 2.0 net_http_persistent and retry is build into faraday already
+# in faraday >= 2.0 we must require these plugins
+if faraday_version >= Gem::Version.new('2.0')
+  require 'faraday/net_http_persistent'
+  require 'faraday/retry'
+end
+
 module MoesifApi
   class FaradayClient < HttpClient
     def initialize

moesif_api.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = 'moesif_api'
-  s.version = '2.0.2'
+  s.version = '2.1.0'
   s.summary = 'moesif_api'
   s.description = 'Collection/Data Ingestion API'
   s.authors = ['Moesif, Inc', 'Derric Gilling']
   s.email = 'derric@moesif.com'
   s.homepage = 'https://moesif.com'
   s.license = 'Apache-2.0'
   s.add_development_dependency('test-unit', '~> 3.5', '>= 3.5.0')
-  s.add_dependency('faraday', '~> 2')
-  s.add_dependency('faraday-net_http_persistent', '~> 2')
-  s.add_dependency('faraday-retry', '~> 2')
+  s.add_dependency('faraday', '>= 1.0', '< 3.0')
+  s.add_dependency('faraday-net_http_persistent', '< 3.0')
+  s.add_dependency('faraday-retry', '< 3.0')
   s.add_dependency('json_mapper', '~> 0')
   s.add_dependency('net-http-persistent', '~> 4')
   s.required_ruby_version = '>= 2.6'