httpi 1.1.1 → 2.0.0.rc1

data/spec/httpi/adapter_spec.rb

@@ -4,6 +4,19 @@ require "httpi/adapter"
 describe HTTPI::Adapter do
   let(:adapter) { HTTPI::Adapter }
 
+  describe ".register" do
+    it "registers a new adapter" do
+      name  = :custom
+      klass = Class.new
+      deps  = %w(some_dependency)
+
+      adapter.register(name, klass, deps)
+
+      HTTPI::Adapter::ADAPTERS[:custom].should include(:class => klass, :deps => deps)
+      HTTPI::Adapter::ADAPTER_CLASS_MAP[klass].should be(name)
+    end
+  end
+
   describe ".use" do
     around do |example|
       adapter.use = nil
@@ -35,13 +48,13 @@ describe HTTPI::Adapter do
   describe ".load" do
     context "called with a valid adapter" do
       it "returns the adapter's name and class" do
-        adapter.load(:curb).should == [:curb, HTTPI::Adapter::Curb]
+        adapter.load(:net_http).should == HTTPI::Adapter::NetHTTP
       end
     end
 
     context "called with nil" do
       it "returns the default adapter's name and class" do
-        adapter.load(nil).should == [:httpclient, HTTPI::Adapter::HTTPClient]
+        adapter.load(nil).should == HTTPI::Adapter::HTTPClient
       end
     end
 

data/spec/httpi/auth/ssl_spec.rb

@@ -53,7 +53,9 @@ describe HTTPI::Auth::SSL do
     end
 
     it "raises an ArgumentError if the given mode is not supported" do
-      expect { ssl.verify_mode = :invalid }.to raise_error(ArgumentError)
+      expect { ssl.verify_mode = :invalid }.
+        to raise_error(ArgumentError, "Invalid SSL verify mode :invalid\n" +
+                                      "Please specify one of [:none, :peer, :fail_if_no_peer_cert, :client_once]")
     end
   end
 
@@ -132,6 +134,37 @@ describe HTTPI::Auth::SSL do
     end
   end
 
+  describe "SSL_VERSIONS" do
+    it "contains the supported SSL versions" do
+      HTTPI::Auth::SSL::SSL_VERSIONS.should == [:TLSv1, :SSLv2, :SSLv3]
+    end
+  end
+
+  describe "#ssl_version" do
+    subject { HTTPI::Auth::SSL.new }
+
+    it 'returns the SSL version for :TLSv1' do
+      subject.ssl_version = :TLSv1
+      subject.ssl_version.should eq(:TLSv1)
+    end
+
+    it 'returns the SSL version for :SSLv2' do
+      subject.ssl_version = :SSLv2
+      subject.ssl_version.should eq(:SSLv2)
+    end
+
+    it 'returns the SSL version for :SSLv3' do
+      subject.ssl_version = :SSLv3
+      subject.ssl_version.should eq(:SSLv3)
+    end
+
+    it 'raises ArgumentError if the version is unsupported' do
+      expect { ssl.ssl_version = :ssl_fail }.
+        to raise_error(ArgumentError, "Invalid SSL version :ssl_fail\n" +
+                                      "Please specify one of [:TLSv1, :SSLv2, :SSLv3]")
+    end
+  end
+
   def ssl
     ssl = HTTPI::Auth::SSL.new
     ssl.cert_key_file = "spec/fixtures/client_key.pem"

data/spec/httpi/httpi_spec.rb

@@ -3,243 +3,208 @@ require "httpi"
 
 describe HTTPI do
   let(:client) { HTTPI }
-  let(:httpclient) { HTTPI::Adapter.load(:httpclient)[1] }
-  let(:curb) { HTTPI::Adapter.load(:curb)[1] }
+  let(:httpclient) { HTTPI::Adapter.load(:httpclient) }
+  let(:net_http) { HTTPI::Adapter.load(:net_http) }
+
+  describe ".adapter=" do
+    it "sets the default adapter to use" do
+      HTTPI::Adapter.expects(:use=).with(:net_http)
+      HTTPI.adapter = :net_http
+    end
+  end
 
   describe ".get(request)" do
     it "executes a GET request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:get).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:get)
 
-      client.get request
+      client.get(request)
     end
   end
 
   describe ".get(request, adapter)" do
     it "executes a GET request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:get).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:get)
 
-      client.get request, :curb
+      client.get(request, :net_http)
     end
   end
 
   describe ".get(url)" do
     it "executes a GET request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      httpclient.any_instance.expects(:get).with(instance_of(HTTPI::Request))
-
-      client.get "http://example.com"
+      httpclient.any_instance.expects(:request).with(:get)
+      client.get("http://example.com")
     end
   end
 
   describe ".get(url, adapter)" do
     it "executes a GET request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      curb.any_instance.expects(:get).with(instance_of(HTTPI::Request))
