httpi 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ca1f335780f0839e9e5316c9ecf1a6d3753bea
-  data.tar.gz: f5e52a1dde48d6c783c2bc66b691df4cb4e1f4cd
+  metadata.gz: b00e0eb6313b47ac5eb3be9f3330bac10a9321b7
+  data.tar.gz: b49e8aaba759e1384bae07bf825b17f511c809ec
 SHA512:
-  metadata.gz: f7e7e5d0cf5c2a2f59ad4b8bf331c4917cfcef503c0e905b6613b08ad03a8a23e20727668b51a3e27762167905b5a3c1a526a9fb987cd1d528dd6429090ee98c
-  data.tar.gz: ffe4093b24fc493cda6c8b7e266a5abcdc97785759e59024a6f02ef984f15b9c6707e70dfbd76e7f29bd91ed5077af219bd5c593d99bc675f720024e467193c6
+  metadata.gz: b3a31c1b2ac5ebbb82336104e64130f3f214462838175c7d966677c5e1cb03b77273d80b0282e9a1a032ea38b963215974a29777223c0da287d7755418b1b05a
+  data.tar.gz: 1c9baad44d8900f1bad06e9c991079300541476dded64e9bd44468a77552fc8d1143c6abe1d6e1ef42c11adf6427ed1d4241f02f9538fccb820e83b985bafc1a

data/.travis.yml

@@ -1,8 +1,9 @@
 language: "ruby"
 script: "bundle exec rake ci"
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby-19mode
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - jruby

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 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

@@ -8,7 +8,7 @@ gem 'httpclient',          '~> 2.3',    :require => false
 gem 'curb',                '~> 0.8',    :require => false, :platforms => :ruby
 gem 'em-http-request',                  :require => false, :platforms => [:ruby, :jruby]
 gem 'em-synchrony',                     :require => false, :platforms => [:ruby, :jruby]
-gem 'excon',               '~> 0.21.0', :require => false, :platforms => [:ruby, :jruby]
+gem 'excon',               '~> 0.21',   :require => false, :platforms => [:ruby, :jruby]
 gem 'net-http-persistent', '~> 2.8',    :require => false
 gem 'http',                             :require => false
 

data/httpi.gemspec

@@ -17,12 +17,14 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.add_dependency 'rack'
+  s.add_dependency 'socksify'
 
   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 'mocha',    '~> 0.13'
   s.add_development_dependency 'puma',     '~> 2.3.2'
+  s.add_development_dependency 'webmock'
 
   s.files = `git ls-files`.split("\n")
   s.require_path = 'lib'

data/lib/httpi.rb

@@ -103,7 +103,7 @@ module HTTPI
   class << self
 
     def query_builder
-      @query_builder || HTTPI::QueryBuilder::Flat
+      @query_builder ||= HTTPI::QueryBuilder::Flat
     end
 
     def query_builder=(builder)
@@ -152,7 +152,7 @@ module HTTPI
     end
 
     # Executes an HTTP request for the given +method+.
-    def request(method, request, adapter = nil)
+    def request(method, request, adapter = nil, redirects = 0)
       adapter_class = load_adapter(adapter, request)
 
       yield adapter_class.client if block_given?
@@ -160,10 +160,10 @@ module HTTPI
 
       response = adapter_class.request(method)
 
-      if response &&  HTTPI::Response::RedirectResponseCodes.member?(response.code) && request.follow_redirect?
+      if response && HTTPI::Response::RedirectResponseCodes.member?(response.code) && request.follow_redirect? && redirects < request.redirect_limit
         request.url = URI.join(request.url, response.headers['location'])
         log("Following redirect: '#{request.url}'.")
-        return request(method, request, adapter)
+        return request(method, request, adapter, redirects + 1)
       end
 
       response

data/lib/httpi/adapter/curb.rb

@@ -114,6 +114,7 @@ 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.ssl_verify_peer = ssl.verify_mode == :peer
         end

data/lib/httpi/adapter/excon.rb

