faraday 0.17.6 → 1.10.3

data/spec/faraday/deprecate_spec.rb

@@ -35,9 +35,9 @@ RSpec.describe Faraday::DeprecatedClass do
   end
 
   it 'allows backward-compatible class to be subclassed' do
-    expect {
+    expect do
       with_warn_squelching { Class.new(SampleDeprecatedClass) }
-    }.not_to raise_error
+    end.not_to raise_error
   end
 
   it 'allows rescuing of a current error with a deprecated error' do
@@ -66,71 +66,71 @@ RSpec.describe Faraday::DeprecatedClass do
 
     describe 'undeprecated class' do
       it 'is === to instance of deprecated class' do
-        expect(SampleClass === SampleDeprecatedClass.new).to be true
+        expect(SampleDeprecatedClass.new.is_a?(SampleClass)).to be true
       end
 
       it 'is === to instance of subclass of deprecated class' do
-        expect(SampleClass === SampleDeprecatedClassA.new).to be true
+        expect(SampleDeprecatedClassA.new.is_a?(SampleClass)).to be true
       end
 
       it 'is === to instance of subclass of subclass of deprecated class' do
-        expect(SampleClass === SampleDeprecatedClassAX.new).to be true
+        expect(SampleDeprecatedClassAX.new.is_a?(SampleClass)).to be true
       end
     end
 
     describe 'subclass of undeprecated class' do
       it 'is not === to instance of undeprecated class' do
-        expect(SampleClassA === SampleClass.new).to be false
+        expect(SampleClass.new.is_a?(SampleClassA)).to be false
       end
 
       it 'is not === to instance of deprecated class' do
-        expect(SampleClassA === SampleDeprecatedClass.new).to be false
+        expect(SampleDeprecatedClass.new.is_a?(SampleClassA)).to be false
       end
     end
 
     describe 'deprecated class' do
       it 'is === to instance of undeprecated class' do
-        expect(SampleDeprecatedClass === SampleClass.new).to be true
+        expect(SampleDeprecatedClass.new.is_a?(SampleClass)).to be true
       end
 
       it 'is === to instance of subclass of undeprecated class' do
-        expect(SampleDeprecatedClass === SampleClassA.new).to be true
+        expect(SampleClassA.superclass == SampleDeprecatedClass.superclass).to be true
       end
 
       it 'is === to instance of subclass of deprecated class' do
-        expect(SampleDeprecatedClass === SampleDeprecatedClassA.new).to be true
+        expect(SampleDeprecatedClassA.new.is_a?(SampleDeprecatedClass)).to be true
       end
 
       it 'is === to instance of subclass of subclass of deprecated class' do
-        expect(SampleDeprecatedClass === SampleDeprecatedClassAX.new).to be true
+        expect(SampleDeprecatedClassAX.new.is_a?(SampleDeprecatedClass)).to be true
       end
     end
 
     describe 'subclass of deprecated class' do
       it 'is not === to instance of subclass of undeprecated class' do
-        expect(SampleDeprecatedClassA === SampleClass.new).to be false
+        expect(SampleClass.new.is_a?(SampleDeprecatedClassA)).to be false
       end
 
       it 'is not === to instance of another subclass of deprecated class' do
-        expect(SampleDeprecatedClassA === SampleDeprecatedClassB.new).to be false
+        expect(SampleDeprecatedClassB.new.is_a?(SampleDeprecatedClassA)).to be false
       end
 
       it 'is === to instance of its subclass' do
-        expect(SampleDeprecatedClassA === SampleDeprecatedClassAX.new).to be true
+        expect(SampleDeprecatedClassAX.new.is_a?(SampleDeprecatedClassA)).to be true
       end
 
       it 'is === to instance of deprecated class' do
-        expect(SampleDeprecatedClass === SampleDeprecatedClassB.new).to be true
+        expect(SampleDeprecatedClassB.new.is_a?(SampleDeprecatedClass)).to be true
       end
     end
 
     describe 'subclass of subclass of deprecated class' do
       it 'is not === to instance of subclass of another subclass of deprecated class' do
