faraday 0.17.1 → 1.1.0

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.1
+  version: 1.1.0
 platform: ruby
 authors:
 - "@technoweenie"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -32,6 +32,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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -42,6 +56,8 @@ 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
@@ -56,12 +72,24 @@ files:
 - 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/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,58 +103,73 @@ 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
+- 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_persistent_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.1.0
+  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:
   - - ">="

data/lib/faraday/deprecate.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-module Faraday
-  # @param new_klass [Class] new Klass to use
-  #
-  # @return [Class] A modified version of new_klass that warns on
-  #   usage about deprecation.
-  # @see Faraday::Deprecate
-  module DeprecatedClass
-    def self.proxy_class(origclass, ver = '1.0')
-      proxy = Class.new(origclass) do
-        class << self
-          extend Faraday::Deprecate
-
-          def ===(other)
-            other.is_a?(superclass) || super
-          end
-        end
-      end
-      proxy.singleton_class.send(:deprecate, :new, "#{origclass}.new", ver)
-      proxy.singleton_class.send(:deprecate, :inherited, origclass.name, ver)
-      proxy
-    end
-  end
-
-  # Deprecation using semver instead of date, based on Gem::Deprecate
-  # Provides a single method +deprecate+ to be used to declare when
-  # something is going away.
-  #
-  #     class Legacy
-  #       def self.klass_method
-  #         # ...
-  #       end
-  #
-  #       def instance_method
-  #         # ...
-  #       end
-  #
-  #       extend Faraday::Deprecate
-  #       deprecate :instance_method, "X.z", '1.0'
-  #
-  #       class << self
-  #         extend Faraday::Deprecate
-  #         deprecate :klass_method, :none, '1.0'
-  #       end
-  #     end
-  module Deprecate
-    def self.skip # :nodoc:
-      @skip ||= false
-    end
-
-    def self.skip=(value) # :nodoc:
-      @skip = value
-    end
-
-    # Temporarily turn off warnings. Intended for tests only.
-    def skip_during
-      original = Faraday::Deprecate.skip
-      Faraday::Deprecate.skip, = true
-      yield
-    ensure
-      Faraday::Deprecate.skip = original
-    end
-
-    # Simple deprecation method that deprecates +name+ by wrapping it up
-    # in a dummy method. It warns on each call to the dummy method
-    # telling the user of +repl+ (unless +repl+ is :none) and the
-    # semver that it is planned to go away.
-    # @param name [Symbol] the method symbol to deprecate
-    # @param repl [#to_s, :none] the replacement to use, when `:none` it will
-    #   alert the user that no replacemtent is present.
-    # @param ver [String] the semver the method will be removed.
-    def deprecate(name, repl, ver)
-      class_eval do
-        gem_ver = Gem::Version.new(ver)
-        old = "_deprecated_#{name}"
-        alias_method old, name
-        define_method name do |*args, &block|
-          mod = is_a? Module
-          target = mod ? "#{self}." : "#{self.class}#"
-          target_message = if name == :inherited
-                             "Inheriting #{self}"
-                           else
-                             "#{target}#{name}"
-                           end
-
-          msg = [
-            "NOTE: #{target_message} is deprecated",
-            repl == :none ? ' with no replacement' : "; use #{repl} instead. ",
-            "It will be removed in or after version #{gem_ver}",
-            "\n#{target}#{name} called from #{Gem.location_of_caller.join(':')}"
-          ]
-          warn "#{msg.join}." unless Faraday::Deprecate.skip
-          send old, *args, &block
-        end
-      end
-    end
-
-    module_function :deprecate, :skip_during
-  end
-end

data/lib/faraday/upload_io.rb

@@ -1,67 +0,0 @@
-begin
-  require 'composite_io'
-  require 'parts'
-  require 'stringio'
-rescue LoadError
-  $stderr.puts "Install the multipart-post gem."
-  raise
-end
-
-module Faraday
-  # Similar but not compatible with ::CompositeReadIO provided by multipart-post.
-  class CompositeReadIO
-    def initialize(*parts)
-      @parts = parts.flatten
-      @ios = @parts.map { |part| part.to_io }
-      @index = 0
-    end
-
-    def length
-      @parts.inject(0) { |sum, part| sum + part.length }
-    end
-
-    def rewind
-      @ios.each { |io| io.rewind }
-      @index = 0
-    end
-
-    # Read from IOs in order until `length` bytes have been received.
-    def read(length = nil, outbuf = nil)
-      got_result = false
-      outbuf = outbuf ? outbuf.replace("") : ""
-
-      while io = current_io
-        if result = io.read(length)
-          got_result ||= !result.nil?
-          result.force_encoding("BINARY") if result.respond_to?(:force_encoding)
-          outbuf << result
-          length -= result.length if length
-          break if length == 0
-        end
-        advance_io
-      end
-      (!got_result && length) ? nil : outbuf
-    end
-
-    def close
-      @ios.each { |io| io.close }
-    end
-
-    def ensure_open_and_readable
-      # Rubinius compatibility
-    end
-
-    private
-
-    def current_io
-      @ios[@index]
-    end
-
-    def advance_io
-      @index += 1
-    end
-  end
-
-  UploadIO = ::UploadIO
-  Parts = ::Parts
-end