@@ -61,11 +61,14 @@ module HTTPI
         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[:ssl_version] = ssl.ssl_version if ssl.ssl_version

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
 
@@ -54,6 +51,16 @@ module HTTPI
         @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
 

data/lib/httpi/adapter/net_http.rb

@@ -4,6 +4,8 @@ require "httpi/adapter/base"
 require "httpi/response"
 require 'kconv'
 require 'socket'
+require "socksify"
+require 'socksify/http'
 
 module HTTPI
   module Adapter
@@ -17,7 +19,6 @@ module HTTPI
       register :net_http, :deps => %w(net/https)
       def initialize(request)
         check_net_ntlm_version!
-
         @request = request
         @client = create_client
       end
@@ -27,8 +28,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
@@ -67,7 +72,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 +101,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'
@@ -150,6 +159,8 @@ 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
@@ -162,14 +173,17 @@ module HTTPI
         @client.ssl_version = ssl.ssl_version if ssl.ssl_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/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))
 

data/lib/httpi/auth/ssl.rb

@@ -10,7 +10,7 @@ module HTTPI
 
       VERIFY_MODES = [:none, :peer, :fail_if_no_peer_cert, :client_once]
       CERT_TYPES = [:pem, :der]
-      SSL_VERSIONS = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match /server|client/ }.sort.reverse
+      SSL_VERSIONS = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }.sort.reverse
 
       # Returns whether SSL configuration is present.
       def present?
@@ -31,6 +31,12 @@ module HTTPI
       # Accessor for the cacert file to validate SSL certificates.
       attr_accessor :ca_cert_file
 
+      # Accessor for the ca_path to validate SSL certificates.
+      attr_accessor :ca_cert_path
+
+      # ertificate store holds trusted CA certificates used to verify peer certificates.
+      attr_accessor :cert_store
+
       # Returns the cert type to validate SSL certificates PEM|DER.
       def cert_type
         @cert_type ||= :pem
@@ -63,7 +69,7 @@ module HTTPI
 
       # Returns the SSL version number. Defaults to <tt>nil</tt> (auto-negotiate).
       def ssl_version
-        @ssl_version
+        @ssl_version ||= nil
       end
 
       # Sets the SSL version number. Expects one of <tt>HTTPI::Auth::SSL::SSL_VERSIONS</tt>.

data/lib/httpi/request.rb

@@ -11,7 +11,7 @@ module HTTPI
   class Request
 
     # Available attribute writers.
-    ATTRIBUTES = [:url, :proxy, :headers, :body, :open_timeout, :read_timeout, :follow_redirect, :query]
+    ATTRIBUTES = [:url, :proxy, :headers, :body, :open_timeout, :read_timeout, :follow_redirect, :redirect_limit, :query]
 
     # Accepts a Hash of +args+ to mass assign attributes and authentication credentials.
     def initialize(args = {})
@@ -56,8 +56,7 @@ module HTTPI
 
     # Returns whether to use SSL.
     def ssl?
-      return @ssl unless @ssl.nil?
-      !!(url.to_s =~ /^https/)
+      @ssl ||= !!(url.to_s =~ /^https/)
     end
 
     # Sets whether to use SSL.
@@ -102,6 +101,7 @@ module HTTPI
     # Sets the block to be called while processing the response. The block
     # accepts a single parameter - the chunked response body.
     def on_body(&block)
+      @on_body ||= nil
       if block_given? then
         @on_body = block
       end
@@ -130,6 +130,13 @@ module HTTPI
       @follow_redirect ||= false
     end
 
+    attr_writer :redirect_limit
+
+    # Returns how many redirects should be followed - defaults to 3 if not set.
+    def redirect_limit
+      @redirect_limit ||= 3
+    end
+
     private
 
     # Stores the cookies from past requests.
@@ -139,7 +146,7 @@ module HTTPI
 
     # Expects a +url+, validates its validity and returns a +URI+ object.
     def normalize_url!(url)
