httpi 2.4.0 → 2.4.5

data/spec/integration/httpclient_spec.rb

@@ -30,6 +30,17 @@ describe HTTPI::Adapter::HTTPClient do
       expect(response.headers["Set-Cookie"]).to eq(cookies)
     end
 
+    it "it supports read timeout" do
+      require "httpclient"
+
+      request = HTTPI::Request.new(@server.url + "timeout")
+      request.read_timeout = 0.5 # seconds
+
+      expect do
+        HTTPI.get(request, adapter)
+      end.to raise_exception(HTTPClient::ReceiveTimeoutError)
+    end
+
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
       expect(response.body).to eq("get")

data/spec/integration/net_http_persistent_spec.rb

@@ -30,6 +30,17 @@ describe HTTPI::Adapter::NetHTTP do
       expect(response.headers["Set-Cookie"]).to eq(cookies)
     end
 
+    it "it supports read timeout" do
+      require "net/http/persistent"
+
+      request = HTTPI::Request.new(@server.url + "timeout")
+      request.read_timeout = 0.5 # seconds
+
+      expect do
+        HTTPI.get(request, adapter)
+      end.to raise_exception(Net::HTTP::Persistent::Error, /Net::ReadTimeout/)
+    end
+
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
       expect(response.body).to eq("get")
@@ -37,7 +48,9 @@ describe HTTPI::Adapter::NetHTTP do
     end
 
     it "executes POST requests" do
-      response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
+      request = HTTPI::Request.new(url: @server.url, body: "<some>xml</some>")
+
+      response = HTTPI.post(request, adapter)
       expect(response.body).to eq("post")
       expect(response.headers["Content-Type"]).to eq("text/plain")
     end
@@ -68,6 +81,14 @@ describe HTTPI::Adapter::NetHTTP do
       expect(response.body).to eq("basic-auth")
     end
 
+    it "does not support ntlm authentication" do
+      request = HTTPI::Request.new(@server.url + "ntlm-auth")
+      request.auth.ntlm("tester", "vReqSoafRe5O")
+
+      expect { HTTPI.get(request, adapter) }.
+        to raise_error(HTTPI::NotSupportedError, /does not support NTLM authentication/)
+    end
+
     # it does not support digest authentication
 
     it "supports chunked response" do

data/spec/integration/net_http_spec.rb

@@ -14,6 +14,21 @@ 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"
@@ -30,6 +45,17 @@ describe HTTPI::Adapter::NetHTTP do
       expect(response.headers["Set-Cookie"]).to eq(cookies)
     end
 
+    it "it supports read timeout" do
+      require "net/http"
+
+      request = HTTPI::Request.new(@server.url + "timeout")
+      request.read_timeout = 0.5 # seconds
+
+      expect do
+        HTTPI.get(request, adapter)
+      end.to raise_exception(Net::ReadTimeout)
+    end
+
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
       expect(response.body).to eq("get")
@@ -60,6 +86,34 @@ describe HTTPI::Adapter::NetHTTP do
       expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
+    context "custom methods" do
+      let(:request) {
+        HTTPI::Request.new(@server.url).tap do |r|
+          r.body = request_body if request_body
+        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 method" 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")
@@ -68,7 +122,69 @@ describe HTTPI::Adapter::NetHTTP do
       expect(response.body).to eq("basic-auth")
     end
 
