opensearch-transport 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e414746942105120cd20aeda377568e039f869009de7d02de8162f70b8510d6d
-  data.tar.gz: fdca1d3e46fb709f3881732758af151223d796bcbbd5270527cdf39a0b164b4a
+  metadata.gz: 486df12499ed36687f17b069b98ac2338d9d53f7f503923339b8f1dbfc7dfc09
+  data.tar.gz: 1435b4c6d75c01b8a0f0fab36ba0edaae8b00ac189eadcc2c285f2e135a2bce7
 SHA512:
-  metadata.gz: 39aecd9063de2387b8defe7bd1ab2fa87e2545199b9c60ffeabd8e8febcd5350dec33990c5948994606757196284fe03fa56e060848026eb425a75fd2954b90d
-  data.tar.gz: 38a4f956daf5351aabb2ab2308ab93d35fa576feee35a6a554c6f5b5578f8c629c21ea1eb21eaea8299692ccc2f75c4d5fc3ab4628ff2e029c06729a7fd9b4f8
+  metadata.gz: e48408e4ba9d03b463f5b1364c905ca944806bb58d5b9274ded620e0bd6d746a1bdc8fe5f31eb0df3f83eb4b5b8201fda19ab7de26402e38bc8fb76906299180
+  data.tar.gz: a48c523ccc5b575d9f97cc87367995d6f16ed83977b0634144a30a9d4384cc30ff998f628c7da2ad199caeb2b32ee7084ec6853386a4b1a5bca2a9b6f680211c

data/Gemfile

@@ -37,8 +37,6 @@ if File.exist? File.expand_path('../opensearch/opensearch.gemspec', __dir__)
   gem 'opensearch-ruby', path: File.expand_path('../opensearch', __dir__), require: false
 end
 
-gem 'faraday', ENV['FARADAY_VERSION'], require: false if ENV.key?('FARADAY_VERSION')
-
 group :development, :test do
   gem 'rspec'
   if defined?(JRUBY_VERSION)

data/README.md

@@ -28,22 +28,16 @@ Features overview:
 * Node reloading (based on cluster state) on errors or on demand
 
 For optimal performance, use a HTTP library which supports persistent ("keep-alive") connections,