-
-      client.get "http://example.com", :curb
+      net_http.any_instance.expects(:request).with(:get)
+      client.get("http://example.com", :net_http)
     end
   end
 
   describe ".post(request)" do
     it "executes a POST request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:post).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:post)
 
-      client.post request
+      client.post(request)
     end
   end
 
   describe ".post(request, adapter)" do
     it "executes a POST request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:post).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:post, anything)
 
-      client.post request, :curb
+      client.post(request, :net_http)
     end
   end
 
   describe ".post(url, body)" do
     it "executes a POST request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      httpclient.any_instance.expects(:post).with(instance_of(HTTPI::Request))
-
-      client.post "http://example.com", "<some>xml</some>"
+      httpclient.any_instance.expects(:request).with(:post)
+      client.post("http://example.com", "<some>xml</some>")
     end
   end
 
   describe ".post(url, body, adapter)" do
     it "executes a POST request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      curb.any_instance.expects(:post).with(instance_of(HTTPI::Request))
-
-      client.post "http://example.com", "<some>xml</some>", :curb
+      net_http.any_instance.expects(:request).with(:post)
+      client.post("http://example.com", "<some>xml</some>", :net_http)
     end
   end
 
   describe ".head(request)" do
     it "executes a HEAD request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:head).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:head, anything)
 
-      client.head request
+      client.head(request)
     end
   end
 
   describe ".head(request, adapter)" do
     it "executes a HEAD request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:head).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:head, anything)
 
-      client.head request, :curb
+      client.head(request, :net_http)
     end
   end
 
   describe ".head(url)" do
     it "executes a HEAD request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      httpclient.any_instance.expects(:head).with(instance_of(HTTPI::Request))
-
-      client.head "http://example.com"
+      httpclient.any_instance.expects(:request).with(:head)
+      client.head("http://example.com")
     end
   end
 
   describe ".head(url, adapter)" do
     it "executes a HEAD request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      curb.any_instance.expects(:head).with(instance_of(HTTPI::Request))
-
-      client.head "http://example.com", :curb
+      net_http.any_instance.expects(:request).with(:head)
+      client.head("http://example.com", :net_http)
     end
   end
 
   describe ".put(request)" do
     it "executes a PUT request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:put).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:put, anything)
 
-      client.put request
+      client.put(request)
     end
   end
 
   describe ".put(request, adapter)" do
     it "executes a PUT request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:put).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:put, anything)
 
-      client.put request, :curb
+      client.put(request, :net_http)
     end
   end
 
   describe ".put(url, body)" do
     it "executes a PUT request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      httpclient.any_instance.expects(:put).with(instance_of(HTTPI::Request))
-
-      client.put "http://example.com", "<some>xml</some>"
+      httpclient.any_instance.expects(:request).with(:put)
+      client.put("http://example.com", "<some>xml</some>")
     end
   end
 
   describe ".put(url, body, adapter)" do
     it "executes a PUT request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      curb.any_instance.expects(:put).with(instance_of(HTTPI::Request))
-
-      client.put "http://example.com", "<some>xml</some>", :curb
+      net_http.any_instance.expects(:request).with(:put)
+      client.put("http://example.com", "<some>xml</some>", :net_http)
     end
   end
 
   describe ".delete(request)" do
     it "executes a DELETE request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:delete).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:delete, anything)
 
-      client.delete request
+      client.delete(request)
     end
   end
 
   describe ".delete(request, adapter)" do
     it "executes a DELETE request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:delete).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:delete, anything)
 
-      client.delete request, :curb
+      client.delete(request, :net_http)
     end
   end
 
   describe ".delete(url)" do
     it "executes a DELETE request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      httpclient.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
-
-      client.delete "http://example.com"
+      httpclient.any_instance.expects(:request).with(:delete)
+      client.delete("http://example.com")
     end
   end
 
   describe ".delete(url, adapter)" do
     it "executes a DELETE request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      curb.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
-
-      client.delete "http://example.com", :curb
+      net_http.any_instance.expects(:request).with(:delete)
+      client.delete("http://example.com", :net_http)
     end
   end
 
   describe ".request" do
-    it "raises an ArgumentError in case of an invalid request method" do
-      expect { client.request :invalid, HTTPI::Request.new }.to raise_error(ArgumentError)
-    end
-  end
+    it "allows custom HTTP methods" do
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:custom)
 
-  describe ".adapter=" do
-    it "sets the default adapter to use" do
-      HTTPI::Adapter.expects(:use=).with(:net_http)
-      HTTPI.adapter = :net_http
+      client.request(:custom, request, :httpclient)
     end
   end
 
   HTTPI::REQUEST_METHODS.each do |method|