-        expect(SampleDeprecatedClassAX === SampleDeprecatedClassB.new).to be false
+        expect(SampleDeprecatedClassB.new.is_a?(SampleDeprecatedClassAX)).to be false
       end
 
       it 'is not === to instance of its superclass' do
-        expect(SampleDeprecatedClassA === SampleDeprecatedClass.new).to be false
+        expect(SampleDeprecatedClass.new.is_a?(SampleDeprecatedClassA)).to be false
       end
     end
   end

data/spec/faraday/error_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe Faraday::ClientError do
       it { expect(subject.message).to eq(exception.message) }
       it { expect(subject.backtrace).to eq(exception.backtrace) }
       it { expect(subject.inspect).to eq('#<Faraday::ClientError wrapped=#<RuntimeError: test>>') }
+      it { expect(subject.response_status).to be_nil }
     end
 
     context 'with response hash' do
@@ -22,6 +23,7 @@ RSpec.describe Faraday::ClientError do
       it { expect(subject.response).to eq(exception) }
       it { expect(subject.message).to eq('the server responded with status 400') }
       it { expect(subject.inspect).to eq('#<Faraday::ClientError response={:status=>400}>') }
+      it { expect(subject.response_status).to eq(400) }
     end
 
     context 'with string' do
@@ -31,6 +33,7 @@ RSpec.describe Faraday::ClientError do
       it { expect(subject.response).to be_nil }
       it { expect(subject.message).to eq('custom message') }
       it { expect(subject.inspect).to eq('#<Faraday::ClientError #<Faraday::ClientError: custom message>>') }
+      it { expect(subject.response_status).to be_nil }
     end
 
     context 'with anything else #to_s' do
@@ -40,63 +43,18 @@ RSpec.describe Faraday::ClientError do
       it { expect(subject.response).to be_nil }
       it { expect(subject.message).to eq('["error1", "error2"]') }
       it { expect(subject.inspect).to eq('#<Faraday::ClientError #<Faraday::ClientError: ["error1", "error2"]>>') }
+      it { expect(subject.response_status).to be_nil }
     end
 
-    context 'maintains backward-compatibility until 1.0' do
-      it 'does not raise an error for error-namespaced classes but prints an error message' do
-        error_message, error = with_warn_squelching { Faraday::Error::ClientError.new('foo') }
-
-        expect(error).to be_a Faraday::ClientError
-        expect(error_message).to match(
-          Regexp.new(
-            'NOTE: Faraday::Error::ClientError.new is deprecated; '\
-            'use Faraday::ClientError.new instead. It will be removed in or after version 1.0'
-          )
-        )
-      end
-
-      it 'does not raise an error for inherited error-namespaced classes but prints an error message' do
-        error_message, = with_warn_squelching { Class.new(Faraday::Error::ClientError) }
-
-        expect(error_message).to match(
-          Regexp.new(
-            'NOTE: Inheriting Faraday::Error::ClientError is deprecated; '\
-            'use Faraday::ClientError instead. It will be removed in or after version 1.0'
-          )
-        )
-      end
-
-      it 'allows backward-compatible class to be subclassed' do
-        expect {
-          with_warn_squelching { Class.new(Faraday::Error::ClientError) }
-        }.not_to raise_error
-      end
-
-      it 'allows rescuing of a current error with a deprecated error' do
-        expect { raise Faraday::ClientError, nil }.to raise_error(Faraday::Error::ClientError)
-      end
-
-      it 'allows rescuing of a current error with a current error' do
-        expect { raise Faraday::ClientError, nil }.to raise_error(Faraday::ClientError)
-      end
-
-      it 'allows rescuing of a deprecated error with a deprecated error' do
-        expect { raise Faraday::Error::ClientError, nil }.to raise_error(Faraday::Error::ClientError)
-      end
-
-      it 'allows rescuing of a deprecated error with a current error' do
-        expect { raise Faraday::Error::ClientError, nil }.to raise_error(Faraday::ClientError)
-      end
-    end
+    context 'with exception string and response hash' do
+      let(:exception) { 'custom message' }
+      let(:response) { { status: 400 } }
 