-      raise ArgumentError, "Invalid URL: #{url}" unless url.to_s =~ /^http/
+      raise ArgumentError, "Invalid URL: #{url}" unless url.to_s =~ /^http|socks/
       url.kind_of?(URI) ? url : URI(url)
     end
 

data/lib/httpi/response.rb

@@ -44,12 +44,14 @@ module HTTPI
 
     # Returns any DIME attachments.
     def attachments
+      @body ||= nil
       decode_body unless @body
       @attachments ||= []
     end
 
     # Returns the HTTP response body.
     def body
+      @body ||= nil
       decode_body unless @body
       @body
     end

data/lib/httpi/version.rb

@@ -1,3 +1,3 @@
 module HTTPI
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -20,7 +20,7 @@ unless RUBY_PLATFORM =~ /java/
     it "supports ntlm authentication" do
       request = HTTPI::Request.new(@server.url + "ntlm-auth")
       adapter = HTTPI::Adapter::Curb.new(request)
-      
+
       request.auth.ntlm("tester", "vReqSoafRe5O")
       expect(adapter.request(:get).body).to eq("ntlm-auth")
     end
@@ -257,8 +257,8 @@ unless RUBY_PLATFORM =~ /java/
           end
 
           it 'to 2 when ssl_version is specified as SSLv2/SSLv23' do
-            version = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match /server|client/ }
-            version = version.select { |method| method.to_s.match /SSLv2|SSLv23/ }.first
+            version = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }
+            version = version.select { |method| method.to_s.match(/SSLv2|SSLv23/) }.first
             request.auth.ssl.ssl_version = version
             curb.expects(:ssl_version=).with(2)
 
@@ -279,6 +279,7 @@ unless RUBY_PLATFORM =~ /java/
           request = HTTPI::Request.new("http://example.com")
           request.auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
           request.auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
+          request.auth.ssl.cert_key_password = 'example'
           request
         end
 
@@ -287,6 +288,7 @@ unless RUBY_PLATFORM =~ /java/
           curb.expects(:ssl_verify_host=).with(0) # avoid "SSL peer certificate" error
           curb.expects(:cert_key=).with(request.auth.ssl.cert_key_file)
           curb.expects(:cert=).with(request.auth.ssl.cert_file)
+          curb.expects(:certpassword=).with(request.auth.ssl.cert_key_password)
 
           adapter.request(:get)
         end
@@ -294,6 +296,7 @@ unless RUBY_PLATFORM =~ /java/
         it "cert_key, cert and ssl_verify_peer should be set" do
           curb.expects(:cert_key=).with(request.auth.ssl.cert_key_file)
           curb.expects(:cert=).with(request.auth.ssl.cert_file)
+          curb.expects(:certpassword=).with(request.auth.ssl.cert_key_password)
           curb.expects(:ssl_verify_peer=).with(true)
           curb.expects(:certtype=).with(request.auth.ssl.cert_type.to_s.upcase)
 

data/spec/httpi/adapter/excon_spec.rb

@@ -67,6 +67,13 @@ describe HTTPI::Adapter::Excon do
       expect { HTTPI.get(request, adapter) }.
         to raise_error(HTTPI::NotSupportedError, /does not support NTLM authentication/)
     end
+
+    it "supports disabling verify mode" do
+      request = HTTPI::Request.new(@server.url)
+      request.auth.ssl.verify_mode = :none
+      adapter_class = HTTPI::Adapter.load(adapter).new(request)
+      expect(adapter_class.client.data[:ssl_verify_peer]).to eq(false)
+    end
   end
 
   # it does not support digest auth
@@ -83,9 +90,30 @@ describe HTTPI::Adapter::Excon do
       end
 
       # it does not raise when no certificate was set up
