faraday-net_http 1.0.1 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc66839ab88c5fc96b602b163b00c896eaee90a533db6464dbe38aa763f857f
-  data.tar.gz: a26950415c34a093595c44b34dcd79af3efa5d9513097444e478467e882fa787
+  metadata.gz: 1b449661096fbc74a1cdd3bc33377a7ca128666451d1ce6b17c7d5007f351c3b
+  data.tar.gz: 4b7cb1e14d209c97a7e54df7349b9eea265506ef5bf5ecf5344b4077acfb6929
 SHA512:
-  metadata.gz: 13c56f77c7bad337f780d7651479550a1f4a639eb33612c32eb76480337de2d024e531d7b22f0a8b12f4f5f787986cff208e4e5f606ec74ee4de81fe00a8458b
-  data.tar.gz: aa3eee27950f2fc19a9a53da24ad00c66ffaf4f31b97dc110f225ccdb99d851b15a8024e70f4b6445ab026621b6a04f87e7593d178ecf5efc0673b2ef3896088
+  metadata.gz: 1f2325b3ce4bd6483566c8c2b70c1ad8e5a95d28c4b090dacdb0a17f5be34a89c5f1b8adae5f39faea5a6777483af7d95a41230e04614d7e27ef392b64a962cb
+  data.tar.gz: f82744eda714b6da33e0231718c3f4f83156d78369fc17fd6a73020ddbbccec4b79db0a2fdf25e15416ea5f8e442ff267ef97e3725e8cdcce5b2a13f283c5bcd

data/README.md

@@ -20,16 +20,17 @@ Or install it yourself as:
 
 ## Usage
 
-Configure your Faraday connection to use this adapter like this:
-
 ```ruby
-connection = Faraday.new(url, conn_options) do |conn|
-  conn.adapter(:net_http)
+conn = Faraday.new(...) do |f|
+  f.adapter :net_http do |http|
+    # yields Net::HTTP
+    http.verify_callback = lambda do |preverify, cert_store|
+      # do something here...
+    end
+  end
 end
 ```
 
-For more information on how to setup your Faraday connection and adapters usage, please refer to the [Faraday Website][faraday-website].
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -49,9 +50,8 @@ The gem is available as open source under the terms of the [license][license].
 Everyone interacting in the Faraday Net::HTTP adapter project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct][code-of-conduct].
 
 [faraday]: https://github.com/lostisland/faraday
-[faraday-website]: https://lostisland.github.io/faraday
 [net-http]: https://ruby-doc.org/stdlib-2.7.0/libdoc/net/http/rdoc/Net/HTTP.html
 [rubygems]: https://rubygems.org
 [repo]: https://github.com/lostisland/faraday-net_http
 [license]: https://github.com/lostisland/faraday-net_http/blob/main/LICENSE.md
-[code-of-conduct]: https://github.com/lostisland/faraday-net_http/blob/main/CODE_OF_CONDUCT.md
+[code-of-conduct]: https://github.com/lostisland/faraday-net_http/blob/main/CODE_OF_CONDUCT.md

data/lib/faraday/adapter/net_http.rb

@@ -15,6 +15,7 @@ module Faraday
       exceptions = [
         IOError,
         Errno::EADDRNOTAVAIL,
+        Errno::EALREADY,
         Errno::ECONNABORTED,
         Errno::ECONNREFUSED,
         Errno::ECONNRESET,
@@ -41,8 +42,7 @@ module Faraday
 
       def build_connection(env)
         net_http_connection(env).tap do |http|
-          http.use_ssl = env[:url].scheme == 'https' if http.respond_to?(:use_ssl=)
-          configure_ssl(http, env[:ssl])
+          configure_ssl(http, env[:ssl]) if env[:url].scheme == 'https' && env[:ssl]
           configure_request(http, env[:request])
         end
       end
@@ -53,7 +53,8 @@ module Faraday
         if proxy
           Net::HTTP.new(env[:url].hostname, port,
                         proxy[:uri].hostname, proxy[:uri].port,
-                        proxy[:user], proxy[:password])
+                        proxy[:user], proxy[:password],
+                        nil, proxy[:uri].scheme == 'https')
         else
           Net::HTTP.new(env[:url].hostname, port, nil)
         end
@@ -61,24 +62,13 @@ module Faraday
 
       def call(env)
         super
-        http_response = connection(env) do |http|
-          begin
-            perform_request(http, env)
-          rescue *NET_HTTP_EXCEPTIONS => e
-            raise Faraday::SSLError, e if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
+        connection(env) do |http|
+          perform_request(http, env)
+        rescue *NET_HTTP_EXCEPTIONS => e
+          raise Faraday::SSLError, e if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
 
-            raise Faraday::ConnectionFailed, e
-          end
+          raise Faraday::ConnectionFailed, e
         end
-
-        save_response(env, http_response.code.to_i,
-                      http_response.body || +'', nil,
-                      http_response.message) do |response_headers|
-          http_response.each_header do |key, value|
-            response_headers[key] = value
-          end
-        end
-
         @app.call env
       rescue Timeout::Error, Errno::ETIMEDOUT => e
         raise Faraday::TimeoutError, e
@@ -103,64 +93,51 @@ module Faraday
       end
 
       def perform_request(http, env)
-        if env[:request].stream_response?
-          size = 0
-          yielded = false
-          http_response = request_with_wrapped_block(http, env) do |chunk|
-            if chunk.bytesize.positive? || size.positive?
-              yielded = true
-              size += chunk.bytesize
-              env[:request].on_data.call(chunk, size)
-            end
+        if env.stream_response?
+          http_response = env.stream_response do |&on_data|
+            request_with_wrapped_block(http, env, &on_data)
           end
