httpi 1.1.1 → 2.0.0.rc1

data/spec/integration/fixtures/htdigest

@@ -0,0 +1 @@
+admin:auth:4302fe65caa32f27721949149ccd3083

data/spec/integration/fixtures/htpasswd

@@ -0,0 +1,2 @@
+admin:Qg266hq/YYKe2
+guest:gbPc4vPCH.h12

data/spec/integration/fixtures/server.cert

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/zCCAeegAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxDjAMBgNVBAMMBVN1YkNB
+MB4XDTA0MDEzMTAzMTMxNloXDTMzMDEyMzAzMTMxNlowQzELMAkGA1UEBgwCSlAx
+EjAQBgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMRIwEAYDVQQDDAlsb2Nh
+bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFJTxWqup3nV9dsJAku
+p+WaXnPNIzcpAA3qMGZDJTJsfa8Du7ZxTP0XJK5mETttBrn711cJxAuP3KjqnW9S
+vtZ9lY2sXJ6Zj62sN5LwG3VVe25dI28yR1EsbHjJ5Zjf9tmggMC6am52dxuHbt5/
+vHo4ngJuKE/U+eeGRivMn6gFAgMBAAGjgYUwgYIwDAYDVR0TAQH/BAIwADAxBglg
+hkgBhvhCAQ0EJBYiUnVieS9PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+BgNVHQ4EFgQUpZIyygD9JxFYHHOTEuWOLbCKfckwCwYDVR0PBAQDAgWgMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4IBAQBwAIj5SaBHaA5X31IP
+CFCJiep96awfp7RANO0cuUj+ZpGoFn9d6FXY0g+Eg5wAkCNIzZU5NHN9xsdOpnUo
+zIBbyTfQEPrge1CMWMvL6uGaoEXytq84VTitF/xBTky4KtTn6+es4/e7jrrzeUXQ
+RC46gkHObmDT91RkOEGjHLyld2328jo3DIN/VTHIryDeVHDWjY5dENwpwdkhhm60
+DR9IrNBbXWEe9emtguNXeN0iu1ux0lG1Hc6pWGQxMlRKNvGh0yZB9u5EVe38tOV0
+jQaoNyL7qzcQoXD3Dmbi1p0iRmg/+HngISsz8K7k7MBNVsSclztwgCzTZOBiVtkM
+rRlQ
+-----END CERTIFICATE-----

data/spec/integration/fixtures/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDRSU8Vqrqd51fXbCQJLqflml5zzSM3KQAN6jBmQyUybH2vA7u2
+cUz9FySuZhE7bQa5+9dXCcQLj9yo6p1vUr7WfZWNrFyemY+trDeS8Bt1VXtuXSNv
+MkdRLGx4yeWY3/bZoIDAumpudncbh27ef7x6OJ4CbihP1PnnhkYrzJ+oBQIDAQAB
+AoGBAIf4CstW2ltQO7+XYGoex7Hh8s9lTSW/G2vu5Hbr1LTHy3fzAvdq8MvVR12O
+rk9fa+lU9vhzPc0NMB0GIDZ9GcHuhW5hD1Wg9OSCbTOkZDoH3CAFqonjh4Qfwv5W
+IPAFn9KHukdqGXkwEMdErsUaPTy9A1V/aROVEaAY+HJgq/eZAkEA/BP1QMV04WEZ
+Oynzz7/lLizJGGxp2AOvEVtqMoycA/Qk+zdKP8ufE0wbmCE3Qd6GoynavsHb6aGK
+gQobb8zDZwJBANSK6MrXlrZTtEaeZuyOB4mAmRzGzOUVkUyULUjEx2GDT93ujAma
+qm/2d3E+wXAkNSeRpjUmlQXy/2oSqnGvYbMCQQDRM+cYyEcGPUVpWpnj0shrF/QU
+9vSot/X1G775EMTyaw6+BtbyNxVgOIu2J+rqGbn3c+b85XqTXOPL0A2RLYkFAkAm
+syhSDtE9X55aoWsCNZY/vi+i4rvaFoQ/WleogVQAeGVpdo7/DK9t9YWoFBIqth0L
+mGSYFu9ZhvZkvQNV8eYrAkBJ+rOIaLDsmbrgkeDruH+B/9yrm4McDtQ/rgnOGYnH
+LjLpLLOrgUxqpzLWe++EwSLwK2//dHO+SPsQJ4xsyQJy
+-----END RSA PRIVATE KEY-----