-      it "works when set up properly" do
+      it "works when no client cert is specified" do
+        request = HTTPI::Request.new(@server.url)
+        request.auth.ssl.ca_cert_file = IntegrationServer.ssl_ca_file
+
+        response = HTTPI.get(request, adapter)
+        expect(response.body).to eq("get")
+      end
+
+      it "works with client cert and key provided as file path" do
+        request = HTTPI::Request.new(@server.url)
+        request.auth.ssl.ca_cert_file = IntegrationServer.ssl_ca_file
+        request.auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
+        request.auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
+
+        response = HTTPI.get(request, adapter)
+        expect(response.body).to eq("get")
+      end
+
+      it "works with client cert and key set directly" do
         request = HTTPI::Request.new(@server.url)
+        
         request.auth.ssl.ca_cert_file = IntegrationServer.ssl_ca_file
+        request.auth.ssl.cert = OpenSSL::X509::Certificate.new File.open("spec/fixtures/client_cert.pem").read
+        request.auth.ssl.cert_key = OpenSSL::PKey.read File.open("spec/fixtures/client_key.pem").read
 
         response = HTTPI.get(request, adapter)
         expect(response.body).to eq("get")

data/spec/httpi/adapter/httpclient_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 require "httpi/adapter/httpclient"
 require "httpi/request"
+require "integration/support/server"
 
 HTTPI::Adapter.load_adapter(:httpclient)
 
@@ -10,6 +11,14 @@ describe HTTPI::Adapter::HTTPClient do
   let(:ssl_config) { HTTPClient::SSLConfig.any_instance }
   let(:request)    { HTTPI::Request.new("http://example.com") }
 
+  before :all do
+    @server = IntegrationServer.run
+  end
+
+  after :all do
+    @server.stop
+  end
+
   describe "#request(:get)" do
     it "returns a valid HTTPI::Response" do
       httpclient_expects(:get)
@@ -174,11 +183,12 @@ describe HTTPI::Adapter::HTTPClient do
     end
   end
 
-  it "does not support NTLM authentication" do
-    request.auth.ntlm("tester", "vReqSoafRe5O")
+  it "supports NTLM authentication" do
+    request = HTTPI::Request.new(@server.url + "ntlm-auth")
 
-    expect { adapter.request(:get) }.
-      to raise_error(HTTPI::NotSupportedError, /adapter does not support NTLM authentication/)
+    request.auth.ntlm("tester", "vReqSoafRe5O")
+    response = HTTPI.get(request, :httpclient)
+    expect(response.body).to eq("ntlm-auth")
   end
 
   def httpclient_expects(method)

data/spec/httpi/adapter/net_http_spec.rb

@@ -14,6 +14,22 @@ describe HTTPI::Adapter::NetHTTP do
       @server.stop
     end
 
+    context 'when socks is specified' do
+
+      let(:socks_client) { mock('socks_client') }
+      let(:request){HTTPI::Request.new(@server.url)}
+
+      it 'uses Net::HTTP.SOCKSProxy as client' do
+        socks_client.expects(:new).with(URI(@server.url).host, URI(@server.url).port).returns(:socks_client_instance)
+        Net::HTTP.expects(:SOCKSProxy).with('localhost', 8080).returns socks_client
+
+        request.proxy = 'socks://localhost:8080'
+        adapter = HTTPI::Adapter::NetHTTP.new(request)
+
+        expect(adapter.client).to eq(:socks_client_instance)
+      end
+    end
+
     it "sends and receives HTTP headers" do
       request = HTTPI::Request.new(@server.url + "x-header")
       request.headers["X-Header"] = "HTTPI"
@@ -52,6 +68,36 @@ describe HTTPI::Adapter::NetHTTP do
       expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
+    context "supports custom methods supported by Net::HTTP" do
+      let(:request) do
+        HTTPI::Request.new(@server.url).tap do|r|
+          r.body = request_body if request_body
+        end
+      end
+
+      let(:request_body) { nil }
+
+      let(:response) { HTTPI.request(http_method, request, adapter) }
+
+      shared_examples_for 'any supported custom method' do
+        specify { response.body.should eq http_method.to_s }
+        specify { response.headers["Content-Type"].should eq('text/plain') }
+      end
+
+      context 'PATCH' do
+        let(:http_method) { :patch }
+        let(:request_body) { "<some>xml</some>" }
+
+        it_behaves_like 'any supported custom method'
+      end
+
+      context 'UNSUPPORTED method' do
+        let(:http_method) { :unsupported }
+
+        specify { expect { response }.to raise_error HTTPI::NotSupportedError }
+      end
+    end
+
     it "supports basic authentication" do
       request = HTTPI::Request.new(@server.url + "basic-auth")
       request.auth.basic("admin", "secret")