-    # it does not support digest authentication
+    it "does not support digest authentication" do
+      request = HTTPI::Request.new(@server.url + "digest-auth")
+      request.auth.digest("admin", "secret")
+
+      expect { HTTPI.get(request, adapter) }.
+        to raise_error(HTTPI::NotSupportedError, /does not support HTTP digest authentication/)
+    end
+
+    it "supports ntlm authentication" do
+      request = HTTPI::Request.new(@server.url + "ntlm-auth")
+      request.auth.ntlm("tester", "vReqSoafRe5O")
+
+      response = HTTPI.get(request, adapter)
+      expect(response.body).to eq("ntlm-auth")
+    end
+
+    it "does not support ntlm authentication when Net::NTLM is not available" do
+      Net.expects(:const_defined?).with(:NTLM).returns false
+
+      request = HTTPI::Request.new(@server.url + "ntlm-auth")
+      request.auth.ntlm("testing", "failures")
+
+      expect { HTTPI.get(request, adapter) }.
+        to raise_error(HTTPI::NotSupportedError, /Net::NTLM is not available/)
+    end
+
+    it "does not require ntlm when ntlm authenication is not requested" do
+      HTTPI::Adapter::NetHTTP.any_instance.stubs(:check_net_ntlm_version!).raises(RuntimeError)
+        request = HTTPI::Request.new(@server.url)
+        expect(request.auth.ntlm?).to be false
+
+        # make sure a request doesn't call ntlm check if we don't ask for it.
+        expect { HTTPI.get(request, adapter) }.not_to raise_error
+      HTTPI::Adapter::NetHTTP.any_instance.unstub(:check_net_ntlm_version!)
+    end
+
+    it "does check ntlm when ntlm authentication is requested" do
+      request = HTTPI::Request.new(@server.url + "ntlm-auth")
+      request.auth.ntlm("tester", "vReqSoafRe5O")
+
+      expect { HTTPI.get(request, adapter) }.not_to raise_error
+
+      # the check should also verify that the version of ntlm is supported and still fail if it isn't
+      HTTPI::Adapter::NetHTTP.any_instance.stubs(:ntlm_version).returns("0.1.1")
+
+        request = HTTPI::Request.new(@server.url + "ntlm-auth")
+        request.auth.ntlm("tester", "vReqSoafRe5O")
+
+        expect { HTTPI.get(request, adapter) }.to raise_error(ArgumentError, /Invalid version/)
+
+      HTTPI::Adapter::NetHTTP.any_instance.unstub(:ntlm_version)
+    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
 
     it "supports chunked response" do
       request = HTTPI::Request.new(@server.url)
@@ -101,6 +217,16 @@ describe HTTPI::Adapter::NetHTTP do
         response = HTTPI.get(request, adapter)
         expect(response.body).to eq("get")
       end
+
+      it "works with min_version/max_version" do
+        request = HTTPI::Request.new(@server.url)
+        request.auth.ssl.ca_cert_file = IntegrationServer.ssl_ca_file
+        request.auth.ssl.min_version = :TLS1_2
+        request.auth.ssl.max_version = :TLS1_2
+
+        response = HTTPI.get(request, adapter)
+        expect(response.body).to eq("get")
+      end
     end
   end
 

data/spec/integration/support/application.rb

@@ -1,3 +1,4 @@
+require 'rack'
 require "rack/builder"
 
 class IntegrationServer
@@ -14,9 +15,10 @@ class IntegrationServer
       }
     end
 
-    map "/repeat" do
+    map "/timeout" do
       run lambda { |env|
-        IntegrationServer.respond_with :body => env["rack.input"].read
+        sleep 2
+        IntegrationServer.respond_with "done"
       }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.5
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2020-07-08 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: []
@@ -116,6 +144,7 @@ files:
 - lib/httpi/adapter/curb.rb
 - lib/httpi/adapter/em_http.rb
 - lib/httpi/adapter/excon.rb
+- lib/httpi/adapter/http.rb
 - lib/httpi/adapter/httpclient.rb
 - lib/httpi/adapter/net_http.rb
 - lib/httpi/adapter/net_http_persistent.rb
@@ -141,6 +170,7 @@ files:
 - spec/httpi/adapter/curb_spec.rb
 - spec/httpi/adapter/em_http_spec.rb
 - spec/httpi/adapter/excon_spec.rb
+- spec/httpi/adapter/http_spec.rb
 - spec/httpi/adapter/httpclient_spec.rb
 - spec/httpi/adapter/net_http_persistent_spec.rb
 - spec/httpi/adapter/net_http_spec.rb
@@ -156,9 +186,11 @@ files:
 - spec/httpi/response_spec.rb
 - spec/integration/curb_spec.rb
 - spec/integration/em_http_spec.rb
+- spec/integration/excon_spec.rb
 - spec/integration/fixtures/ca_all.pem
 - spec/integration/fixtures/server.cert
 - spec/integration/fixtures/server.key
+- spec/integration/http_spec.rb
 - spec/integration/httpclient_spec.rb
 - spec/integration/net_http_persistent_spec.rb
 - spec/integration/net_http_spec.rb
@@ -187,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: httpi
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Common interface for Ruby's HTTP libraries