httpi 2.4.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e6ca1f335780f0839e9e5316c9ecf1a6d3753bea
-  data.tar.gz: f5e52a1dde48d6c783c2bc66b691df4cb4e1f4cd
+SHA256:
+  metadata.gz: b488ad4ac7b6d32a313798d387be88d00976ffe2533a1413836bd7e102cfda83
+  data.tar.gz: f555c552fbdfa36b727c75e5bf2b3a9a19559098145ce3f969c94f250380b185
 SHA512:
-  metadata.gz: f7e7e5d0cf5c2a2f59ad4b8bf331c4917cfcef503c0e905b6613b08ad03a8a23e20727668b51a3e27762167905b5a3c1a526a9fb987cd1d528dd6429090ee98c
-  data.tar.gz: ffe4093b24fc493cda6c8b7e266a5abcdc97785759e59024a6f02ef984f15b9c6707e70dfbd76e7f29bd91ed5077af219bd5c593d99bc675f720024e467193c6
+  metadata.gz: fccd5e6e95668a6b49e440eee050a2e8f7e456434e6a973bd2cc8d54c97854c1961fc5e941456ff6e3a4356a03bb6b8a7aad023fd7b8d74f0d73a2e1a18fd682
+  data.tar.gz: 825d197e0ccb00ba983aba28a40cb6c0f1789bc6ae9cb3ba82363548330fd66609c5c4e904285038d67de6c95850f1ccaca3901f7698b7317657e754f1035f7d

data/.github/workflows/development.yml

