httpi 0.5.0 → 0.6.0

data/spec/httpi/adapter/net_http_spec.rb

@@ -3,6 +3,7 @@ require "httpi/adapter/net_http"
 require "httpi/request"
 
 describe HTTPI::Adapter::NetHTTP do
+  let(:net_http) { Net::HTTP.any_instance }
 
   def adapter(request)
     @adapter ||= HTTPI::Adapter::NetHTTP.new request
@@ -16,58 +17,128 @@ describe HTTPI::Adapter::NetHTTP do
   end
 
   describe "#get" do
-    before do
-      @request = HTTPI::Request.new :url => "http://example.com"
-      stub_request(:get, @request.url.to_s).to_return(:body => Fixture.xml)
-    end
-
     it "should return a valid HTTPI::Response" do
-      adapter(@request).get(@request).should match_response(:body => Fixture.xml)
+      stub_request(:get, basic_request.url.to_s).to_return(:body => Fixture.xml)
+      adapter(basic_request).get(basic_request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#post" do
-    before do
-      @request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
-      stub_request(:post, @request.url.to_s).with(:body => @request.body).to_return(:body => Fixture.xml)
-    end
-
     it "should return a valid HTTPI::Response" do
-      adapter(@request).post(@request).should match_response(:body => Fixture.xml)
+      request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
+      stub_request(:post, request.url.to_s).with(:body => request.body).to_return(:body => Fixture.xml)
+      
+      adapter(request).post(request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#head" do
-    before do
-      @request = HTTPI::Request.new :url => "http://example.com"
-      stub_request(:head, @request.url.to_s).to_return(:body => Fixture.xml)
-    end
-
     it "should return a valid HTTPI::Response" do
-      adapter(@request).head(@request).should match_response(:body => Fixture.xml)
+      stub_request(:head, basic_request.url.to_s).to_return(:body => Fixture.xml)
+      adapter(basic_request).head(basic_request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#put" do
-    before do
-      @request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
-      stub_request(:put, @request.url.to_s).with(:body => @request.body).to_return(:body => Fixture.xml)
+    it "should return a valid HTTPI::Response" do
+      request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
+      stub_request(:put, request.url.to_s).with(:body => request.body).to_return(:body => Fixture.xml)
+      
+      adapter(request).put(request).should match_response(:body => Fixture.xml)
     end
+  end
 
+  describe "#delete" do
     it "should return a valid HTTPI::Response" do
-      adapter(@request).put(@request).should match_response(:body => Fixture.xml)
+      stub_request(:delete, basic_request.url.to_s)
+      adapter(basic_request).delete(basic_request).should match_response(:body => "")
     end
   end
 
-  describe "#delete" do
-    before do
-      @request = HTTPI::Request.new :url => "http://example.com"
-      stub_request(:delete, @request.url.to_s)
+  describe "settings:" do
+    before { stub_request(:get, basic_request.url.to_s) }
+
+    describe "use_ssl" do
+      it "should be set to false for non-SSL requests" do
+        net_http.expects(:use_ssl=).with(false)
+        adapter(basic_request).get(basic_request)
+      end
+
+      it "should be set to true for SSL requests" do
+        request = basic_request { |request| request.ssl = true }
+        
+        net_http.expects(:use_ssl=).with(true)
+        adapter(request).get(request)
+      end
     end
 
-    it "should return a valid HTTPI::Response" do
-      adapter(@request).delete(@request).should match_response(:body => "")
+    describe "open_timeout" do
+      it "should not be set if not specified" do
+        net_http.expects(:open_timeout=).never
+        adapter(basic_request).get(basic_request)
+      end
+
+      it "should be set if specified" do
+        request = basic_request { |request| request.open_timeout = 30 }
+        
+        net_http.expects(:open_timeout=).with(30)
+        adapter(request).get(request)
+      end
+    end
+
+    describe "read_timeout" do
+      it "should not be set if not specified" do
+        net_http.expects(:read_timeout=).never
+        adapter(basic_request).get(basic_request)
+      end
+
+      it "should be set if specified" do
+        request = basic_request { |request| request.read_timeout = 30 }
+        
+        net_http.expects(:read_timeout=).with(30)
+        adapter(request).get(request)
+      end
+    end
+
+    describe "basic_auth" do
+      it "should be set for HTTP basic auth" do
+        request = basic_request { |request| request.auth.basic "username", "password" }
+        
+        stub_request(:get, "http://username:password@example.com")
+        Net::HTTP::Get.any_instance.expects(:basic_auth).with(*request.auth.credentials)
+        adapter(request).get(request)
+      end
     end
+
+    context "(for SSL client auth)" do
+      let(:ssl_auth_request) do
+        basic_request do |request|
+          request.auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
+          request.auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
+        end
+      end
+
+      it "key, cert and verify_mode should be set" do
+        net_http.expects(:cert=).with(ssl_auth_request.auth.ssl.cert)
+        net_http.expects(:key=).with(ssl_auth_request.auth.ssl.cert_key)
+        net_http.expects(:verify_mode=).with(ssl_auth_request.auth.ssl.openssl_verify_mode)
+        
+        adapter(ssl_auth_request).get(ssl_auth_request)
+      end
+
+      it "should set the client_ca if specified" do
+        ssl_auth_request.auth.ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
+        net_http.expects(:ca_file=).with(ssl_auth_request.auth.ssl.ca_cert_file)
+        
+        adapter(ssl_auth_request).get(ssl_auth_request)
+      end
+    end
+  end
+
+  def basic_request
+    request = HTTPI::Request.new "http://example.com"
+    yield request if block_given?
+    request
   end
 
 end

data/spec/httpi/auth/config_spec.rb

@@ -0,0 +1,117 @@
+require "spec_helper"
+require "httpi/auth/config"
+
+describe HTTPI::Auth::Config do
+  let(:auth) { HTTPI::Auth::Config.new }
+
+  describe "#basic" do
+    it "lets you specify the basic auth credentials" do
+      auth.basic "username", "password"
+      auth.basic.should == ["username", "password"]
+    end
+   
+    it "also accepts an Array of credentials" do
+      auth.basic ["username", "password"]
+      auth.basic.should == ["username", "password"]
+    end
+
+    it "sets the authentication type to :basic" do
+      auth.basic "username", "password"
+      auth.type.should == :basic
+    end
+  end
+
+  describe "#basic?" do
+    it "should default to return false" do
+      auth.should_not be_basic
+    end
+
+    it "should return true for HTTP basic auth" do
+      auth.basic "username", "password"
+      auth.should be_basic
+    end
+  end
+
+  describe "#digest" do
+    it "lets you specify the digest auth credentials" do
+      auth.digest "username", "password"
+      auth.digest.should == ["username", "password"]
+    end
+   
+    it "also accepts an Array of credentials" do
+      auth.digest ["username", "password"]
+      auth.digest.should == ["username", "password"]
+    end
+
+    it "sets the authentication type to :digest" do
+      auth.digest "username", "password"
+      auth.type.should == :digest
+    end
+  end
+
+  describe "#digest?" do
+    it "should default to return false" do
+      auth.should_not be_digest
+    end
+
+    it "should return true for HTTP digest auth" do
+      auth.digest "username", "password"
+      auth.should be_digest
+    end
+  end
+
+  describe "#http?" do
+    it "should default to return false" do
+      auth.should_not be_http
+    end
+
+    it "should return true for HTTP basic auth" do
+      auth.basic "username", "password"
+      auth.should be_http
+    end
+
+    it "should return true for HTTP digest auth" do
+      auth.digest "username", "password"
+      auth.should be_http
+    end
+  end
+
+  describe "#ssl" do
+    it "should return the HTTPI::Auth::SSL object" do
+      auth.ssl.should be_a(HTTPI::Auth::SSL)
+    end
+  end
+
+  describe "#ssl?" do
+    it "should default to return false" do
+      auth.should_not be_ssl
+    end
+
+    it "should return true for SSL client auth" do
+      auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
+      auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
+      
+      auth.should be_ssl
+    end
+  end
+
+  describe "#type" do
+    it "should return the authentication type" do
+      auth.basic "username", "password"
+      auth.type.should == :basic
+    end
+  end
+
+  describe "#credentials" do
+    it "return the credentials for HTTP basic auth" do
+      auth.basic "username", "basic"
+      auth.credentials.should == ["username", "basic"]
+    end
+
+    it "return the credentials for HTTP digest auth" do
+      auth.digest "username", "digest"
+      auth.credentials.should == ["username", "digest"]
+    end
+  end
+
+end

data/spec/httpi/auth/ssl_spec.rb

@@ -0,0 +1,112 @@
+require "spec_helper"
+require "httpi/auth/ssl"
+
+describe HTTPI::Auth::SSL do
+
+  describe "VERIFY_MODES" do
+    it "should contain the supported SSL verify modes" do
+      HTTPI::Auth::SSL::VERIFY_MODES.should == [:none, :peer, :fail_if_no_peer_cert, :client_once]
+    end
+  end
+
+  describe "#present?" do
+    it "should default to return false" do
+      ssl = HTTPI::Auth::SSL.new
+      ssl.should_not be_present
+    end
+
+    it "should return false if only a client key was specified" do
+      ssl = HTTPI::Auth::SSL.new
+      ssl.cert_key_file = "spec/fixtures/client_key.pem"
+      
+      ssl.should_not be_present
+    end
+
+    it "should return false if only a client key was specified" do
+      ssl = HTTPI::Auth::SSL.new
+      ssl.cert_file = "spec/fixtures/client_cert.pem"
+      
+      ssl.should_not be_present
+    end
+
+    it "should return true if both client key and cert are present" do
+      ssl.should be_present
+    end
+  end
+
+  describe "#verify_mode" do
+    it "should default to return :peer" do
+      ssl.verify_mode.should == :peer
+    end
+
+    it "should set the verify mode to use" do
+      ssl = HTTPI::Auth::SSL.new
+      
+      ssl.verify_mode = :none
+      ssl.verify_mode.should == :none
+    end
+
+    it "should raise an ArgumentError if the given mode is not supported" do
+      lambda { ssl.verify_mode = :invalid }.should raise_error(ArgumentError)
+    end
+  end
+
+  describe "#cert" do
+    it "should return an OpenSSL::X509::Certificate for the given cert_file" do
+      ssl.cert.should be_a(OpenSSL::X509::Certificate)
+    end
+  end
+
+  describe "#cert_key" do
+    it "should return a OpenSSL::PKey::RSA for the given cert_key" do
+      ssl.cert_key.should be_a(OpenSSL::PKey::RSA)
+    end
+  end
+
+  describe "#ca_cert" do
+    it "should return an OpenSSL::X509::Certificate for the given ca_cert_file" do
+      ssl = HTTPI::Auth::SSL.new
+      
+      ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
+      ssl.ca_cert.should be_a(OpenSSL::X509::Certificate)
+    end
+  end
+
+  describe "#openssl_verify_mode" do
+    it "should return the OpenSSL verify mode for :none" do
+      ssl = HTTPI::Auth::SSL.new
+      
+      ssl.verify_mode = :none
+      ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_NONE
+    end
+
+    it "should return the OpenSSL verify mode for :peer" do
+      ssl = HTTPI::Auth::SSL.new
+      
+      ssl.verify_mode = :peer
+      ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_PEER
+    end
+
+    it "should return the OpenSSL verify mode for :fail_if_no_peer_cert" do
+      ssl = HTTPI::Auth::SSL.new
+      
+      ssl.verify_mode = :fail_if_no_peer_cert
+      ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+    end
+
+    it "should return the OpenSSL verify mode for :client_once" do
+      ssl = HTTPI::Auth::SSL.new
+      
+      ssl.verify_mode = :client_once
+      ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_CLIENT_ONCE
+    end
+  end
+
+  def ssl
+    ssl = HTTPI::Auth::SSL.new
+    ssl.cert_key_file = "spec/fixtures/client_key.pem"
+    ssl.cert_file = "spec/fixtures/client_cert.pem"
+    ssl
+  end
+
+end

data/spec/httpi/httpi_spec.rb

@@ -42,28 +42,6 @@ describe HTTPI do
     end
   end
 
-  shared_examples_for "a request method" do
-    context "(with a block)" do
-      it "should yield the HTTP client instance used for the request" do
-        client.delete "http://example.com" do |http|
-          http.should be_an(HTTPClient)
-        end
-      end
-    end
-
-    it "and raise an ArgumentError in case of an invalid adapter" do
-      lambda { client.delete HTTPI::Request.new, :invalid }.should raise_error(ArgumentError)
-    end
-
-    it "and raise an ArgumentError in case of an invalid URL" do
-      lambda { client.delete "invalid" }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe ".get" do
-    it_should_behave_like "a request method"
-  end
-
   describe ".post(request)" do
     it "should execute an HTTP POST request using the default adapter" do
       request = HTTPI::Request.new
@@ -102,10 +80,6 @@ describe HTTPI do
     end
   end
 
-  describe ".post" do
-    it_should_behave_like "a request method"
-  end
-
   describe ".head(request)" do
     it "should execute an HTTP HEAD request using the default adapter" do
       request = HTTPI::Request.new
@@ -142,10 +116,6 @@ describe HTTPI do
     end
   end
 
-  describe ".head" do
-    it_should_behave_like "a request method"
-  end
-
   describe ".put(request)" do
     it "should execute an HTTP PUT request using the default adapter" do
       request = HTTPI::Request.new
@@ -184,10 +154,6 @@ describe HTTPI do
     end
   end
 
-  describe ".put" do
-    it_should_behave_like "a request method"
-  end
-
   describe ".delete(request)" do
     it "should execute an HTTP DELETE request using the default adapter" do
       request = HTTPI::Request.new
@@ -223,9 +189,51 @@ describe HTTPI do
       client.delete "http://example.com", :curb
     end
   end
-  
-  describe ".delete" do
-    it_should_behave_like "a request method"
+
+  describe ".request" do
+    it "should raise an ArgumentError in case of an invalid request method" do
+      lambda { client.request :invalid, HTTPI::Request.new }.should raise_error(ArgumentError)
+    end
+  end
+
+  HTTPI::REQUEST_METHODS.each do |method|
+
+    describe ".request(#{method}, request, adapter)" do
+      it "should delegate to the .#{method} method" do
+        HTTPI.expects(method)
+        client.request method, HTTPI::Request.new
+      end
+    end
+
+    describe ".#{method}" do
+      it "should raise an ArgumentError in case of an invalid adapter" do
+        lambda { client.request method, request, :invalid }.should raise_error(ArgumentError)
+      end
+
+      it "should raise an ArgumentError in case of an invalid request" do
+        lambda { client.request method, "invalid" }.should raise_error(ArgumentError)
+      end
+
+      HTTPI::Adapter.adapters.each do |adapter, adapter_class|
+        client_class = {
+          :httpclient => lambda { HTTPClient },
+          :curb       => lambda { Curl::Easy },
+          :net_http   => lambda { Net::HTTP }
+        }
+
+        context "using :#{adapter} with a block" do
+          let(:request) { HTTPI::Request.new :url => "http://example.com" }
+
+          before { adapter_class.any_instance.stubs(method) }
+
+          it "should yield the HTTP client instance used for the request" do
+            block = lambda { |http| http.should be_a(client_class[adapter].call) }
+            client.request(method, request, adapter, &block)
+          end
+        end
+      end
+
+    end
   end
 
 end