faraday 0.17.3 → 1.4.1

data/spec/support/streaming_response_checker.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Faraday
+  module StreamingResponseChecker
+    def check_streaming_response(streamed, options = {})
+      opts = {
+        prefix: '',
+        streaming?: true
+      }.merge(options)
+
+      expected_response = opts[:prefix] + big_string
+
+      chunks, sizes = streamed.transpose
+
+      # Check that the total size of the chunks (via the last size returned)
+      # is the same size as the expected_response
+      expect(sizes.last).to eq(expected_response.bytesize)
+
+      start_index = 0
+      expected_chunks = []
+      chunks.each do |actual_chunk|
+        expected_chunk = expected_response[start_index..((start_index + actual_chunk.bytesize) - 1)]
+        expected_chunks << expected_chunk
+        start_index += expected_chunk.bytesize
+      end
+
+      # it's easier to read a smaller portion, so we check that first
+      expect(expected_chunks[0][0..255]).to eq(chunks[0][0..255])
+
+      [expected_chunks, chunks].transpose.each do |expected, actual|
+        expect(actual).to eq(expected)
+      end
+    end
+  end
+end

data/spec/support/webmock_rack_app.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+# Rack app used to test the Rack adapter.
+# Uses Webmock to check if requests are registered, in which case it returns
+# the registered response.
+class WebmockRackApp
+  def call(env)
+    req_signature = WebMock::RequestSignature.new(
+      req_method(env),
+      req_uri(env),
+      body: req_body(env),
+      headers: req_headers(env)
+    )
+
+    WebMock::RequestRegistry
+      .instance
+      .requested_signatures
+      .put(req_signature)
+
+    process_response(req_signature)
+  end
+
+  def req_method(env)
+    env['REQUEST_METHOD'].downcase.to_sym
+  end
+
+  def req_uri(env)
+    scheme = env['rack.url_scheme']
+    host = env['SERVER_NAME']
+    port = env['SERVER_PORT']
+    path = env['PATH_INFO']
+    query = env['QUERY_STRING']
+
+    url = +"#{scheme}://#{host}:#{port}#{path}"
+    url += "?#{query}" if query
+
+    uri = WebMock::Util::URI.heuristic_parse(url)
+    uri.path = uri.normalized_path.gsub('[^:]//', '/')
+    uri
+  end
+
+  def req_headers(env)
+    http_headers = env.select { |k, _| k.start_with?('HTTP_') }
+                      .map { |k, v| [k[5..-1], v] }
+                      .to_h
+
+    special_headers = Faraday::Adapter::Rack::SPECIAL_HEADERS
+    http_headers.merge(env.select { |k, _| special_headers.include?(k) })
+  end
+
+  def req_body(env)
+    env['rack.input'].read
+  end
+
+  def process_response(req_signature)
+    res = WebMock::StubRegistry.instance.response_for_request(req_signature)
+
+    if res.nil? && req_signature.uri.host == 'localhost'
+      raise Faraday::ConnectionFailed, 'Trying to connect to localhost'
+    end
+
+    raise WebMock::NetConnectNotAllowedError, req_signature unless res
+
+    raise Faraday::TimeoutError if res.should_timeout
+
+    [res.status[0], res.headers || {}, [res.body || '']]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 1.4.1
 platform: ruby
 authors:
 - "@technoweenie"
@@ -10,8 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday-excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: faraday-net_http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-net_http_persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
@@ -32,6 +74,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -42,26 +98,38 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- examples/client_spec.rb
+- examples/client_test.rb
 - lib/faraday.rb
 - lib/faraday/adapter.rb
 - lib/faraday/adapter/em_http.rb
 - lib/faraday/adapter/em_http_ssl_patch.rb
 - lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/em_synchrony/parallel_manager.rb
-- lib/faraday/adapter/excon.rb
 - lib/faraday/adapter/httpclient.rb
-- lib/faraday/adapter/net_http.rb
-- lib/faraday/adapter/net_http_persistent.rb
 - lib/faraday/adapter/patron.rb
 - lib/faraday/adapter/rack.rb
 - lib/faraday/adapter/test.rb
 - lib/faraday/adapter/typhoeus.rb
+- lib/faraday/adapter_registry.rb
 - lib/faraday/autoload.rb
 - lib/faraday/connection.rb