-    describe ".request(#{method}, request, adapter)" do
-      it "delegates to the .#{method} method" do
-        HTTPI.expects(method)
-        client.request method, HTTPI::Request.new
-      end
-    end
-
     describe ".#{method}" do
-      let(:request) { HTTPI::Request.new :url => "http://example.com" }
+      let(:request) { HTTPI::Request.new("http://example.com") }
 
       it "raises an ArgumentError in case of an invalid adapter" do
         expect { client.request method, request, :invalid }.to raise_error(ArgumentError)
       end
 
-      it "raises an ArgumentError in case of an invalid request" do
-        expect { client.request method, "invalid" }.to raise_error(ArgumentError)
-      end
-
       HTTPI::Adapter::ADAPTERS.each do |adapter, opts|
-        client_class = {
-          :httpclient => lambda { HTTPClient },
-          :curb       => lambda { Curl::Easy },
-          :net_http   => lambda { Net::HTTP }
-        }
-
-        context "using #{adapter}" do
-          before { opts[:class].any_instance.expects(method) }
-
-          it "logs that we're executing a request" do
-            HTTPI.expects(:log).with("HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter")
-            client.request method, request, adapter
-          end
-
-          it "yields the HTTP client instance used for the request" do
-            block = lambda { |http| http.be_a(client_class[adapter].call) }
-            client.request(method, request, adapter, &block)
+        unless (adapter == :em_http && RUBY_VERSION =~ /1\.8/) || (adapter == :curb && RUBY_PLATFORM =~ /java/)
+          client_class = {
+            :httpclient => lambda { HTTPClient },
+            :curb       => lambda { Curl::Easy },
+            :net_http   => lambda { Net::HTTP },
+            :em_http    => lambda { EventMachine::WebMockHttpConnection } # in real life: EventMachine::HttpRequest
+          }
+
+          context "using #{adapter}" do
+            before { opts[:class].any_instance.expects(:request).with(method) }
+
+            it "yields the HTTP client instance used for the request" do
+              expect { |b| client.request(method, request, adapter, &b) }.to yield_with_args(client_class[adapter].call)
+            end
           end
         end
       end
@@ -267,8 +232,8 @@ describe HTTPI do
     end
 
     describe ".log_level" do
-      it "defaults to :warn" do
-        HTTPI.log_level.should == :warn
+      it "defaults to :debug" do
+        HTTPI.log_level.should == :debug
       end
     end
 

data/spec/integration/fixtures/ca.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID0DCCArigAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDIzMloXDTM2MDEyMjAwNDIzMlowPDELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQswCQYDVQQDDAJDQTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbv0x42BTKFEQOE+KJ2XmiSdZpR
+wjzQLAkPLRnLB98tlzs4xo+y4RyY/rd5TT9UzBJTIhP8CJi5GbS1oXEerQXB3P0d
+L5oSSMwGGyuIzgZe5+vZ1kgzQxMEKMMKlzA73rbMd4Jx3u5+jdbP0EDrPYfXSvLY
+bS04n2aX7zrN3x5KdDrNBfwBio2/qeaaj4+9OxnwRvYP3WOvqdW0h329eMfHw0pi
+JI0drIVdsEqClUV4pebT/F+CPUPkEh/weySgo9wANockkYu5ujw2GbLFcO5LXxxm
+dEfcVr3r6t6zOA4bJwL0W/e6LBcrwiG/qPDFErhwtgTLYf6Er67SzLyA66UCAwEA
+AaOB3DCB2TAPBgNVHRMBAf8EBTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09w
+ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRJ7Xd380KzBV7f
+USKIQ+O/vKbhDzAOBgNVHQ8BAf8EBAMCAQYwZAYDVR0jBF0wW4AUSe13d/NCswVe
+31EiiEPjv7ym4Q+hQKQ+MDwxCzAJBgNVBAYMAkpQMRIwEAYDVQQKDAlKSU4uR1Iu
+SlAxDDAKBgNVBAsMA1JSUjELMAkGA1UEAwwCQ0GCAQAwDQYJKoZIhvcNAQEFBQAD
+ggEBAIu/mfiez5XN5tn2jScgShPgHEFJBR0BTJBZF6xCk0jyqNx/g9HMj2ELCuK+
+r/Y7KFW5c5M3AQ+xWW0ZSc4kvzyTcV7yTVIwj2jZ9ddYMN3nupZFgBK1GB4Y05GY
+MJJFRkSu6d/Ph5ypzBVw2YMT/nsOo5VwMUGLgS7YVjU+u/HNWz80J3oO17mNZllj
+PvORJcnjwlroDnS58KoJ7GDgejv3ESWADvX1OHLE4cRkiQGeLoEU4pxdCxXRqX0U
+PbwIkZN9mXVcrmPHq8MWi4eC/V7hnbZETMHuWhUoiNdOEfsAXr3iP4KjyyRdwc7a
+d/xgcK06UVQRL/HbEYGiQL056mc=
+-----END CERTIFICATE-----

data/spec/integration/fixtures/ca_all.pem

@@ -0,0 +1,44 @@
+-----BEGIN CERTIFICATE-----
+MIID0DCCArigAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDIzMloXDTM2MDEyMjAwNDIzMlowPDELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQswCQYDVQQDDAJDQTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbv0x42BTKFEQOE+KJ2XmiSdZpR
+wjzQLAkPLRnLB98tlzs4xo+y4RyY/rd5TT9UzBJTIhP8CJi5GbS1oXEerQXB3P0d
+L5oSSMwGGyuIzgZe5+vZ1kgzQxMEKMMKlzA73rbMd4Jx3u5+jdbP0EDrPYfXSvLY
+bS04n2aX7zrN3x5KdDrNBfwBio2/qeaaj4+9OxnwRvYP3WOvqdW0h329eMfHw0pi
+JI0drIVdsEqClUV4pebT/F+CPUPkEh/weySgo9wANockkYu5ujw2GbLFcO5LXxxm
+dEfcVr3r6t6zOA4bJwL0W/e6LBcrwiG/qPDFErhwtgTLYf6Er67SzLyA66UCAwEA
+AaOB3DCB2TAPBgNVHRMBAf8EBTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09w
+ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRJ7Xd380KzBV7f
+USKIQ+O/vKbhDzAOBgNVHQ8BAf8EBAMCAQYwZAYDVR0jBF0wW4AUSe13d/NCswVe
+31EiiEPjv7ym4Q+hQKQ+MDwxCzAJBgNVBAYMAkpQMRIwEAYDVQQKDAlKSU4uR1Iu
+SlAxDDAKBgNVBAsMA1JSUjELMAkGA1UEAwwCQ0GCAQAwDQYJKoZIhvcNAQEFBQAD
+ggEBAIu/mfiez5XN5tn2jScgShPgHEFJBR0BTJBZF6xCk0jyqNx/g9HMj2ELCuK+
+r/Y7KFW5c5M3AQ+xWW0ZSc4kvzyTcV7yTVIwj2jZ9ddYMN3nupZFgBK1GB4Y05GY
+MJJFRkSu6d/Ph5ypzBVw2YMT/nsOo5VwMUGLgS7YVjU+u/HNWz80J3oO17mNZllj
+PvORJcnjwlroDnS58KoJ7GDgejv3ESWADvX1OHLE4cRkiQGeLoEU4pxdCxXRqX0U
+PbwIkZN9mXVcrmPHq8MWi4eC/V7hnbZETMHuWhUoiNdOEfsAXr3iP4KjyyRdwc7a
+d/xgcK06UVQRL/HbEYGiQL056mc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDMyN1oXDTM1MDEyMjAwNDMyN1owPzELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQ4wDAYDVQQDDAVTdWJDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0Ou7AyRcRXnB/kVHv/6kwe
+ANzgg/DyJfsAUqW90m7Lu1nqyug8gK0RBd77yU0w5HOAMHTVSdpjZK0g2sgx4Mb1
+d/213eL9TTl5MRVEChTvQr8q5DVG/8fxPPE7fMI8eOAzd98/NOAChk+80r4Sx7fC
+kGVEE1bKwY1MrUsUNjOY2d6t3M4HHV3HX1V8ShuKfsHxgCmLzdI8U+5CnQedFgkm
+3e+8tr8IX5RR1wA1Ifw9VadF7OdI/bGMzog/Q8XCLf+WPFjnK7Gcx6JFtzF6Gi4x
+4dp1Xl45JYiVvi9zQ132wu8A1pDHhiNgQviyzbP+UjcB/tsOpzBQF8abYzgEkWEC
+AwEAAaNyMHAwDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9P
+cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUlCjXWLsReYzH
+LzsxwVnCXmKoB/owCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCJ/OyN
+rT8Cq2Y+G2yA/L1EMRvvxwFBqxavqaqHl/6rwsIBFlB3zbqGA/0oec6MAVnYynq4
+c4AcHTjx3bQ/S4r2sNTZq0DH4SYbQzIobx/YW8PjQUJt8KQdKMcwwi7arHP7A/Ha
+LKu8eIC2nsUBnP4NhkYSGhbmpJK+PFD0FVtD0ZIRlY/wsnaZNjWWcnWF1/FNuQ4H
+ySjIblqVQkPuzebv3Ror6ZnVDukn96Mg7kP4u6zgxOeqlJGRe1M949SS9Vudjl8X
+SF4aZUUB9pQGhsqQJVqaz2OlhGOp9D0q54xko/rekjAIcuDjl1mdX4F2WRrzpUmZ
+uY/bPeOBYiVsOYVe
+-----END CERTIFICATE-----