-    def with_warn_squelching
-      stderr_catcher = StringIO.new
-      original_stderr = $stderr
-      $stderr = stderr_catcher
-      result = yield if block_given?
-      [stderr_catcher.tap(&:rewind).string, result]
-    ensure
-      $stderr = original_stderr
+      it { expect(subject.wrapped_exception).to be_nil }
+      it { expect(subject.response).to eq(response) }
+      it { expect(subject.message).to eq('custom message') }
+      it { expect(subject.inspect).to eq('#<Faraday::ClientError response={:status=>400}>') }
+      it { expect(subject.response_status).to eq(400) }
     end
   end
 end

data/spec/faraday/middleware_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+RSpec.describe Faraday::Middleware do
+  subject { described_class.new(app) }
+  let(:app) { double }
+
+  describe 'options' do
+    context 'when options are passed to the middleware' do
+      subject { described_class.new(app, options) }
+      let(:options) { { field: 'value' } }
+
+      it 'accepts options when initialized' do
+        expect(subject.options[:field]).to eq('value')
+      end
+    end
+  end
+
+  describe '#on_request' do
+    subject do
+      Class.new(described_class) do
+        def on_request(env)
+          # do nothing
+        end
+      end.new(app)
+    end
+
+    it 'is called by #call' do
+      expect(app).to receive(:call).and_return(app)
+      expect(app).to receive(:on_complete)
+      is_expected.to receive(:call).and_call_original
+      is_expected.to receive(:on_request)
+      subject.call(double)
+    end
+  end
+
+  describe '#close' do
+    context "with app that doesn't support \#close" do
+      it 'should issue warning' do
+        is_expected.to receive(:warn)
+        subject.close
+      end
+    end
+
+    context "with app that supports \#close" do
+      it 'should issue warning' do
+        expect(app).to receive(:close)
+        is_expected.to_not receive(:warn)
+        subject.close
+      end
+    end
+  end
+end

data/spec/faraday/options/env_spec.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+RSpec.describe Faraday::Env do
+  subject(:env) { described_class.new }
+
+  it 'allows to access members' do
+    expect(env.method).to be_nil
+    env.method = :get
+    expect(env.method).to eq(:get)
+  end
+
+  it 'allows to access symbol non members' do
+    expect(env[:custom]).to be_nil
+    env[:custom] = :boom
+    expect(env[:custom]).to eq(:boom)
+  end
+
+  it 'allows to access string non members' do
+    expect(env['custom']).to be_nil
+    env['custom'] = :boom
+    expect(env['custom']).to eq(:boom)
+  end
+
+  it 'ignores false when fetching' do
+    ssl = Faraday::SSLOptions.new
+    ssl.verify = false
+    expect(ssl.fetch(:verify, true)).to be_falsey
+  end
+
+  it 'retains custom members' do
+    env[:foo] = 'custom 1'
+    env[:bar] = :custom_2
+    env2 = Faraday::Env.from(env)
+    env2[:baz] = 'custom 3'
+
+    expect(env2[:foo]).to eq('custom 1')
+    expect(env2[:bar]).to eq(:custom_2)
+    expect(env[:baz]).to be_nil
+  end
+
+  describe '#body' do
+    subject(:env) { described_class.from(body: { foo: 'bar' }) }
+
+    context 'when response is not finished yet' do
+      it 'returns the request body' do
+        expect(env.body).to eq(foo: 'bar')
+      end
+    end
+
+    context 'when response is finished' do
+      before do
+        env.status = 200
+        env.body = { bar: 'foo' }
+        env.response = Faraday::Response.new(env)
+      end
+
+      it 'returns the response body' do
+        expect(env.body).to eq(bar: 'foo')
+      end
+
+      it 'allows to access request_body' do
+        expect(env.request_body).to eq(foo: 'bar')
+      end
+
+      it 'allows to access response_body' do
+        expect(env.response_body).to eq(bar: 'foo')
+      end
+    end
+  end
+end

data/spec/faraday/options/options_spec.rb

