diff --git a/.travis.yml b/.travis.yml index b63f07e6f..24658c907 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,9 @@ env: global: - JRUBY_OPTS="$JRUBY_OPTS --debug" +before_install: + - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true + - gem install bundler -v '< 2' matrix: allow_failures: - rvm: jruby-head diff --git a/lib/twitter/rest/request.rb b/lib/twitter/rest/request.rb index 423b1d403..c5b2d1fd1 100644 --- a/lib/twitter/rest/request.rb +++ b/lib/twitter/rest/request.rb @@ -118,7 +118,7 @@ def symbolize_keys!(object) # @return [HTTP::Client, HTTP] def http_client client = @client.proxy ? HTTP.via(*proxy) : HTTP - client = client.timeout(:per_operation, connect: @client.timeouts[:connect], read: @client.timeouts[:read], write: @client.timeouts[:write]) if @client.timeouts + client = client.timeout(connect: @client.timeouts[:connect], read: @client.timeouts[:read], write: @client.timeouts[:write]) if @client.timeouts client end diff --git a/spec/twitter/rest/request_spec.rb b/spec/twitter/rest/request_spec.rb index d13dfec7b..31a0103e9 100644 --- a/spec/twitter/rest/request_spec.rb +++ b/spec/twitter/rest/request_spec.rb @@ -41,7 +41,7 @@ end it 'requests with given timeout settings' do stub_post('/1.1/statuses/update.json').with(body: {status: 'Update'}).to_return(body: fixture('status.json'), headers: {content_type: 'application/json; charset=utf-8'}) - expect_any_instance_of(HTTP::Client).to receive(:timeout).with(:per_operation, connect: 2, read: 2, write: 3).and_call_original + expect_any_instance_of(HTTP::Client).to receive(:timeout).with(connect: 2, read: 2, write: 3).and_call_original @client.update('Update') end end @@ -53,7 +53,7 @@ end it 'requests with given timeout settings' do stub_post('/1.1/statuses/update.json').with(body: {status: 'Update'}).to_return(body: fixture('status.json'), headers: {content_type: 'application/json; charset=utf-8'}) - expect(HTTP).to receive(:timeout).with(:per_operation, connect: 2, read: 2, write: 3).and_call_original + expect(HTTP).to receive(:timeout).with(connect: 2, read: 2, write: 3).and_call_original @client.update('Update') end end diff --git a/twitter.gemspec b/twitter.gemspec index 07362fe16..0a1647776 100644 --- a/twitter.gemspec +++ b/twitter.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'addressable', '~> 2.3' spec.add_dependency 'buftok', '~> 0.2.0' spec.add_dependency 'equalizer', '~> 0.0.11' - spec.add_dependency 'http', '~> 3.0' + spec.add_dependency 'http', '~> 4.0' spec.add_dependency 'http-form_data', '~> 2.0' spec.add_dependency 'http_parser.rb', '~> 0.6.0' spec.add_dependency 'memoizable', '~> 0.4.0'