-          env[:request].on_data.call(+'', 0) unless yielded
-          # Net::HTTP returns something,
-          # but it's not meaningful according to the docs.
           http_response.body = nil
-          http_response
         else
-          request_with_wrapped_block(http, env)
+          http_response = request_with_wrapped_block(http, env)
         end
+        env.response_body = encoded_body(http_response)
+        env.response.finish(env)
+        http_response
       end
 
       def request_with_wrapped_block(http, env, &block)
-        if (env[:method] == :get) && !env[:body]
-          # prefer `get` to `request` because the former handles gzip (ruby 1.9)
-          request_via_get_method(http, env, &block)
-        else
-          request_via_request_method(http, env, &block)
-        end
-      end
-
-      def request_via_get_method(http, env, &block)
         # Must use Net::HTTP#start and pass it a block otherwise the server's
         # TCP socket does not close correctly.
         http.start do |opened_http|
-          opened_http.get env[:url].request_uri, env[:request_headers], &block
+          opened_http.request create_request(env) do |response|
+            save_http_response(env, response)
+
+            response.read_body(&block) if block_given?
+          end
         end
       end
 
-      def request_via_request_method(http, env, &block)
-        # Must use Net::HTTP#start and pass it a block otherwise the server's
-        # TCP socket does not close correctly.
-        http.start do |opened_http|
-          if block_given?
-            opened_http.request create_request(env) do |response|
-              response.read_body(&block)
-            end
-          else
-            opened_http.request create_request(env)
+      def save_http_response(env, http_response)
+        save_response(
+          env, http_response.code.to_i, nil, nil, http_response.message, finished: false
+        ) do |response_headers|
+          http_response.each_header do |key, value|
+            response_headers[key] = value
           end
         end
       end
 
       def configure_ssl(http, ssl)
-        return unless ssl
+        http.use_ssl = true if http.respond_to?(:use_ssl=)
 
         http.verify_mode = ssl_verify_mode(ssl)
         http.cert_store = ssl_cert_store(ssl)
 
-        http.cert = ssl[:client_cert] if ssl[:client_cert]
+        cert, *extra_chain_cert = ssl[:client_cert]
+        http.cert = cert if cert
+        http.extra_chain_cert = extra_chain_cert if extra_chain_cert.any?
+
         http.key = ssl[:client_key] if ssl[:client_key]
         http.ca_file = ssl[:ca_file] if ssl[:ca_file]
         http.ca_path = ssl[:ca_path] if ssl[:ca_path]
@@ -168,6 +145,8 @@ module Faraday
         http.ssl_version = ssl[:version] if ssl[:version]
         http.min_version = ssl[:min_version] if ssl[:min_version]
         http.max_version = ssl[:max_version] if ssl[:max_version]
+        http.verify_hostname = ssl[:verify_hostname] if verify_hostname_enabled?(http, ssl)
+        http.ciphers = ssl[:ciphers] if ssl[:ciphers]
       end
 
       def configure_request(http, req)
@@ -193,20 +172,34 @@ module Faraday
       def ssl_cert_store(ssl)
         return ssl[:cert_store] if ssl[:cert_store]
 
-        @ssl_cert_store ||= begin
-                              # Use the default cert store by default, i.e. system ca certs
-                              OpenSSL::X509::Store.new.tap(&:set_default_paths)
-                            end
+        # Use the default cert store by default, i.e. system ca certs
+        @ssl_cert_store ||= OpenSSL::X509::Store.new.tap(&:set_default_paths)
       end
 
       def ssl_verify_mode(ssl)
         ssl[:verify_mode] || begin
-                               if ssl.fetch(:verify, true)
-                                 OpenSSL::SSL::VERIFY_PEER
-                               else
-                                 OpenSSL::SSL::VERIFY_NONE
-                               end
-                             end
+          if ssl.fetch(:verify, true)
+            OpenSSL::SSL::VERIFY_PEER
+          else
+            OpenSSL::SSL::VERIFY_NONE
+          end
+        end
+      end
+
+      def encoded_body(http_response)
+        body = http_response.body || +''
+        /\bcharset=([^;]+)/.match(http_response['Content-Type']) do |match|
+          content_charset = ::Encoding.find(match[1].strip)
+          body = body.dup if body.frozen?
+          body.force_encoding(content_charset)
+        rescue ArgumentError
+          nil
+        end
+        body
+      end
+
+      def verify_hostname_enabled?(http, ssl)
+        http.respond_to?(:verify_hostname=) && ssl.key?(:verify_hostname)
       end
     end
   end

data/lib/faraday/net_http/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module NetHttp
-    VERSION = '1.0.1'
+    VERSION = '3.4.1'
   end
 end

data/lib/faraday/net_http.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'adapter/net_http'
-require_relative 'net_http/version'
+require 'faraday/adapter/net_http'
+require 'faraday/net_http/version'
 
 module Faraday
   module NetHttp

metadata

@@ -1,155 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 3.4.1
 platform: ruby
 authors:
 - Jan van der Pas
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: net-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: 0.5.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-- !ruby/object:Gem::Dependency
-  name: multipart-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.91.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.91.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-packaging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.5.0
 description: Faraday adapter for Net::HTTP
 email:
 - janvanderpas@gmail.com
@@ -168,8 +41,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/lostisland/faraday-net_http
   source_code_uri: https://github.com/lostisland/faraday-net_http
-  changelog_uri: https://github.com/lostisland/faraday-net_http
-post_install_message: 
+  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.4.1
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -177,15 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Faraday adapter for Net::HTTP
 test_files: []