@@ -0,0 +1,297 @@
+# frozen_string_literal: true
+
+RSpec.describe Faraday::Options do
+  SubOptions = Class.new(Faraday::Options.new(:sub_a, :sub_b))
+  class ParentOptions < Faraday::Options.new(:a, :b, :c)
+    options c: SubOptions
+  end
+
+  describe '#merge' do
+    it 'merges options with hashes' do
+      options = ParentOptions.new(1)
+      expect(options.a).to eq(1)
+      expect(options.b).to be_nil
+
+      dup = options.merge a: 2, b: 3
+      expect(dup.a).to eq(2)
+      expect(dup.b).to eq(3)
+      expect(options.a).to eq(1)
+      expect(options.b).to be_nil
+    end
+
+    it 'deeply merges two options' do
+      sub_opts1 = SubOptions.from(sub_a: 3)
+      sub_opts2 = SubOptions.from(sub_b: 4)
+      opt1      = ParentOptions.from(a: 1, c: sub_opts1)
+      opt2      = ParentOptions.from(b: 2, c: sub_opts2)
+
+      merged = opt1.merge(opt2)
+
+      expected_sub_opts = SubOptions.from(sub_a: 3, sub_b: 4)
+      expected          = ParentOptions.from(a: 1, b: 2, c: expected_sub_opts)
+      expect(merged).to eq(expected)
+    end
+
+    it 'deeply merges options with hashes' do
+      sub_opts1 = SubOptions.from(sub_a: 3)
+      sub_opts2 = { sub_b: 4 }
+      opt1      = ParentOptions.from(a: 1, c: sub_opts1)
+      opt2      = { b: 2, c: sub_opts2 }
+
+      merged = opt1.merge(opt2)
+
+      expected_sub_opts = SubOptions.from(sub_a: 3, sub_b: 4)
+      expected          = ParentOptions.from(a: 1, b: 2, c: expected_sub_opts)
+      expect(merged).to eq(expected)
+    end
+
+    it 'deeply merges options with nil' do
+      sub_opts = SubOptions.new(3, 4)
+      options  = ParentOptions.new(1, 2, sub_opts)
+      expect(options.a).to eq(1)
+      expect(options.b).to eq(2)
+      expect(options.c.sub_a).to eq(3)
+      expect(options.c.sub_b).to eq(4)
+
+      options2 = ParentOptions.from(b: 5, c: nil)
+
+      merged = options.merge(options2)
+
+      expect(merged.b).to eq(5)
+      expect(merged.c).to eq(sub_opts)
+    end
+
+    it 'deeply merges options with options having nil sub-options' do
+      options = ParentOptions.from(a: 1)
+
+      sub_opts = SubOptions.new(3, 4)
+      options2 = ParentOptions.from(b: 2, c: sub_opts)
+
+      expect(options.a).to eq(1)
+      expect(options2.b).to eq(2)
+      expect(options2.c.sub_a).to eq(3)
+      expect(options2.c.sub_b).to eq(4)
+
+      merged = options.merge(options2)
+
+      expect(merged.c).to eq(sub_opts)
+    end
+
+    describe '#dup' do
+      it 'duplicate options but not sub-options' do
+        sub_opts = SubOptions.from(sub_a: 3)
+        opts     = ParentOptions.from(b: 1, c: sub_opts)
+
+        duped         = opts.dup
+        duped.b       = 2
+        duped.c.sub_a = 4
+
+        expect(opts.b).to eq(1)
+        expect(opts.c.sub_a).to eq(4)
+      end
+    end
+
+    describe '#deep_dup' do
+      it 'duplicate options and also suboptions' do
+        sub_opts = SubOptions.from(sub_a: 3)
+        opts     = ParentOptions.from(b: 1, c: sub_opts)
+
+        duped         = opts.deep_dup
+        duped.b       = 2
+        duped.c.sub_a = 4
+
+        expect(opts.b).to eq(1)
+        expect(opts.c.sub_a).to eq(3)
+      end
+    end
+
+    describe '#clear' do
+      it 'clears the options' do
+        options = SubOptions.new(1)
+        expect(options.empty?).not_to be_truthy
+        options.clear
+        expect(options.empty?).to be_truthy
+      end
+    end
+
+    describe '#empty?' do
+      it 'returns true only if all options are nil' do
+        options = SubOptions.new
+        expect(options.empty?).to be_truthy
+        options.sub_a = 1
+        expect(options.empty?).not_to be_truthy
+        options.delete(:sub_a)
+        expect(options.empty?).to be_truthy
+      end
+    end
+
+    describe '#each_key' do
+      it 'allows to iterate through keys' do
+        options = ParentOptions.new(1, 2, 3)
+        enum    = options.each_key
+        expect(enum.next.to_sym).to eq(:a)
+        expect(enum.next.to_sym).to eq(:b)
+        expect(enum.next.to_sym).to eq(:c)
+      end
+    end
+
+    describe '#key?' do
+      it 'returns true if the key exists and is not nil' do
+        options = SubOptions.new
+        expect(options.key?(:sub_a)).not_to be_truthy
+        options.sub_a = 1
+        expect(options.key?(:sub_a)).to be_truthy
+      end
+    end
+
+    describe '#each_value' do
+      it 'allows to iterate through values' do
+        options = ParentOptions.new(1, 2, 3)
+        enum    = options.each_value
+        expect(enum.next).to eq(1)
+        expect(enum.next).to eq(2)
+        expect(enum.next).to eq(3)
+      end
+    end
+
+    describe '#value?' do
+      it 'returns true if any key has that value' do
+        options = SubOptions.new
+        expect(options.value?(1)).not_to be_truthy
+        options.sub_a = 1
+        expect(options.value?(1)).to be_truthy
+      end
+    end
+
+    describe '#update' do
+      it 'updates options from hashes' do
+        options = ParentOptions.new(1)
+        expect(options.a).to eq(1)
+        expect(options.b).to be_nil
+
+        updated = options.update a: 2, b: 3
+        expect(options.a).to eq(2)
+        expect(options.b).to eq(3)
+        expect(updated).to eq(options)
+      end
+    end
+
+    describe '#delete' do
+      it 'allows to remove value for key' do
+        options = ParentOptions.new(1)
+        expect(options.a).to eq(1)
+        expect(options.delete(:a)).to eq(1)
+        expect(options.a).to be_nil
+      end
+    end
+
+    describe '#from' do
+      it { expect { ParentOptions.from invalid: 1 }.to raise_error(NoMethodError) }
+
+      it 'works with options' do
+        options = ParentOptions.new(1)
+
+        value = ParentOptions.from(options)
+        expect(value.a).to eq(1)
+        expect(value.b).to be_nil
+      end
+
+      it 'works with options with sub object' do
+        sub     = SubOptions.new(1)
+        options = ParentOptions.from a: 1, c: sub
+        expect(options).to be_a_kind_of(ParentOptions)
+        expect(options.a).to eq(1)
+        expect(options.b).to be_nil
+        expect(options.c).to be_a_kind_of(SubOptions)
+        expect(options.c.sub_a).to eq(1)
+      end
+
+      it 'works with hash' do
+        options = ParentOptions.from a: 1
+        expect(options).to be_a_kind_of(ParentOptions)
+        expect(options.a).to eq(1)
+        expect(options.b).to be_nil
+      end
+
+      it 'works with hash with sub object' do
+        options = ParentOptions.from a: 1, c: { sub_a: 1 }
+        expect(options).to be_a_kind_of(ParentOptions)
+        expect(options.a).to eq(1)
+        expect(options.b).to be_nil
+        expect(options.c).to be_a_kind_of(SubOptions)
+        expect(options.c.sub_a).to eq(1)
+      end
+
+      it 'works with deep hash' do
+        hash    = { b: 1 }
+        options = ParentOptions.from a: hash
+        expect(options.a[:b]).to eq(1)
+
+        hash[:b] = 2
+        expect(options.a[:b]).to eq(1)
+
+        options.a[:b] = 3
+        expect(hash[:b]).to eq(2)
+        expect(options.a[:b]).to eq(3)
+      end
+
+      it 'works with nil' do
+        options = ParentOptions.from(nil)
+        expect(options).to be_a_kind_of(ParentOptions)
+        expect(options.a).to be_nil
+        expect(options.b).to be_nil
+      end
+
+      it 'respects inheritance' do
+        subclass = Class.new(ParentOptions)
+        options  = subclass.from(c: { sub_a: 'hello' })
+        expect(options.c).to be_a_kind_of(SubOptions)
+        expect(options.c.sub_a).to eq('hello')
+      end
+    end
+
+    describe '#memoized' do
+      subject(:options_class) { Class.new(ParentOptions) }
+      it 'requires block' do
+        expect { options_class.memoized(:a) }.to raise_error(ArgumentError)
+      end
+
+      it 'accepts block' do
+        options_class.memoized(:a) { :foo }
+        expect(options_class.new.a).to eql(:foo)
+      end
+    end
+
+    describe '#fetch' do
+      subject { SubOptions.new }
+
+      context 'when the fetched key has no value' do
+        it 'uses falsey default' do
+          expect(subject.fetch(:sub_a, false) { |_| :blah }).to be_falsey
+        end
+
+        it 'accepts block' do
+          expect(subject.fetch(:sub_a) { |k| "yo #{k.inspect}" }).to eq('yo :sub_a')
+        end
+
+        it 'needs a default if key is missing' do
+          expect { subject.fetch(:sub_a) }.to raise_error(Faraday::Options.fetch_error_class)
+        end
+      end
+
+      context 'when the fetched key has a value' do
+        before do
+          subject.sub_a = 1
+        end
+
+        it 'grabs value' do
+          expect(subject.fetch(:sub_a, false) { |_| :blah }).to eq(1)
+        end
+
+        it 'works with key' do
+          expect(subject.fetch(:sub_a)).to eq(1)
+        end
+      end
+    end
+  end
+end

data/spec/faraday/options/proxy_options_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+RSpec.describe Faraday::ProxyOptions do
+  describe '#from' do
+    it 'works with string' do
+      options = Faraday::ProxyOptions.from 'http://user:pass@example.org'
+      expect(options.user).to eq('user')
+      expect(options.password).to eq('pass')
+      expect(options.uri).to be_a_kind_of(URI)
+      expect(options.path).to eq('')
+      expect(options.port).to eq(80)
+      expect(options.host).to eq('example.org')
+      expect(options.scheme).to eq('http')
+      expect(options.inspect).to match('#<Faraday::ProxyOptions uri=')
+    end
+
+    it 'defaults to http' do
+      options = Faraday::ProxyOptions.from 'example.org'
+      expect(options.port).to eq(80)
+      expect(options.host).to eq('example.org')
+      expect(options.scheme).to eq('http')
+    end
+
+    it 'works with nil' do
+      options = Faraday::ProxyOptions.from nil
+      expect(options).to be_a_kind_of(Faraday::ProxyOptions)
+      expect(options.inspect).to eq('#<Faraday::ProxyOptions (empty)>')
+    end
+
+    it 'works with no auth' do
+      proxy = Faraday::ProxyOptions.from 'http://example.org'
+      expect(proxy.user).to be_nil
+      expect(proxy.password).to be_nil
+    end
+  end
+
+  it 'allows hash access' do
+    proxy = Faraday::ProxyOptions.from 'http://a%40b:pw%20d@example.org'
+    expect(proxy.user).to eq('a@b')
+    expect(proxy[:user]).to eq('a@b')
+    expect(proxy.password).to eq('pw d')
+    expect(proxy[:password]).to eq('pw d')
+  end
+end

data/spec/faraday/options/request_options_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe Faraday::RequestOptions do
+  subject(:options) { Faraday::RequestOptions.new }
+
+  it 'allows to set the request proxy' do
+    expect(options.proxy).to be_nil
+
+    expect { options[:proxy] = { booya: 1 } }.to raise_error(NoMethodError)
+
+    options[:proxy] = { user: 'user' }
+    expect(options.proxy).to be_a_kind_of(Faraday::ProxyOptions)
+    expect(options.proxy.user).to eq('user')
+
+    options.proxy = nil
+    expect(options.proxy).to be_nil
+    expect(options.inspect).to eq('#<Faraday::RequestOptions (empty)>')
+  end
+end