data/spec/integration/fixtures/subca.pem

@@ -0,0 +1,21 @@
+-----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-----

data/spec/integration/request_spec.rb

@@ -78,7 +78,20 @@ describe HTTPI do
   end
 
   HTTPI::Adapter::ADAPTERS.keys.each do |adapter|
-    unless adapter == :curb && RUBY_PLATFORM =~ /java/
+    if adapter == :em_http && RUBY_VERSION >= "1.9.0"
+
+      around(:each) do |example|
+        # Only wrap the example for the :em_http adapter
+        if EM.respond_to?(:synchrony)
+          EM.synchrony do
+            example.run
+            EM.stop
+          end
+        end
+      end
+    end
+
+    unless (adapter == :curb && RUBY_PLATFORM =~ /java/) || (adapter == :em_http && RUBY_VERSION =~ /1\.8/)
       context "using :#{adapter}" do
         let(:adapter) { adapter }
         it_should_behave_like "an HTTP client"
@@ -88,7 +101,7 @@ describe HTTPI do
   end
 
   (HTTPI::Adapter::ADAPTERS.keys - [:net_http]).each do |adapter|
-    unless adapter == :curb && RUBY_PLATFORM =~ /java/
+    unless (adapter == :curb && RUBY_PLATFORM =~ /java/) || adapter == :em_http
       context "using :#{adapter}" do
         let(:adapter) { adapter }
         it_should_behave_like "it works with HTTP digest auth"

data/spec/integration/ssl_server.rb

@@ -0,0 +1,70 @@
+require "webrick/https"
+require "logger"
+require "cgi"
+
+# https://github.com/asakusarb/odrk-http-client
+class SSLServer < WEBrick::HTTPServer
+  DIR = File.dirname(__FILE__)
+
+  def initialize(host, port)
+    @logger = Logger.new($stderr)
+    @logger.level = Logger::Severity::FATAL
+
+    super(
+      :BindAddress          => host,
+      :Logger               => logger,
+      :Port                 => port,
+      :AccessLog            => [],
+      :DocumentRoot         => DIR,
+      :SSLEnable            => true,
+      :SSLCACertificateFile => File.join(DIR, "fixtures", "ca.pem"),
+      :SSLCertificate       => cert("server.cert"),
+      :SSLPrivateKey        => key("server.key"),
+      :SSLVerifyClient      => nil, #OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT|OpenSSL::SSL::VERIFY_PEER,
+      :SSLClientCA          => nil,
+      :SSLCertName          => nil
+    )
+
+    self.mount(
+      "/hello",
+      WEBrick::HTTPServlet::ProcHandler.new(method("do_hello").to_proc)
+    )
+
+    @server_thread = start_server_thread(self)
+  end
+
+  def shutdown
+    super
+    @server_thread.join if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+  end
+
+  private
+
+  def cert(filename)
+    OpenSSL::X509::Certificate.new File.read(File.join(DIR, "fixtures", filename))
+  end
+
+  def key(filename)
+    OpenSSL::PKey::RSA.new File.read(File.join(DIR, "fixtures", filename))
+  end
+
+  def start_server_thread(server)
+    t = Thread.new { server.start }
+
+    while server.status != :Running
+      Thread.pass
+      unless t.alive?
+        t.join
+        raise
+      end
+    end
+
+    t
+  end
+
+  def do_hello(req, res)
+    res["Content-Type"] = "text/plain"
+    res.body = "hello ssl"
+  end
+
+end