-- lib/faraday/deprecate.rb
+- lib/faraday/dependency_loader.rb
+- lib/faraday/encoders/flat_params_encoder.rb
+- lib/faraday/encoders/nested_params_encoder.rb
 - lib/faraday/error.rb
+- lib/faraday/file_part.rb
+- lib/faraday/logging/formatter.rb
+- lib/faraday/methods.rb
 - lib/faraday/middleware.rb
+- lib/faraday/middleware_registry.rb
 - lib/faraday/options.rb
+- lib/faraday/options/connection_options.rb
+- lib/faraday/options/env.rb
+- lib/faraday/options/proxy_options.rb
+- lib/faraday/options/request_options.rb
+- lib/faraday/options/ssl_options.rb
+- lib/faraday/param_part.rb
 - lib/faraday/parameters.rb
 - lib/faraday/rack_builder.rb
 - lib/faraday/request.rb
@@ -75,65 +143,80 @@ files:
 - lib/faraday/response.rb
 - lib/faraday/response/logger.rb
 - lib/faraday/response/raise_error.rb
-- lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
-- spec/faraday/deprecate_spec.rb
+- lib/faraday/utils/headers.rb
+- lib/faraday/utils/params_hash.rb
+- lib/faraday/version.rb
+- spec/external_adapters/faraday_specs_setup.rb
+- spec/faraday/adapter/em_http_spec.rb
+- spec/faraday/adapter/em_synchrony_spec.rb
+- spec/faraday/adapter/excon_spec.rb
+- spec/faraday/adapter/httpclient_spec.rb
+- spec/faraday/adapter/net_http_spec.rb
+- spec/faraday/adapter/patron_spec.rb
+- spec/faraday/adapter/rack_spec.rb
+- spec/faraday/adapter/test_spec.rb
+- spec/faraday/adapter/typhoeus_spec.rb
+- spec/faraday/adapter_registry_spec.rb
+- spec/faraday/adapter_spec.rb
+- spec/faraday/composite_read_io_spec.rb
+- spec/faraday/connection_spec.rb
 - spec/faraday/error_spec.rb
+- spec/faraday/middleware_spec.rb
+- spec/faraday/options/env_spec.rb
+- spec/faraday/options/options_spec.rb
+- spec/faraday/options/proxy_options_spec.rb
+- spec/faraday/options/request_options_spec.rb
+- spec/faraday/params_encoders/flat_spec.rb
+- spec/faraday/params_encoders/nested_spec.rb
+- spec/faraday/rack_builder_spec.rb
+- spec/faraday/request/authorization_spec.rb
+- spec/faraday/request/instrumentation_spec.rb
+- spec/faraday/request/multipart_spec.rb
+- spec/faraday/request/retry_spec.rb
+- spec/faraday/request/url_encoded_spec.rb
+- spec/faraday/request_spec.rb
+- spec/faraday/response/logger_spec.rb
+- spec/faraday/response/middleware_spec.rb
 - spec/faraday/response/raise_error_spec.rb
+- spec/faraday/response_spec.rb
+- spec/faraday/utils/headers_spec.rb
+- spec/faraday/utils_spec.rb
+- spec/faraday_spec.rb
 - spec/spec_helper.rb
-- test/adapters/default_test.rb
-- test/adapters/em_http_test.rb
-- test/adapters/em_synchrony_test.rb
-- test/adapters/excon_test.rb
-- test/adapters/httpclient_test.rb
-- test/adapters/integration.rb
-- test/adapters/logger_test.rb
-- test/adapters/net_http_persistent_test.rb
-- test/adapters/net_http_test.rb
-- test/adapters/patron_test.rb
-- test/adapters/rack_test.rb
-- test/adapters/test_middleware_test.rb
-- test/adapters/typhoeus_test.rb
-- test/authentication_middleware_test.rb
-- test/composite_read_io_test.rb
-- test/connection_test.rb
-- test/env_test.rb
-- test/helper.rb
-- test/live_server.rb
-- test/middleware/instrumentation_test.rb
-- test/middleware/retry_test.rb
-- test/middleware_stack_test.rb
-- test/multibyte.txt
-- test/options_test.rb
-- test/parameters_test.rb
-- test/request_middleware_test.rb
-- test/response_middleware_test.rb
-- test/strawberry.rb
-- test/utils_test.rb
+- spec/support/disabling_stub.rb
+- spec/support/fake_safe_buffer.rb
+- spec/support/helper_methods.rb
+- spec/support/shared_examples/adapter.rb
+- spec/support/shared_examples/params_encoder.rb
+- spec/support/shared_examples/request_method.rb
+- spec/support/streaming_response_checker.rb
+- spec/support/webmock_rack_app.rb
 homepage: https://lostisland.github.io/faraday
 licenses:
 - MIT
 metadata:
   homepage_uri: https://lostisland.github.io/faraday