@@ -85,6 +131,17 @@ describe HTTPI::Adapter::NetHTTP do
       expect { HTTPI.get(request, adapter) }.
         to raise_error(HTTPI::NotSupportedError, /Net::NTLM is not available/)
     end
+
+    it "does not crash when authenticate header is missing (on second request)" do
+      request = HTTPI::Request.new(@server.url + 'ntlm-auth')
+      request.auth.ntlm("tester", "vReqSoafRe5O")
+
+      expect { HTTPI.get(request, adapter) }.
+        to_not raise_error
+
+      expect { HTTPI.get(request, adapter) }.
+        to_not raise_error
+    end
   end
 
   # it does not support digest auth

data/spec/httpi/adapter/rack_spec.rb

@@ -82,14 +82,12 @@ describe HTTPI::Adapter::NetHTTP do
         end
       end
 
-      describe "set_auth" do
-        before do
-          request.auth.basic "username", "password"
-        end
-
-        it "is not supported" do
-          expect { client.request(:get) }.
-            to raise_error(HTTPI::NotSupportedError, "Rack adapter does not support HTTP auth")
+      describe "basic auth" do
+        it "is supported" do
+          request = HTTPI::Request.new(@url + "basic-auth")
+          request.auth.basic("admin", "secret")
+          response = HTTPI.get(request, adapter)
+          expect(response.body).to eq("basic-auth")
         end
       end
 

data/spec/httpi/auth/ssl_spec.rb

@@ -3,7 +3,7 @@ require "httpi/auth/ssl"
 
 describe HTTPI::Auth::SSL do
   before(:all) do
-    @ssl_versions = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match /server|client/ }.sort.reverse
+    @ssl_versions = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }.sort.reverse
   end
 
   describe "VERIFY_MODES" do

data/spec/httpi/httpi_spec.rb

@@ -269,6 +269,20 @@ describe HTTPI do
 
       client.request(:custom, request, :httpclient)
     end
+
+    it 'follows redirects at maximum of the redirect limit' do
+      request.follow_redirect = true
+      request.redirect_limit = 2
+      redirect_location = 'http://foo.bar'
+
+      redirect = HTTPI::Response.new(302, {'location' => redirect_location}, 'Moved')
+      response = HTTPI::Response.new(200, {}, 'success')
+
+      httpclient.any_instance.expects(:request).times(2).with(:custom).returns(redirect, response)
+      request.expects(:url=).with(URI.parse(redirect_location))
+
+      client.request(:custom, request, :httpclient)
+    end
   end
 
   HTTPI::REQUEST_METHODS.each do |method|

data/spec/httpi/request_spec.rb

@@ -108,6 +108,11 @@ describe HTTPI::Request do
       expect(request.proxy).to eq(URI("http://proxy.example.com"))
     end
 
+    it 'also accepts the socks URL to use as a String' do
+      request.proxy ="socks://socks.example.com"
+      expect(request.proxy).to eq(URI("socks://socks.example.com"))
+    end
+
     it "also accepts a URI object" do
       request.proxy = URI("http://proxy.example.com")
       expect(request.proxy).to eq(URI("http://proxy.example.com"))

data/spec/integration/support/application.rb

@@ -1,3 +1,4 @@
+require 'rack'
 require "rack/builder"
 
 class IntegrationServer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: socksify
+  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'
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common interface for Ruby's HTTP libraries
 email: me@rubiii.com
 executables: []
@@ -190,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: httpi
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Common interface for Ruby's HTTP libraries