@@ -0,0 +1,48 @@
+name: Development
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: ${{matrix.ruby}} on ${{matrix.os}}
+    runs-on: ${{matrix.os}}-latest
+    continue-on-error: ${{matrix.experimental}}
+    
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+        
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+        
+        experimental: [false]
+        env: [""]
+        
+        include:
+          - os: ubuntu
+            ruby: truffleruby
+            experimental: true
+          - os: ubuntu
+            ruby: jruby
+            experimental: true
+          - os: ubuntu
+            ruby: head
+            experimental: true
+    
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Install dependencies
+      run: sudo apt-get install libcurl4-openssl-dev
+    
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+    
+    - name: Run tests
+      timeout-minutes: 5
+      run: ${{matrix.env}} bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,48 @@
+### 3.0.0 (2021-10-19)
+
+* Improvement: [#225](https://github.com/savonrb/httpi/pull/225) Make rack and socksify dependencies optional.
+
+### 2.5.0 (2021-10-05)
+
+* Feature: [#214](https://github.com/savonrb/httpi/pull/214) Add SSL ciphers configuration
+* Improvement: [#227](https://github.com/savonrb/httpi/pull/227) Use GitHub Actions as CI. Require at least Ruby v2.3.
+
+### 2.4.5
+
+* Improvement: [#209](https://github.com/savonrb/httpi/pull/209) Drop Travis CI support for Ruby < 2.3.0 and jruby.
+* Feature: [#208](https://github.com/savonrb/httpi/pull/208) Add SSL min/max_version configuration for supporting adapters
+* Improvement: [#206](https://github.com/savonrb/httpi/pull/206) Support for net-http-persistent v3
+* Improvement: [#204](https://github.com/savonrb/httpi/pull/204) Avoid excon warning
+
+### 2.4.4
+
+* Improvement: [#197](https://github.com/savonrb/httpi/pull/197) Add support for new write timeout option to all adapters
+* Fix: [#196](https://github.com/savonrb/httpi/pull/196) Fix httpi adapters support for read/open timeout
+* Improvement: [Remove references to broken site](https://github.com/savonrb/httpi/commit/345e5e2b1a4376a7be769f67088a431895de09ad)
+* Fix: [#190](https://github.com/savonrb/httpi/pull/190) Don't convert port to string on Excon adapter
+
+### 2.4.3
+
+* Fix: [#171](https://github.com/savonrb/httpi/pull/171) bug with rubyntlm v0.6.0
+* Fix: [#181](https://github.com/savonrb/httpi/pull/181) excon and http adapters
+* Feature: [#183](https://github.com/savonrb/httpi/pull/183) Logging ssl information of a request
+* Fix: [#187](https://github.com/savonrb/httpi/pull/187) only require ntlm if ntlm auth was requested
+
+
+### 2.4.2
+
+* Feature: [#165](https://github.com/savonrb/httpi/pull/165) Extended net_http adapter ssl options with cert_store and ca_path
+* Improvement: [#166](https://github.com/savonrb/httpi/pull/166) fix some warnings
+* Feature: [#167](https://github.com/savonrb/httpi/pull/167) adds missing support for cert password
+* Feature: [#163](https://github.com/savonrb/httpi/pull/163) Support HTTP Basic auth in Rack adapter
+* Fix: [#162](https://github.com/savonrb/httpi/pull/162) fixing excon adapter to pass client_cert and key as strings instead of objects
+* Fix: [#160](https://github.com/savonrb/httpi/pull/160) httpclient adapter now accepts NTLM auth
+* Improvement: [#158](https://github.com/savonrb/httpi/pull/158) Limit the maximum of redirects to prevent infinite redirects
+* Improvement: [#153](https://github.com/savonrb/httpi/pull/153) Dynamically determine methods Net::HTTP supports
+* Improvement: [#155](https://github.com/savonrb/httpi/pull/155) Enable socks proxy server specification
+* Improvement: [#151](https://github.com/savonrb/httpi/pull/151) Fix excon verify mode
+* Fix: [#149](https://github.com/savonrb/httpi/pull/149) Ensure that header exists before accessing it
+
 ### 2.4.1
 
 * Fix: [#147](https://github.com/savonrb/httpi/pull/147) Fix call Curb client "SSL peer certificate or SSH remote key was not OK" bug

data/Gemfile

@@ -3,15 +3,20 @@ gemspec
 
 gem 'jruby-openssl',                                       :platforms => :jruby
 
+gem 'public_suffix', '~> 4.0'
+
 # http clients
 gem 'httpclient',          '~> 2.3',    :require => false
-gem 'curb',                '~> 0.8',    :require => false, :platforms => :ruby
-gem 'em-http-request',                  :require => false, :platforms => [:ruby, :jruby]
+gem 'curb',                '~> 0.8',    :require => false, :platforms => [:ruby]
+gem 'em-http-request',                  :require => false, :platforms => [:ruby]
 gem 'em-synchrony',                     :require => false, :platforms => [:ruby, :jruby]
-gem 'excon',               '~> 0.21.0', :require => false, :platforms => [:ruby, :jruby]
-gem 'net-http-persistent', '~> 2.8',    :require => false
+gem 'excon',               '~> 0.21',   :require => false, :platforms => [:ruby, :jruby]
+gem 'net-http-persistent', '~> 4.0',    :require => false
 gem 'http',                             :require => false
 
+# adapter extensions
+gem 'rack'
+gem 'socksify'
+
 # coverage
 gem 'simplecov',                        :require => false
-gem 'coveralls',                        :require => false

data/README.md

@@ -2,33 +2,23 @@
 
 A common interface for Ruby's HTTP libraries.
 
-[Documentation](http://httpirb.com) | [RDoc](http://rubydoc.info/gems/httpi) |
+[Documentation](https://www.rubydoc.info/gems/httpi) |
 [Mailing list](https://groups.google.com/forum/#!forum/httpirb)
 
-[![Build Status](https://secure.travis-ci.org/savonrb/httpi.png?branch=master)](http://travis-ci.org/savonrb/httpi)
-[![Gem Version](https://badge.fury.io/rb/httpi.png)](http://badge.fury.io/rb/httpi)
-[![Code Climate](https://codeclimate.com/github/savonrb/httpi.png)](https://codeclimate.com/github/savonrb/httpi)
-[![Coverage Status](https://coveralls.io/repos/savonrb/httpi/badge.png?branch=master)](https://coveralls.io/r/savonrb/httpi)
-
+[![Development](https://github.com/savonrb/httpi/actions/workflows/development.yml/badge.svg)](https://github.com/savonrb/httpi/actions/workflows/development.yml)
 
 ## Installation
 
-HTTPI is available through [Rubygems](http://rubygems.org/gems/httpi) and can be installed via:
+HTTPI is available through [Rubygems](https://rubygems.org/gems/httpi) and can be installed via:
 
-```
-$ gem install httpi
-```
+    $ gem install httpi
 
 or add it to your Gemfile like this:
 
-```
-gem 'httpi', '~> 2.1.0'
-```
-
+    gem 'httpi', '~> 3.0.0'
 
 ## Usage example
 
-
 ``` ruby
 require "httpi"
 
@@ -49,7 +39,21 @@ HTTPI.adapter = :httpclient
 HTTPI.request(:custom, request)
 ```
 
+### Rack Mock Adapter
+
+To use the Rack mock adapter, please add the `rack` gem to your gemfile.
+
+### SOCKS Proxy Support
+
+To use the the SOCKS proxy support, please add the `socksify` gem to your gemfile, and add the following code:
+
+``` ruby
+require 'socksify'
+require 'socksify/http'
+```
+
+to your project.
 
 ## Documentation
 
-Continue reading at [httpirb.com](http://httpirb.com)
+Continue reading at https://www.rubydoc.info/gems/httpi

data/Rakefile

@@ -10,7 +10,9 @@ RSpec::Core::RakeTask.new "spec_integration" do |t|
   t.pattern = "spec/integration/*_spec.rb"
 end
 
-task :default => :spec
-
 desc "Run RSpec code and integration examples"
-task :ci => [:spec, :spec_integration]
+RSpec::Core::RakeTask.new "ci" do |t|
+  t.pattern = "spec/{httpi,integration}/**/*_spec.rb"
+end
+
+task :default => :spec

data/UPDATING.md

@@ -0,0 +1,7 @@
+# Update guide
+
+## From 2.x to 3.x
+
+BREAKING CHANGE: the [#255](https://github.com/savonrb/httpi/pull/225) made the gem socksify and rack gems optional dependencies.
+
+In order to restore the old behavior, see the README section "SOCKS Proxy Support" and "Rack Mock Adapter".

data/httpi.gemspec

@@ -11,18 +11,17 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/savonrb/#{s.name}"
   s.summary     = "Common interface for Ruby's HTTP libraries"
   s.description = s.summary
-  s.required_ruby_version = '>= 1.9.2'
 
-  s.rubyforge_project = s.name
-  s.license = 'MIT'
+  s.required_ruby_version = '>= 2.3'
 
-  s.add_dependency 'rack'
+  s.license = 'MIT'
 
   s.add_development_dependency 'rubyntlm', '~> 0.3.2'
-  s.add_development_dependency 'rake',     '~> 10.0'
-  s.add_development_dependency 'rspec',    '~> 2.14'
+  s.add_development_dependency 'rake',     '~> 13.0'
+  s.add_development_dependency 'rspec',    '~> 3.5'
   s.add_development_dependency 'mocha',    '~> 0.13'
-  s.add_development_dependency 'puma',     '~> 2.3.2'
+  s.add_development_dependency 'puma',     '~> 5.0'
+  s.add_development_dependency 'webmock'
 
   s.files = `git ls-files`.split("\n")
   s.require_path = 'lib'

data/lib/httpi/adapter/curb.rb

@@ -72,8 +72,9 @@ module HTTPI
       def basic_setup
         @client.url = @request.url.to_s
         @client.proxy_url = @request.proxy.to_s if @request.proxy
-        @client.timeout = @request.read_timeout if @request.read_timeout
-        @client.connect_timeout = @request.open_timeout if @request.open_timeout
+        read_or_write_timeout = @request.read_timeout || @request.write_timeout
+        @client.timeout_ms = read_or_write_timeout * 1000 if read_or_write_timeout
+        @client.connect_timeout_ms = @request.open_timeout * 1000 if @request.open_timeout
         @client.headers = @request.headers.to_hash
         @client.verbose = false
         # cURL workaround
@@ -114,6 +115,8 @@ module HTTPI
           # Send client-side certificate regardless of state of SSL verify mode
           @client.cert_key = ssl.cert_key_file
           @client.cert = ssl.cert_file
+          @client.certpassword = ssl.cert_key_password
+          @client.set(:ssl_cipher_list, ssl.ciphers.join(':')) if ssl.ciphers
 
           @client.ssl_verify_peer = ssl.verify_mode == :peer
         end
@@ -126,6 +129,9 @@ module HTTPI
           when :SSLv23  then 2
           when :SSLv3   then 3
         end
+        if ssl.min_version || ssl.max_version
+          raise NotSupportedError, 'Curb adapter does not support #min_version or #max_version. Please, use #ssl_version instead.'
+        end
       end
 
       def respond_with(client)

data/lib/httpi/adapter/em_http.rb

@@ -69,10 +69,11 @@ module HTTPI
       end
 
       def connection_options
-        options = {
-          :connect_timeout    => @request.open_timeout,
-          :inactivity_timeout => @request.read_timeout
-        }
+        options = {}
+
+        read_or_write_timeout = @request.read_timeout || @request.write_timeout
+        options[:inactivity_timeout] = read_or_write_timeout if read_or_write_timeout
+        options[:connect_timeout] = @request.open_timeout if @request.open_timeout
 
         options[:proxy] = proxy_options if @request.proxy
 

data/lib/httpi/adapter/excon.rb

@@ -41,8 +41,9 @@ module HTTPI
 
         opts = {
           :host => url.host,
+          :hostname => url.hostname,
           :path => url.path,
-          :port => url.port.to_s,
+          :port => url.port,
           :query => url.query,
           :scheme => url.scheme,
           :headers => @request.headers,
@@ -58,23 +59,34 @@ module HTTPI
         opts[:user], opts[:password] = *@request.auth.credentials if @request.auth.basic?
         opts[:connect_timeout] = @request.open_timeout if @request.open_timeout
         opts[:read_timeout]    = @request.read_timeout if @request.read_timeout
+        opts[:write_timeout]   = @request.write_timeout if @request.write_timeout
         opts[:response_block]  = @request.on_body if @request.on_body
         opts[:proxy]           = @request.proxy if @request.proxy
 
-        if ssl.verify_mode == :peer
+        case ssl.verify_mode
+        when :peer
           opts[:ssl_verify_peer] = true
           opts[:ssl_ca_file] = ssl.ca_cert_file if ssl.ca_cert_file
-          opts[:client_cert] = ssl.cert     if ssl.cert
-          opts[:client_key]  = ssl.cert_key if ssl.cert_key
+          opts[:certificate] = ssl.cert.to_pem     if ssl.cert
+          opts[:private_key] = ssl.cert_key.to_pem if ssl.cert_key
+        when :none
+          opts[:ssl_verify_peer] = false
         end
 
+        opts[:ciphers] = ssl.ciphers if ssl.ciphers
         opts[:ssl_version] = ssl.ssl_version if ssl.ssl_version
+        opts[:ssl_min_version] = ssl.min_version if ssl.min_version
+        opts[:ssl_max_version] = ssl.max_version if ssl.max_version
 
         opts
       end
 
       def respond_with(response)
-        Response.new response.status, response.headers, response.body
+        headers = response.headers.dup
+        if (cookies = response.data[:cookies]) && !cookies.empty?
+          headers["Set-Cookie"] = cookies
+        end
+        Response.new response.status, headers, response.body
       end
 
     end

data/lib/httpi/adapter/http.rb

@@ -32,9 +32,13 @@ module HTTPI
         unless ::HTTP::Request::METHODS.include? method
           raise NotSupportedError, "http.rb does not support custom HTTP methods"
         end
-        response = @client.send(method, @request.url, :body => @request.body)
+        response = begin
+          @client.send(method, @request.url, :body => @request.body)
+        rescue OpenSSL::SSL::SSLError
+          raise SSLError
+        end
 
-        Response.new(response.code, response.headers, response.body.to_s)
+        Response.new(response.code, response.headers.to_h, response.body.to_s)
       end
 
       private
@@ -54,7 +58,10 @@ module HTTPI
           context.cert        = @request.auth.ssl.cert
           context.key         = @request.auth.ssl.cert_key
           context.ssl_version = @request.auth.ssl.ssl_version if @request.auth.ssl.ssl_version != nil
+          context.min_version = @request.auth.ssl.min_version if @request.auth.ssl.min_version != nil
+          context.max_version = @request.auth.ssl.max_version if @request.auth.ssl.max_version != nil
           context.verify_mode = @request.auth.ssl.openssl_verify_mode
+          context.ciphers     = @request.auth.ssl.ciphers if @request.auth.ssl.ciphers
 
           client = ::HTTP::Client.new(:ssl_context => context)
         else
@@ -69,6 +76,12 @@ module HTTPI
           client = client.via(@request.proxy.host, @request.proxy.port, @request.proxy.user, @request.proxy.password)
         end
 
+        timeouts = {}
+        timeouts[:connect] = @request.open_timeout if @request.open_timeout
+        timeouts[:read] = @request.read_timeout if @request.read_timeout
+        timeouts[:write] = @request.write_timeout if @request.write_timeout
+        client = client.timeout(timeouts) if timeouts.any?
+
         client.headers(@request.headers)
       end
     end

data/lib/httpi/adapter/httpclient.rb

@@ -36,11 +36,8 @@ module HTTPI
       def setup_client
         basic_setup
 
-        if @request.auth.ntlm?
-          raise NotSupportedError, "HTTPClient adapter does not support NTLM authentication"
-        end
-
         setup_auth if @request.auth.http?
+        setup_ntlm_auth if @request.auth.ntlm?
         setup_ssl_auth if @request.auth.ssl? || @request.ssl?
       end
 
@@ -48,12 +45,23 @@ module HTTPI
         @client.proxy = @request.proxy if @request.proxy
         @client.connect_timeout = @request.open_timeout if @request.open_timeout
         @client.receive_timeout = @request.read_timeout if @request.read_timeout
+        @client.send_timeout = @request.write_timeout if @request.write_timeout
       end
 
       def setup_auth
         @client.set_auth @request.url, *@request.auth.credentials
       end
 
+      def setup_ntlm_auth
+        username, password, domain = @request.auth.credentials
+
+        unless domain.nil?
+          username = "#{domain.upcase}\\#{username}"
+        end
+
+        @client.set_auth @request.url, username, password
+      end
+
       def setup_ssl_auth
         ssl = @request.auth.ssl
 
@@ -65,11 +73,15 @@ module HTTPI
           # Send client-side certificate regardless of state of SSL verify mode
           @client.ssl_config.client_cert = ssl.cert
           @client.ssl_config.client_key = ssl.cert_key
+          @client.ssl_config.ciphers = ssl.ciphers if ssl.ciphers
 
           @client.ssl_config.verify_mode = ssl.openssl_verify_mode
         end
 
         @client.ssl_config.ssl_version = ssl.ssl_version.to_s if ssl.ssl_version
+        if ssl.min_version || ssl.max_version
+          raise NotSupportedError, 'Httpclient adapter does not support #min_version or #max_version. Please, use #ssl_version instead'
+        end
       end
 
       def respond_with(response)

data/lib/httpi/adapter/net_http.rb

@@ -16,8 +16,7 @@ module HTTPI
 
       register :net_http, :deps => %w(net/https)
       def initialize(request)
-        check_net_ntlm_version!
-
+        check_net_ntlm_version! if request.auth.ntlm?
         @request = request
         @client = create_client
       end
@@ -27,8 +26,12 @@ module HTTPI
       # Executes arbitrary HTTP requests.
       # @see HTTPI.request
       def request(method)
-        unless REQUEST_METHODS.include? method
-          raise NotSupportedError, "Net::HTTP does not support custom HTTP methods"
+        # Determine if Net::HTTP supports the method using reflection
+        unless Net::HTTP.const_defined?(:"#{method.to_s.capitalize}") &&
+            Net::HTTP.const_get(:"#{method.to_s.capitalize}").class == Class
+
+          raise NotSupportedError, "Net::HTTP does not support "\
+            "#{method.to_s.upcase}"
         end
         do_request(method) do |http, http_request|
           http_request.body = @request.body
@@ -50,11 +53,15 @@ module HTTPI
       end
 
       private
+      def ntlm_version
+        Net::NTLM::VERSION::STRING
+      end
+
       def check_net_ntlm_version!
         begin
           require 'net/ntlm'
-          require 'net/ntlm/version' unless Net::NTLM.const_defined?(:VERSION)
-          unless Net::NTLM::VERSION::STRING >= '0.3.2'
+          require 'net/ntlm/version' unless Net::NTLM.const_defined?(:VERSION, false)
+          unless ntlm_version >= '0.3.2'
             raise ArgumentError, 'Invalid version of rubyntlm. Please use v0.3.2+.'
           end
         rescue LoadError
@@ -67,7 +74,11 @@ module HTTPI
 
       def create_client
         proxy_url = @request.proxy || URI("")
-        proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_url.user, proxy_url.password)
+        if URI(proxy_url).scheme == 'socks'
+          proxy =Net::HTTP.SOCKSProxy(proxy_url.host, proxy_url.port)
+        else
+          proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_url.user, proxy_url.password)
+        end
         proxy.new(@request.url.host, @request.url.port)
       end
 
@@ -92,9 +103,9 @@ module HTTPI
 
         # first figure out if we should use NTLM or Negotiate
         nego_auth_response = respond_with(requester.call(http, request_client(:head)))
-        if nego_auth_response.headers['www-authenticate'].include? 'Negotiate'
+        if nego_auth_response.headers['www-authenticate'] && nego_auth_response.headers['www-authenticate'].include?('Negotiate')
           auth_method = 'Negotiate'
-        elsif nego_auth_response.headers['www-authenticate'].include? 'NTLM'
+        elsif nego_auth_response.headers['www-authenticate'] && nego_auth_response.headers['www-authenticate'].include?('NTLM')
           auth_method = 'NTLM'
         else
           auth_method = 'NTLM'
@@ -142,6 +153,13 @@ module HTTPI
         @client.use_ssl = @request.ssl?
         @client.open_timeout = @request.open_timeout if @request.open_timeout
         @client.read_timeout = @request.read_timeout if @request.read_timeout
+        if @request.write_timeout
+          if @client.respond_to?(:write_timeout=) # Expected to appear in Ruby 2.6
+            @client.write_timeout = @request.write_timeout
+          else
+            raise NotSupportedError, "Net::HTTP supports write_timeout starting from Ruby 2.6"
+          end
+        end
       end
 
       def setup_ssl_auth
@@ -150,26 +168,34 @@ module HTTPI
         if @request.auth.ssl?
           unless ssl.verify_mode == :none
             @client.ca_file = ssl.ca_cert_file if ssl.ca_cert_file
+            @client.ca_path = ssl.ca_cert_path if ssl.ca_cert_path
+            @client.cert_store = ssl_cert_store(ssl)
           end
 
           # Send client-side certificate regardless of state of SSL verify mode
           @client.key = ssl.cert_key
           @client.cert = ssl.cert
+          @client.ciphers = ssl.ciphers if ssl.ciphers
 
           @client.verify_mode = ssl.openssl_verify_mode
         end
 
         @client.ssl_version = ssl.ssl_version if ssl.ssl_version
+        @client.min_version = ssl.min_version if ssl.min_version
+        @client.max_version = ssl.max_version if ssl.max_version
+      end
+
+      def ssl_cert_store(ssl)
+        return ssl.cert_store if ssl.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 request_client(type)
-        request_class = case type
-          when :get    then Net::HTTP::Get
-          when :post   then Net::HTTP::Post
-          when :head   then Net::HTTP::Head
-          when :put    then Net::HTTP::Put
-          when :delete then Net::HTTP::Delete
-        end
+        request_class = Net::HTTP.const_get(:"#{type.to_s.capitalize}")
 
         request_client = request_class.new @request.url.request_uri, @request.headers
         request_client.basic_auth(*@request.auth.credentials) if @request.auth.basic?

data/lib/httpi/adapter/net_http_persistent.rb

@@ -12,7 +12,11 @@ module HTTPI
       private
 
       def create_client
-        Net::HTTP::Persistent.new thread_key
+        if Gem::Version.new(Net::HTTP::Persistent::VERSION) >= Gem::Version.new('3.0.0')
+          Net::HTTP::Persistent.new name: thread_key
+        else
+          Net::HTTP::Persistent.new thread_key
+        end
       end
 
       def perform(http, http_request, &on_body)
@@ -32,12 +36,12 @@ module HTTPI
 
         @client.open_timeout = @request.open_timeout if @request.open_timeout
         @client.read_timeout = @request.read_timeout if @request.read_timeout
+        raise NotSupportedError, "Net::HTTP::Persistent does not support write_timeout" if @request.write_timeout
       end
 
       def thread_key
         @request.url.host.split(/\W/).reject{|p|p == ""}.join('-')
       end
-
     end
   end
 end

data/lib/httpi/adapter/rack.rb

@@ -1,3 +1,4 @@
+require 'base64'
 require 'httpi/adapter/base'
 require 'httpi/response'
 
@@ -61,17 +62,18 @@ module HTTPI
           raise NotSupportedError, "Rack adapter does not support custom HTTP methods"
         end
 
-        env = {}
-        @request.headers.each do |header, value|
-          env["HTTP_#{header.gsub('-', '_').upcase}"] = value
-        end
-
         if @request.proxy
           raise NotSupportedError, "Rack adapter does not support proxying"
         end
 
         if @request.auth.http?
-          raise NotSupportedError, "Rack adapter does not support HTTP auth"
+          if @request.auth.basic?
+            basic_auth = @request.auth.basic.join(':')
+            encoded = Base64.encode64(basic_auth).gsub('\n', '')
+            @request.headers['Authorization'] = "Basic #{encoded}"
+          else
+            raise NotSupportedError, "Rack adapter does not support HTTP #{@request.auth.type} auth"
+          end
         end
 
         if @request.auth.ssl?
@@ -82,6 +84,11 @@ module HTTPI
           raise NotSupportedError, "Rack adapter does not support response streaming"
         end
 
+        env = {}
+        @request.headers.each do |header, value|
+          env["HTTP_#{header.gsub('-', '_').upcase}"] = value
+        end
+
         response = @client.request(method.to_s.upcase, @request.url.to_s,
               { :fatal => true, :input => @request.body.to_s }.merge(env))