-  changelog_uri: https://github.com/lostisland/faraday/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/lostisland/faraday/
+  changelog_uri: https://github.com/lostisland/faraday/releases/tag/v1.4.1
+  source_code_uri: https://github.com/lostisland/faraday
   bug_tracker_uri: https://github.com/lostisland/faraday/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
+- spec/external_adapters
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: HTTP/REST API client library.

data/lib/faraday/adapter/excon.rb

@@ -1,82 +0,0 @@
-module Faraday
-  class Adapter
-    class Excon < Faraday::Adapter
-      dependency 'excon'
-
-      def call(env)
-        super
-
-        opts = {}
-        if env[:url].scheme == 'https' && ssl = env[:ssl]
-          opts[:ssl_verify_peer] = !!ssl.fetch(:verify, true)
-          opts[:ssl_ca_path] = ssl[:ca_path] if ssl[:ca_path]
-          opts[:ssl_ca_file] = ssl[:ca_file] if ssl[:ca_file]
-          opts[:client_cert] = ssl[:client_cert] if ssl[:client_cert]
-          opts[:client_key]  = ssl[:client_key]  if ssl[:client_key]
-          opts[:certificate] = ssl[:certificate] if ssl[:certificate]
-          opts[:private_key] = ssl[:private_key] if ssl[:private_key]
-          opts[:ssl_version] = ssl[:version] if ssl[:version]
-          opts[:ssl_min_version] = ssl[:min_version] if ssl[:min_version]
-          opts[:ssl_max_version] = ssl[:max_version] if ssl[:max_version]
-
-          # https://github.com/geemus/excon/issues/106
-          # https://github.com/jruby/jruby-ossl/issues/19
-          opts[:nonblock] = false
-        end
-
-        if ( req = env[:request] )
-          if req[:timeout]
-            opts[:read_timeout]      = req[:timeout]
-            opts[:connect_timeout]   = req[:timeout]
-            opts[:write_timeout]     = req[:timeout]
-          end
-
-          if req[:open_timeout]
-            opts[:connect_timeout]   = req[:open_timeout]
-          end
-
-          if req[:proxy]
-            opts[:proxy] = {
-              :host     => req[:proxy][:uri].host,
-              :hostname => req[:proxy][:uri].hostname,
-              :port     => req[:proxy][:uri].port,
-              :scheme   => req[:proxy][:uri].scheme,
-              :user     => req[:proxy][:user],
-              :password => req[:proxy][:password]
-            }
-          end
-        end
-
-        conn = create_connection(env, opts)
-
-        resp = conn.request \
-          :method  => env[:method].to_s.upcase,
-          :headers => env[:request_headers],
-          :body    => read_body(env)
-
-        save_response(env, resp.status.to_i, resp.body, resp.headers, resp.reason_phrase)
-
-        @app.call env
-      rescue ::Excon::Errors::SocketError => err
-        if err.message =~ /\btimeout\b/
-          raise Faraday::TimeoutError, err
-        elsif err.message =~ /\bcertificate\b/
-          raise Faraday::SSLError, err
-        else
-          raise Faraday::ConnectionFailed, err
-        end
-      rescue ::Excon::Errors::Timeout => err
-        raise Faraday::TimeoutError, err
-      end
-
-      def create_connection(env, opts)
-        ::Excon.new(env[:url].to_s, opts.merge(@connection_options))
-      end
-
-      # TODO: support streaming requests
-      def read_body(env)
-        env[:body].respond_to?(:read) ? env[:body].read : env[:body]
-      end
-    end
-  end
-end

data/lib/faraday/adapter/net_http.rb

@@ -1,152 +0,0 @@
-begin
-  require 'net/https'
-rescue LoadError
-  warn "Warning: no such file to load -- net/https. Make sure openssl is installed if you want ssl support"
-  require 'net/http'
-end
-require 'zlib'
-
-module Faraday
-  class Adapter
-    class NetHttp < Faraday::Adapter
-      NET_HTTP_EXCEPTIONS = [
-        IOError,
-        Errno::ECONNABORTED,
-        Errno::ECONNREFUSED,
-        Errno::ECONNRESET,
-        Errno::EHOSTUNREACH,
-        Errno::EINVAL,
-        Errno::ENETUNREACH,
-        Errno::EPIPE,
-        Net::HTTPBadResponse,
-        Net::HTTPHeaderSyntaxError,
-        Net::ProtocolError,
-        SocketError,
-        Zlib::GzipFile::Error,
-      ]
-
-      NET_HTTP_EXCEPTIONS << OpenSSL::SSL::SSLError if defined?(OpenSSL)
-      NET_HTTP_EXCEPTIONS << Net::OpenTimeout if defined?(Net::OpenTimeout)
-
-      def initialize(app = nil, opts = {}, &block)
-        @cert_store = nil
-        super(app, opts, &block)
-      end
-
-      def call(env)
-        super
-        with_net_http_connection(env) do |http|
-          configure_ssl(http, env[:ssl]) if env[:url].scheme == 'https' and env[:ssl]
-          configure_request(http, env[:request])
-
-          begin
-            http_response = perform_request(http, env)
-          rescue *NET_HTTP_EXCEPTIONS => err
-            if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
-              raise Faraday::SSLError, err
-            else
-              raise Faraday::ConnectionFailed, err
-            end
-          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
-        end
-
-        @app.call env
-      rescue Timeout::Error, Errno::ETIMEDOUT => err
-        raise Faraday::TimeoutError, err
-      end
-
-      private
-
-      def create_request(env)
-        request = Net::HTTPGenericRequest.new \
-          env[:method].to_s.upcase,    # request method
-          !!env[:body],                # is there request body
-          :head != env[:method],       # is there response body
-          env[:url].request_uri,       # request uri path
-          env[:request_headers]        # request headers
-
-        if env[:body].respond_to?(:read)
-          request.body_stream = env[:body]
-        else
-          request.body = env[:body]
-        end
-        request
-      end
-
-      def perform_request(http, env)
-        if :get == env[:method] and !env[:body]
-          # prefer `get` to `request` because the former handles gzip (ruby 1.9)
-          http.get env[:url].request_uri, env[:request_headers]
-        else
-          http.request create_request(env)
-        end
-      end
-
-      def with_net_http_connection(env)
-        yield net_http_connection(env)
-      end
-
-      def net_http_connection(env)
-        if proxy = env[:request][:proxy]
-          Net::HTTP::Proxy(proxy[:uri].hostname, proxy[:uri].port, proxy[:user], proxy[:password])
-        else
-          Net::HTTP
-        end.new(env[:url].hostname, env[:url].port || (env[:url].scheme == 'https' ? 443 : 80))
-      end
-
-      def configure_ssl(http, ssl)
-        http.use_ssl      = true
-        http.verify_mode  = ssl_verify_mode(ssl)
-        http.cert_store   = ssl_cert_store(ssl)
-
-        http.cert         = ssl[:client_cert]  if ssl[:client_cert]
-        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]
-        http.verify_depth = ssl[:verify_depth] if ssl[:verify_depth]
-        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]
-      end
-
-      def configure_request(http, req)
-        if req[:timeout]
-          http.read_timeout  = req[:timeout]
-          http.open_timeout  = req[:timeout]
-          http.write_timeout = req[:timeout] if http.respond_to?(:write_timeout=)
-        end
-        http.open_timeout  = req[:open_timeout]  if req[:open_timeout]
-        http.write_timeout = req[:write_timeout] if req[:write_timeout] && http.respond_to?(:write_timeout=)
-          # Only set if Net::Http supports it, since Ruby 2.5.
-        http.max_retries  = 0                    if http.respond_to?(:max_retries=)
-
-        @config_block.call(http) if @config_block
-      end
-
-      def ssl_cert_store(ssl)
-        return ssl[:cert_store] if ssl[:cert_store]
-        return @cert_store if @cert_store
-        # Use the default cert store by default, i.e. system ca certs
-        @cert_store = OpenSSL::X509::Store.new
-        @cert_store.set_default_paths
-        @cert_store
-      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
-      end
-    end
-  end
-end