-such as [Patron](https://github.com/toland/patron) or [Typhoeus](https://github.com/typhoeus/typhoeus).
-Most such HTTP libraries are used through the [Faraday](https://rubygems.org/gems/faraday) HTTP library
-and its [adapters](https://github.com/lostisland/awesome-faraday/#adapters).
-
-Include the library's gem and adapter gem, and require the library and adapter in your code, and it will be automatically used.
-If you don't use Bundler, you may need to require the library explicitly (like `require 'faraday/patron'`).
+such as [patron](https://github.com/toland/patron) or [Typhoeus](https://github.com/typhoeus/typhoeus).
+Just require the library (`require 'patron'`) in your code, and it will be automatically used.
 
 Currently these libraries will be automatically detected and used:
-- [Patron](https://github.com/toland/patron) through [faraday-patron](https://github.com/lostisland/faraday-patron)
-- [Typhoeus](https://github.com/typhoeus/typhoeus) through [faraday-typhoeus](https://github.com/dleavitt/faraday-typhoeus) for Faraday 2 or higher, or Faraday's built-in adapter for Faraday 1.
-- [HTTPClient](https://rubygems.org/gems/httpclient) through [faraday-httpclient](https://github.com/lostisland/faraday-httpclient)
-- [Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent) through [faraday-net_http_persistent](https://github.com/lostisland/faraday-net_http_persistent)
-
-**Note on [Typhoeus](https://github.com/typhoeus/typhoeus)**: You need to use v1.4.0 or up since older versions are not compatible with Faraday 1.0 or higher.
+- [Patron](https://github.com/toland/patron)
+- [Typhoeus](https://github.com/typhoeus/typhoeus)
+- [HTTPClient](https://rubygems.org/gems/httpclient)
+- [Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent)
 
-**Note on [Faraday](https://rubygems.org/gems/faraday)**: If you use Faraday 2.0 or higher, if the adapter is in a separate gem, you will likely need to declare that gem as well. Only the Net::HTTP adapter gem is included by default. Faraday 1.x includes most common adapter gems already.
+**Note on [Typhoeus](https://github.com/typhoeus/typhoeus)**: You need to use v1.4.0 or up since older versions are not compatible with Faraday 1.0.
 
 For detailed information, see example configurations [below](#transport-implementations).
 
@@ -356,22 +350,10 @@ as a transport implementation.
 It will auto-detect and use an _adapter_ for _Faraday_ based on gems loaded in your code,
 preferring HTTP clients with support for persistent connections.
 
-Faraday uses adapters, usually in separate gems, to connect to the HTTP library. You need to
-make sure that your code refers to both the HTTP library gem and the adapter gem. See this
-list of [Faraday adapters](https://github.com/lostisland/awesome-faraday/#adapters) for details.
-
-To use the [_Patron_](https://github.com/toland/patron) HTTP, for example, you need to refer to these gems:
-
-```ruby
-gem 'patron'
-gem 'faraday-patron'
-```
-
-If you don't use Bundler, you may need to require the libraries explicitly in your code:
+To use the [_Patron_](https://github.com/toland/patron) HTTP, for example, just require it:
 
 ```ruby
 require 'patron'
-require 'faraday/patron'
 ```
 
 Then, create a new client, and the _Patron_  gem will be used as the "driver":
@@ -414,6 +396,8 @@ constructor, use the `transport_options` key:
 
 To configure the _Faraday_ instance directly, use a block:
 
+    require 'patron'
+
     client = OpenSearch::Client.new(host: 'localhost', port: '9200') do |f|
       f.response :logger
       f.adapter  :patron
@@ -422,6 +406,8 @@ To configure the _Faraday_ instance directly, use a block:
 You can use any standard Faraday middleware and plugins in the configuration block. You can also initialize the transport class yourself, and pass it to the client constructor as the `transport` argument:
 
 ```ruby
+require 'patron'
+
 transport_configuration = lambda do |f|
   f.response :logger
   f.adapter  :patron

data/lib/opensearch/transport/client.rb

@@ -330,23 +330,14 @@ module OpenSearch
       # @api private
       #
       def __auto_detect_adapter
-        # Get the Faraday adapter list without initializing it.
-        if Faraday::Adapter.respond_to?(:registered_middleware) # Faraday 2.x
-          adapter = ->(name) { Faraday::Adapter.registered_middleware[name] }
-        elsif Faraday::Adapter.respond_to?(:fetch_middleware) # Faraday 1.x
-          adapter = ->(name) { Faraday::Adapter.fetch_middleware(name) }
-        else
-          adapter = {} # fallback behavior that should never happen
-        end
-        # Pick an adapter that has both the client and adapter defined.
         case
-        when defined?(::Patron) && adapter[:patron]
+        when defined?(::Patron)
           :patron
-        when defined?(::Typhoeus) && adapter[:typhoeus]
+        when defined?(::Typhoeus)
           :typhoeus
-        when defined?(::HTTPClient) && adapter[:httpclient]
+        when defined?(::HTTPClient)
           :httpclient
-        when defined?(::Net::HTTP::Persistent) && adapter[:net_http_persistent]
+        when defined?(::Net::HTTP::Persistent)
           :net_http_persistent
         else
           ::Faraday.default_adapter

data/lib/opensearch/transport/version.rb

@@ -26,6 +26,6 @@
 
 module OpenSearch
   module Transport
-    VERSION = '1.0.1'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/opensearch-transport.gemspec

@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.4'
 
   s.add_dependency 'multi_json'
-  s.add_dependency 'faraday', '>= 1.0', '< 3'
+  s.add_dependency 'faraday', '~> 1'
 
   s.add_development_dependency 'ansi'
   s.add_development_dependency 'bundler'
@@ -70,15 +70,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'opensearch-ruby'
   s.add_development_dependency 'hashie'
   s.add_development_dependency 'httpclient'
-  s.add_development_dependency 'faraday-httpclient'
   s.add_development_dependency 'manticore' if defined? JRUBY_VERSION
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'net-http-persistent'
-  s.add_development_dependency 'faraday-net_http_persistent'
   s.add_development_dependency 'patron' unless defined? JRUBY_VERSION
-  s.add_development_dependency 'faraday-patron' unless defined? JRUBY_VERSION
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
@@ -87,7 +84,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'test-unit', '~> 2'
   s.add_development_dependency 'typhoeus', '~> 1.4'
-  s.add_development_dependency 'faraday-typhoeus' if !ENV.key?('FARADAY_VERSION') && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
   s.add_development_dependency 'yard'
 
   s.description = <<-DESC.gsub(/^    /, '')

data/spec/opensearch/transport/client_spec.rb

@@ -247,7 +247,7 @@ describe OpenSearch::Transport::Client do
       end unless jruby?
     end
 
-    context 'when the adapter is patron', unless: jruby? do
+    context 'when the adapter is patron' do
       let(:adapter) do
         client.transport.connections.all.first.connection.builder.adapter
       end
@@ -275,7 +275,7 @@ describe OpenSearch::Transport::Client do
       end
     end unless jruby?
 
-    context 'when the adapter is specified as a string key', unless: jruby? do
+    context 'when the adapter is specified as a string key' do
       let(:adapter) do
         client.transport.connections.all.first.connection.builder.adapter
       end
@@ -305,7 +305,7 @@ describe OpenSearch::Transport::Client do
       end
     end
 
-    context 'when the Faraday adapter is configured', unless: jruby? do
+    context 'when the Faraday adapter is configured' do
 
       let(:client) do
         described_class.new do |faraday|

data/spec/spec_helper.rb

@@ -29,8 +29,6 @@ if ENV['COVERAGE'] && ENV['CI'].nil?
 end
 
 require 'opensearch-transport'
-require 'faraday/httpclient'
-require 'faraday/net_http_persistent'
 require 'logger'
 require 'ansi/code'
 require 'hashie/mash'
@@ -39,8 +37,6 @@ if defined?(JRUBY_VERSION)
   require 'pry-nav'
 else
   require 'pry-byebug'
-  require 'faraday/patron'
-  require 'faraday/typhoeus' if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2')
   require 'opensearch/transport/transport/http/curb'
   require 'curb'
 end

data/test/integration/transport_test.rb

@@ -34,10 +34,8 @@ class OpenSearch::Transport::ClientIntegrationTest < Minitest::Test
     end
 
     should "allow to customize the Faraday adapter to Typhoeus" do
-      # Require the library so autodetection finds it.
       require 'typhoeus'
-      # Require the adapter so autodetection finds it.
-      require 'faraday/typhoeus' if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2')
+      require 'typhoeus/adapters/faraday'
 
       transport = OpenSearch::Transport::Transport::HTTP::Faraday.new \
         :hosts => [ { host: @host, port: @port } ] do |f|
@@ -46,18 +44,11 @@ class OpenSearch::Transport::ClientIntegrationTest < Minitest::Test
         end
 
       client = OpenSearch::Transport::Client.new transport: transport
-      response = client.perform_request 'GET', ''
-
-      assert_respond_to(response.body, :to_hash)
-      assert_not_nil response.body['name']
-      assert_equal 'application/json; charset=UTF-8', response.headers['content-type']
+      client.perform_request 'GET', ''
     end unless jruby?
 
     should "allow to customize the Faraday adapter to NetHttpPersistent" do
-      # Require the library so autodetection finds it.
       require 'net/http/persistent'
-      # Require the adapter so autodetection finds it.
-      require 'faraday/net_http_persistent'
 
       transport = OpenSearch::Transport::Transport::HTTP::Faraday.new \
                                                                        :hosts => [ { host: @host, port: @port } ] do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opensearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jayesh Hathila
@@ -33,7 +33,7 @@ cert_chain:
   yXikuH6LEVykA8pgOcB9gKsB2/zMd2ZlSj2monM8Qw9EfB14ZSDTYS8VYuwWCeF0
   eFmXXk0ufQFKl1Yll7quHkmQ0PzKkvXTpONBT6qPkXE=
   -----END CERTIFICATE-----
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -53,22 +53,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -167,20 +161,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday-httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -237,20 +217,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday-net_http_persistent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: patron
   requirement: !ruby/object:Gem::Requirement
@@ -265,20 +231,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday-patron
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -391,20 +343,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: faraday-typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement