RubyGems - faraday - Versions diffs - 1.9.3 → 2.2.0 - Mend

faraday 1.9.3 → 2.2.0

Files changed (62) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +193 -3
data/README.md +11 -9
data/examples/client_spec.rb +19 -19
data/examples/client_test.rb +22 -22
data/lib/faraday/adapter/test.rb +10 -4
data/lib/faraday/adapter.rb +2 -5
data/lib/faraday/connection.rb +12 -93
data/lib/faraday/encoders/nested_params_encoder.rb +2 -2
data/lib/faraday/error.rb +3 -2
data/lib/faraday/logging/formatter.rb +1 -0
data/lib/faraday/middleware.rb +0 -1
data/lib/faraday/middleware_registry.rb +17 -63
data/lib/faraday/options.rb +3 -3
data/lib/faraday/rack_builder.rb +23 -20
data/lib/faraday/request/authorization.rb +28 -41
data/lib/faraday/request/instrumentation.rb +2 -0
data/lib/faraday/request/json.rb +55 -0
data/lib/faraday/request/url_encoded.rb +2 -0
data/lib/faraday/request.rb +11 -29
data/lib/faraday/response/json.rb +54 -0
data/lib/faraday/response/logger.rb +4 -4
data/lib/faraday/response/raise_error.rb +9 -1
data/lib/faraday/response.rb +8 -19
data/lib/faraday/utils/headers.rb +1 -1
data/lib/faraday/utils.rb +10 -5
data/lib/faraday/version.rb +1 -1
data/lib/faraday.rb +11 -45
data/spec/faraday/connection_spec.rb +136 -85
data/spec/faraday/middleware_registry_spec.rb +31 -0
data/spec/faraday/options/env_spec.rb +2 -2
data/spec/faraday/rack_builder_spec.rb +26 -54
data/spec/faraday/request/authorization_spec.rb +19 -32
data/spec/faraday/request/instrumentation_spec.rb +5 -7
data/spec/faraday/request/json_spec.rb +111 -0
data/spec/faraday/request/url_encoded_spec.rb +0 -1
data/spec/faraday/request_spec.rb +4 -15
data/spec/faraday/response/json_spec.rb +117 -0
data/spec/faraday/response/raise_error_spec.rb +7 -4
data/spec/faraday/utils/headers_spec.rb +2 -2
data/spec/faraday/utils_spec.rb +62 -1
data/spec/support/fake_safe_buffer.rb +1 -1
data/spec/support/helper_methods.rb +0 -37
data/spec/support/shared_examples/adapter.rb +0 -1
data/spec/support/shared_examples/request_method.rb +5 -18
metadata +12 -149
data/lib/faraday/adapter/typhoeus.rb +0 -15
data/lib/faraday/autoload.rb +0 -87
data/lib/faraday/dependency_loader.rb +0 -37
data/lib/faraday/request/basic_authentication.rb +0 -20
data/lib/faraday/request/token_authentication.rb +0 -20
data/spec/faraday/adapter/em_http_spec.rb +0 -49
data/spec/faraday/adapter/em_synchrony_spec.rb +0 -18
data/spec/faraday/adapter/excon_spec.rb +0 -49
data/spec/faraday/adapter/httpclient_spec.rb +0 -73
data/spec/faraday/adapter/net_http_spec.rb +0 -64
data/spec/faraday/adapter/patron_spec.rb +0 -18
data/spec/faraday/adapter/rack_spec.rb +0 -8
data/spec/faraday/adapter/typhoeus_spec.rb +0 -7
data/spec/faraday/composite_read_io_spec.rb +0 -80
data/spec/faraday/response/middleware_spec.rb +0 -68
data/spec/support/webmock_rack_app.rb +0 -68

data/spec/faraday/adapter/patron_spec.rb DELETED Viewed

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-RSpec.describe Faraday::Adapter::Patron, unless: defined?(JRUBY_VERSION) do
-  features :reason_phrase_parse
-  it_behaves_like 'an adapter'
-  it 'allows to provide adapter specific configs' do
-    conn = Faraday.new do |f|
-      f.adapter :patron do |session|
-        session.max_redirects = 10
-        raise 'Configuration block called'
-      end
-    end
-    expect { conn.get('/') }.to raise_error(RuntimeError, 'Configuration block called')
-  end
-end

data/spec/faraday/adapter/rack_spec.rb DELETED Viewed

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-RSpec.describe Faraday::Adapter::Rack do
-  features :request_body_on_query_methods, :trace_method,
-           :skip_response_body_on_head
-  it_behaves_like 'an adapter', adapter_options: WebmockRackApp.new
-end

data/spec/faraday/adapter/typhoeus_spec.rb DELETED Viewed

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-RSpec.describe Faraday::Adapter::Typhoeus do
-  features :request_body_on_query_methods, :parallel, :trace_method
-  it_behaves_like 'an adapter'
-end

data/spec/faraday/composite_read_io_spec.rb DELETED Viewed

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-require 'stringio'
-RSpec.describe Faraday::CompositeReadIO do
-  Part = Struct.new(:to_io) do
-    def length
-      to_io.string.length
-    end
-  end
-  def part(str)
-    Part.new StringIO.new(str)
-  end
-  def composite_io(*parts)
-    Faraday::CompositeReadIO.new(*parts)
-  end
-  context 'with empty composite_io' do
-    subject { composite_io }
-    it { expect(subject.length).to eq(0) }
-    it { expect(subject.read).to eq('') }
-    it { expect(subject.read(1)).to be_nil }
-  end
-  context 'with empty parts' do
-    subject { composite_io(part(''), part('')) }
-    it { expect(subject.length).to eq(0) }
-    it { expect(subject.read).to eq('') }
-    it { expect(subject.read(1)).to be_nil }
-  end
-  context 'with 2 parts' do
-    subject { composite_io(part('abcd'), part('1234')) }
-    it { expect(subject.length).to eq(8) }
-    it { expect(subject.read).to eq('abcd1234') }
-    it 'allows to read in chunks' do
-      expect(subject.read(3)).to eq('abc')
-      expect(subject.read(3)).to eq('d12')
-      expect(subject.read(3)).to eq('34')
-      expect(subject.read(3)).to be_nil
-    end
-    it 'allows to rewind while reading in chunks' do
-      expect(subject.read(3)).to eq('abc')
-      expect(subject.read(3)).to eq('d12')
-      subject.rewind
-      expect(subject.read(3)).to eq('abc')
-      expect(subject.read(5)).to eq('d1234')
-      expect(subject.read(3)).to be_nil
-      subject.rewind
-      expect(subject.read(2)).to eq('ab')
-    end
-  end
-  context 'with mix of empty and non-empty parts' do
-    subject { composite_io(part(''), part('abcd'), part(''), part('1234'), part('')) }
-    it 'allows to read in chunks' do
-      expect(subject.read(6)).to eq('abcd12')
-      expect(subject.read(6)).to eq('34')
-      expect(subject.read(6)).to be_nil
-    end
-  end
-  context 'with utf8 multibyte part' do
-    subject { composite_io(part("\x86"), part('ファイル')) }
-    it { expect(subject.read).to eq(String.new("\x86\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB", encoding: 'BINARY')) }
-    it 'allows to read in chunks' do
-      expect(subject.read(3)).to eq(String.new("\x86\xE3\x83", encoding: 'BINARY'))
-      expect(subject.read(3)).to eq(String.new("\x95\xE3\x82", encoding: 'BINARY'))
-      expect(subject.read(8)).to eq(String.new("\xA1\xE3\x82\xA4\xE3\x83\xAB", encoding: 'BINARY'))
-      expect(subject.read(3)).to be_nil
-    end
-  end
-end

data/spec/faraday/response/middleware_spec.rb DELETED Viewed

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-RSpec.describe Faraday::Response::Middleware do
-  let(:conn) do
-    Faraday.new do |b|
-      b.use custom_middleware
-      b.adapter :test do |stub|
-        stub.get('ok') { [200, { 'Content-Type' => 'text/html' }, '<body></body>'] }
-        stub.get('not_modified') { [304, nil, nil] }
-        stub.get('no_content') { [204, nil, nil] }
-      end
-    end
-  end
-  context 'with a custom ResponseMiddleware' do
-    let(:custom_middleware) do
-      Class.new(Faraday::Response::Middleware) do
-        def parse(body)
-          body.upcase
-        end
-      end
-    end
-    it 'parses the response' do
-      expect(conn.get('ok').body).to eq('<BODY></BODY>')
-    end
-  end
-  context 'with a custom ResponseMiddleware and private parse' do
-    let(:custom_middleware) do
-      Class.new(Faraday::Response::Middleware) do
-        private
-        def parse(body)
-          body.upcase
-        end
-      end
-    end
-    it 'parses the response' do
-      expect(conn.get('ok').body).to eq('<BODY></BODY>')
-    end
-  end
-  context 'with a custom ResponseMiddleware but empty response' do
-    let(:custom_middleware) do
-      Class.new(Faraday::Response::Middleware) do
-        def parse(_body)
-          raise 'this should not be called'
-        end
-      end
-    end
-    it 'raises exception for 200 responses' do
-      expect { conn.get('ok') }.to raise_error(StandardError)
-    end
-    it 'doesn\'t call the middleware for 204 responses' do
-      expect_any_instance_of(custom_middleware).not_to receive(:parse)
-      expect(conn.get('no_content').body).to be_nil
-    end
-    it 'doesn\'t call the middleware for 304 responses' do
-      expect_any_instance_of(custom_middleware).not_to receive(:parse)
-      expect(conn.get('not_modified').body).to be_nil
-    end
-  end
-end

data/spec/support/webmock_rack_app.rb DELETED Viewed

@@ -1,68 +0,0 @@
-# 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