data/spec/integration/ssl_spec.rb

@@ -0,0 +1,102 @@
+require "spec_helper"
+require "httpi"
+require "integration/ssl_server"
+
+describe "SSL authentication" do
+
+  before :all do
+    WebMock.allow_net_connect!
+
+    @host = "localhost"
+    @port = 17171
+    @ssl_port = 17172
+    @proxy_port = 17173
+
+    @url = "http://#{@host}:#{@port}/"
+    @ssl_url = "https://localhost:#{@ssl_port}/"
+    @ssl_fake_url = "https://127.0.0.1:#{@ssl_port}/"
+    @proxy_url = "http://#{@host}:#{@proxy_port}/"
+
+    @ssl_server = SSLServer.new(@host, @ssl_port)
+  end
+
+  def teardown
+    @ssl_server.shutdown if @ssl_server
+  end
+
+  HTTPI::Adapter::ADAPTERS.keys.each do |adapter|
+    context "with #{adapter}" do
+
+      if adapter == :em_http && RUBY_VERSION =~ /1\.8/
+        # em_http depends on fibers
+      elsif adapter == :curb && RUBY_PLATFORM =~ /java/
+        # curb does not run on jruby
+      elsif adapter == :em_http && RUBY_VERSION >= "1.9.0" && RUBY_PLATFORM =~ /java/
+        it "fails for whatever reason"
+      else
+
+        if adapter == :em_http && RUBY_VERSION >= "1.9.0"
+          # dependencies are loaded upon request, so we need to manually require this
+          require "em-synchrony"
+
+          around(:each) do |example|
+            EM.synchrony do
+              example.run
+              EM.stop
+            end
+          end
+        end
+
+        # 105 ssl
+        if adapter == :httpclient || adapter == :curb
+          it "raises when no certificate was set up" do
+            expect { HTTPI.post(@ssl_url + "hello", "", adapter) }.
+              to raise_error(HTTPI::SSLError)
+          end
+        else
+          if adapter == :net_http && RUBY_VERSION >= "1.9"
+            it "raises in 1.9, but does not raise in 1.8"
+          else
+            it "does not raise when no certificate was set up" do
+              expect { HTTPI.post(@ssl_url + "hello", "", adapter) }.
+                to_not raise_error(HTTPI::SSLError)
+            end
+          end
+        end
+
+        # 106 ssl ca
+        it "works when set up properly" do
+          unless adapter == :em_http
+            ca_file = File.expand_path("../fixtures/ca_all.pem", __FILE__)
+            request = HTTPI::Request.new(@ssl_url + "hello")
+            request.auth.ssl.ca_cert_file = ca_file
+
+            response = HTTPI.get(request, adapter)
+            expect(response.body).to eq("hello ssl")
+          end
+        end
+
+        # 107 ssl hostname
+        if adapter == :em_http
+          it "raises when configured for ssl client auth" do
+            ca_file = File.expand_path("../fixtures/ca_all.pem", __FILE__)
+            request = HTTPI::Request.new(@ssl_fake_url + "hello")
+            request.auth.ssl.ca_cert_file = ca_file
+
+            expect { HTTPI.get(request, adapter) }.
+              to raise_error(HTTPI::NotSupportedError, "EM-HTTP-Request does not support SSL client auth")
+          end
+        else
+          it "raises when the server could not be verified" do
+            ca_file = File.expand_path("../fixtures/ca_all.pem", __FILE__)
+            request = HTTPI::Request.new(@ssl_fake_url + "hello")
+            request.auth.ssl.ca_cert_file = ca_file
+
+            expect { HTTPI.get(request, adapter) }.to raise_error(HTTPI::SSLError)
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/support/fixture.rb

@@ -17,7 +17,7 @@ class Fixture
       @dime ||= load :xml_dime, :dime
     end
 
-  private
+    private
 
     def load(fixture, type = :xml)
       File.read File.expand_path("../../fixtures/#{fixture}.#{type}", __FILE__)

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: -342245774
+  prerelease: 6
   segments: 
+  - 2
+  - 0
+  - 0
+  - rc
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,10 +18,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-01 00:00:00 Z
+date: 2012-11-10 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,104 +31,71 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id001
   name: rack
-  type: :runtime
   prerelease: false
-  requirement: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 25
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 9
+        version: "0.9"
+  version_requirements: *id002
   name: rake
-  type: :development
   prerelease: false
-  requirement: *id002
+  type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 21
         segments: 
         - 2
-        - 7
-        version: "2.7"
+        - 11
+        version: "2.11"
+  version_requirements: *id003
   name: rspec
-  type: :development
   prerelease: false
-  requirement: *id003
+  type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 19
         segments: 
         - 0
-        - 9
-        - 9
-        version: 0.9.9
+        - 12
+        version: "0.12"
+  version_requirements: *id004
   name: mocha
-  type: :development
   prerelease: false
-  requirement: *id004
+  type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 31
         segments: 
         - 1
-        - 4
-        - 0
-        version: 1.4.0
+        - 8
+        version: "1.8"
+  version_requirements: *id005
   name: webmock
-  type: :development
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: autotest
   type: :development
-  prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 4
-        - 5
-        - 0
-        version: 4.5.0
-  name: ZenTest
-  type: :development
-  prerelease: false
-  requirement: *id007
-description: HTTPI provides a common interface for Ruby HTTP libraries.
+description: HTTPI provides a common interface for Ruby's HTTP libraries
 email: me@rubiii.com
 executables: []
 
@@ -136,6 +106,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .rvmrc
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -145,7 +116,9 @@ files:
 - httpi.gemspec
 - lib/httpi.rb
 - lib/httpi/adapter.rb
+- lib/httpi/adapter/base.rb
 - lib/httpi/adapter/curb.rb
+- lib/httpi/adapter/em_http.rb
 - lib/httpi/adapter/httpclient.rb
 - lib/httpi/adapter/net_http.rb
 - lib/httpi/auth/config.rb
@@ -163,7 +136,9 @@ files:
 - spec/fixtures/xml.xml
 - spec/fixtures/xml_dime.dime
 - spec/fixtures/xml_dime.xml
+- spec/httpi/adapter/base_spec.rb
 - spec/httpi/adapter/curb_spec.rb
+- spec/httpi/adapter/em_http_spec.rb
 - spec/httpi/adapter/httpclient_spec.rb
 - spec/httpi/adapter/net_http_spec.rb
 - spec/httpi/adapter_spec.rb
@@ -174,12 +149,22 @@ files:
 - spec/httpi/httpi_spec.rb
 - spec/httpi/request_spec.rb
 - spec/httpi/response_spec.rb
+- spec/integration/fixtures/ca.pem
+- spec/integration/fixtures/ca_all.pem
+- spec/integration/fixtures/htdigest
+- spec/integration/fixtures/htpasswd
+- spec/integration/fixtures/server.cert
+- spec/integration/fixtures/server.key
+- spec/integration/fixtures/subca.pem
 - spec/integration/request_spec.rb
 - spec/integration/server.rb
+- spec/integration/ssl_server.rb
+- spec/integration/ssl_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture.rb
 - spec/support/matchers.rb
-homepage: http://github.com/rubiii/httpi
+has_rdoc: true
+homepage: http://github.com/savonrb/httpi
 licenses: []
 
 post_install_message: 
@@ -199,18 +184,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: httpi
-rubygems_version: 1.8.21
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Interface for Ruby HTTP libraries
+summary: Common interface for Ruby's HTTP libraries
 test_files: []