httpi 2.0.2 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c3d93398828eb1001de0ffda175e251a037fb4f4
+  data.tar.gz: 581d420ec8ca101e584d841a47e02e5e7fb5b58e
+SHA512:
+  metadata.gz: 37348af815f82aff80b024c08eb191b0ce4a2d9e6d05a5be22a8570dbe1c74683a37ff79e70d91cdc3c68fdabead56b7004871d261054f1fb2adb427b548ffb2
+  data.tar.gz: 2a41f0b5b86595280e23dbce2524d7badb438ec00e7fa1e11ea0b46c7bde52801cde382e9f49691a55cca260b55b2a255285e9af8d7ef778476ab289ecea8828

data/CHANGELOG.md

@@ -1,14 +1,40 @@
-## 2.0.2 (2013-01-26)
+### 2.1.0 (2013-07-22)
+
+* Feature: [#75](https://github.com/savonrb/httpi/pull/75) Rack adapter.
+
+* Feature: [#91](https://github.com/savonrb/httpi/pull/91) New excon adapter.
+
+* Feature: [#92](https://github.com/savonrb/httpi/pull/92) New net-http-persistent adapter.
+
+* Feature: [#87](https://github.com/savonrb/httpi/pull/87) NTLM support with full domain and server authentication.
+
+* Feature: [#71](https://github.com/savonrb/httpi/pull/71) chunked responses.
+
+* Fix: [#81](https://github.com/savonrb/httpi/issues/81) send SSL client certificate
+  even when `:ssl_verify_mode` is set to `:none`.
+
+* Fix: [#69](https://github.com/savonrb/httpi/issues/69) truncating response headers.
+
+* Fix: [#88](https://github.com/savonrb/httpi/issues/88) timeout and proxy options
+  are now properly passed to the EM-HTTP-Request client.
+
+* Fix: [#69](https://github.com/savonrb/httpi/issues/69) Fixes a problem where the response headers were truncated.
+
+* Fix: [#90](https://github.com/savonrb/httpi/issues/90) we now raise an error if
+  you try to use Net::HTTP with HTTP digest authentication, because Net::HTTP does
+  not support digest authentication.
+
+### 2.0.2 (2013-01-26)
 
 * Feature: Changed `HTTPI::Request#set_cookies` to accept an Array of `HTTPI::Cookie`
   objects as well as any object that responds to `cookies` (like an `HTTPI::Response`).
 
-## 2.0.1 (2013-01-25)
+### 2.0.1 (2013-01-25)
 
 * Fix: [#72](https://github.com/savonrb/httpi/pull/72) standardized response
   headers from all adapters.
 
-## 2.0.0 (2012-12-16)
+### 2.0.0 (2012-12-16)
 
 * Feature: [#66](https://github.com/savonrb/httpi/pull/66) adds a `query` method
   to the request.
@@ -16,7 +42,7 @@
 * Fix: [#68](https://github.com/savonrb/httpi/issues/68) request does not yield
   adapter client.
 
-## 2.0.0.rc1 (2012-11-10)
+### 2.0.0.rc1 (2012-11-10)
 
 * Feature: [#63](https://github.com/savonrb/httpi/pull/63) adds support for
   EventMachine::HttpRequest. Additional information at [#40](https://github.com/savonrb/httpi/pull/40).
@@ -41,17 +67,17 @@
 
 * Refactoring: Simplified the adapter interface.
 
-## 1.1.1 (2012-07-01)
+### 1.1.1 (2012-07-01)
 
 * Fix: [#56](https://github.com/savonrb/httpi/pull/56) ensures that the "Cookie"
   header is not set to nil.
 
-## 1.1.0 (2012-06-26)
+### 1.1.0 (2012-06-26)
 
 * Refactoring: Moved code that sets the cookies from the last response for the
   next request from Savon to `HTTPI::Request#set_cookies`.
 
-## 1.0.0 (2012-06-07)
+### 1.0.0 (2012-06-07)
 
 * Feature: [#48](https://github.com/savonrb/httpi/pull/48) @jheiss added support
   for HTTP Negotiate/SPNEGO authentication (curb-specific).
@@ -59,7 +85,7 @@
 * Fix: [#53](https://github.com/savonrb/httpi/issues/53) fixed an issue where
   `HTTPI.log_level` did not do anything at all.
 
-## 0.9.7 (2012-04-26)
+### 0.9.7 (2012-04-26)
 
 * Fix: Merged [pull request 49](https://github.com/savonrb/httpi/pull/49) so that cert
   and cert_key can be manually set.
@@ -67,7 +93,7 @@
 * Fix: Stop auto-detecting gzipped responses by inspecting the response body to allow
   response compression only.
 
-## 0.9.6 (2012-02-23)
+### 0.9.6 (2012-02-23)
 
 * Feature: Merged [pull request 46](https://github.com/savonrb/httpi/pull/46) to support
   request body Hashes. Fixes [issue 45](https://github.com/savonrb/httpi/issues/45).
@@ -86,13 +112,13 @@
   [issue 26](https://github.com/savonrb/httpi/issues/26) and probably also
   [issue 32](https://github.com/savonrb/httpi/issues/32) - SSL client authentication.
 
-## 0.9.5 (2011-06-30)
+### 0.9.5 (2011-06-30)
 
 * Improvement: Moved support for NTLM authentication into a separate gem.
   Since NTLM support caused quite some problems for people who didn't even
   need it, I decided to move it into httpi-ntlm until it's stable.
 
-## 0.9.4 (2011-05-15)
+### 0.9.4 (2011-05-15)
 
 * Fix: issues [34](https://github.com/savonrb/httpi/issues/34) and
   [29](https://github.com/savonrb/httpi/issues/29) - replaced the dependency
@@ -105,22 +131,22 @@
 
       HTTPI.adapter = :net_http
 
-## 0.9.3 (2011-04-28)
+### 0.9.3 (2011-04-28)
 
 * Fix: [issue 31](https://github.com/savonrb/httpi/issues/31) missing headers when using httpclient.
 
 * Fix: [issue 30](https://github.com/savonrb/httpi/issues/30) fix for using SSL with Net::HTTP.
 
-## 0.9.2 (2011-04-05)
+### 0.9.2 (2011-04-05)
 
 * Fix: issues [161](https://github.com/savonrb/savon/issues/161) and [165](https://github.com/savonrb/savon/issues/165)
   reported at [savonrb/savon](https://github.com/savonrb/savon).
 
-## 0.9.1 (2011-04-04)
+### 0.9.1 (2011-04-04)
 
 * Fix: [issue 25](https://github.com/savonrb/httpi/issues/22) problem with HTTPI using the Net::HTTP adapter [hakanensari].
 
-## 0.9.0 (2011-03-08)
+### 0.9.0 (2011-03-08)
 
 * Feature: improved the adapter loading process ([d4a091](https://github.com/savonrb/httpi/commit/d4a091)) [rubiii].
 
@@ -138,7 +164,7 @@
 
 * Fix: [issue 23](https://github.com/savonrb/httpi/issues/23) the HTTPI.log method now works as expected [rubiii].
 
-## 0.8.0 (2011-03-07)
+### 0.8.0 (2011-03-07)
 
 * Feature: added support for NTLM authentication ([96ceb1](https://github.com/savonrb/httpi/commit/96ceb1)) [MattHall].
 

data/Gemfile

@@ -1,10 +1,16 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
-gem "jruby-openssl",                                :platforms => :jruby
+gem 'jruby-openssl',                                       :platforms => :jruby
 
 # http clients
-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 '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 'net-http-persistent', '~> 2.8',    :require => false
+
+# coverage
+gem 'simplecov',                        :require => false
+gem 'coveralls',                        :require => false

data/README.md

@@ -1,13 +1,17 @@
-HTTPI [![Build Status](https://secure.travis-ci.org/savonrb/httpi.png)](http://travis-ci.org/savonrb/httpi)
-=====
+# HTTPI
 
-HTTPI provides a common interface for Ruby's HTTP libraries.
+A common interface for Ruby's HTTP libraries.
 
 [Documentation](http://httpirb.com) | [RDoc](http://rubydoc.info/gems/httpi) |
 [Mailing list](https://groups.google.com/forum/#!forum/httpirb)
 
-Installation
-------------
+[![Build Status](https://secure.travis-ci.org/savonrb/httpi.png?branch=master)](http://travis-ci.org/savonrb/httpi)
+[![Gem Version](https://badge.fury.io/rb/httpi.png)](http://badge.fury.io/rb/httpi)
+[![Code Climate](https://codeclimate.com/github/savonrb/httpi.png)](https://codeclimate.com/github/savonrb/httpi)
+[![Coverage Status](https://coveralls.io/repos/savonrb/httpi/badge.png?branch=master)](https://coveralls.io/r/savonrb/httpi)
+
+
+## Installation
 
 HTTPI is available through [Rubygems](http://rubygems.org/gems/httpi) and can be installed via:
 
@@ -15,9 +19,15 @@ HTTPI is available through [Rubygems](http://rubygems.org/gems/httpi) and can be
 $ gem install httpi
 ```
 
+or add it to your Gemfile like this:
+
+```
+gem 'httpi', '~> 2.1.0'
+```
+
+
+## Usage example
 
-Introduction
-------------
 
 ``` ruby
 require "httpi"
@@ -39,7 +49,7 @@ HTTPI.adapter = :httpclient
 HTTPI.request(:custom, request)
 ```
 
-Documentation
--------------
+
+## Documentation
 
 Continue reading at [httpirb.com](http://httpirb.com)

data/httpi.gemspec

@@ -15,11 +15,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = s.name
 
   s.add_dependency "rack"
+  s.add_dependency "rubyntlm", "~> 0.3.2"
 
   s.add_development_dependency "rake",  "~> 10.0"
   s.add_development_dependency "rspec", "~> 2.12"
   s.add_development_dependency "mocha", "~> 0.13"
-  s.add_development_dependency "puma",  ">= 2.0.0.b3"
+  s.add_development_dependency "puma",  "~> 2.3.2"
 
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"

data/lib/httpi.rb

@@ -5,8 +5,11 @@ require "httpi/request"
 
 require "httpi/adapter/httpclient"
 require "httpi/adapter/curb"
+require "httpi/adapter/excon"
 require "httpi/adapter/net_http"
+require "httpi/adapter/net_http_persistent"
 require "httpi/adapter/em_http"
+require "httpi/adapter/rack"
 
 # = HTTPI
 #

data/lib/httpi/adapter.rb

@@ -13,7 +13,7 @@ module HTTPI
     ADAPTERS = {}
     ADAPTER_CLASS_MAP = {}
 
-    LOAD_ORDER = [:httpclient, :curb, :em_http, :net_http]
+    LOAD_ORDER = [:httpclient, :curb, :em_http, :excon, :net_http, :net_http_persistent]
 
     class << self
 

data/lib/httpi/adapter/curb.rb

@@ -29,6 +29,8 @@ module HTTPI
           arguments << (@request.body || "")
         end
 
+        client.on_body(&@request.on_body) if @request.on_body
+
         do_request { |client| client.send(*arguments) }
       rescue Curl::Err::SSLCACertificateError
         raise SSLError
@@ -49,6 +51,11 @@ module HTTPI
 
       def setup_client
         basic_setup
+
+        if @request.auth.ntlm?
+          raise NotSupportedError, "curb does not support NTLM authentication"
+        end
+
         setup_http_auth if @request.auth.http?
         setup_gssnegotiate_auth if @request.auth.gssnegotiate?
         setup_ssl_auth if @request.auth.ssl?
@@ -80,12 +87,14 @@ module HTTPI
         ssl = @request.auth.ssl
 
         unless ssl.verify_mode == :none
-          @client.cert_key = ssl.cert_key_file
-          @client.cert = ssl.cert_file
           @client.cacert = ssl.ca_cert_file if ssl.ca_cert_file
           @client.certtype = ssl.cert_type.to_s.upcase
         end
 
+        # Send client-side certificate regardless of state of SSL verify mode
+        @client.cert_key = ssl.cert_key_file
+        @client.cert = ssl.cert_file
+
         @client.ssl_verify_peer = ssl.verify_mode == :peer
         @client.ssl_version = case ssl.ssl_version
           when :TLSv1 then 1

data/lib/httpi/adapter/em_http.rb

@@ -33,7 +33,7 @@ module HTTPI
 
       def initialize(request)
         @request = request
-        @client = EventMachine::HttpRequest.new build_request_url(request.url)
+        @client = EventMachine::HttpRequest.new build_request_url(request.url), connection_options
       end
 
       attr_reader :client
@@ -54,29 +54,41 @@ module HTTPI
 
       def _request
         options = client_options
-        setup_proxy(options) if @request.proxy
         setup_http_auth(options) if @request.auth.http?
 
         if @request.auth.ssl?
           raise NotSupportedError, "EM-HTTP-Request does not support SSL client auth"
         end
 
+        if @request.on_body
+          raise NotSupportedError, "EM-HTTP-Request does not support response streaming"
+        end
+
         start_time = Time.now
         respond_with yield(options), start_time
       end
 
+      def connection_options
+        options = {
+          :connect_timeout    => @request.open_timeout,
+          :inactivity_timeout => @request.read_timeout
+        }
+
+        options[:proxy] = proxy_options if @request.proxy
+
+        options
+      end
+
       def client_options
         {
-          :query              => @request.url.query,
-          :connect_timeout    => @request.open_timeout,
-          :inactivity_timeout => @request.read_timeout,
-          :head               => @request.headers.to_hash,
-          :body               => @request.body
+          :query => @request.url.query,
+          :head  => @request.headers.to_hash,
+          :body  => @request.body
         }
       end
 
-      def setup_proxy(options)
-        options[:proxy] = {
+      def proxy_options
+        {
           :host          => @request.proxy.host,
           :port          => @request.proxy.port,
           :authorization => [@request.proxy.user, @request.proxy.password]

data/lib/httpi/adapter/excon.rb

@@ -0,0 +1,80 @@
+require "httpi/adapter/base"
+require "httpi/response"
+
+module HTTPI
+  module Adapter
+
+    # = HTTPI::Adapter::Excon
+    #
+    # Adapter for the Excon client.
+    # https://github.com/geemus/excon
+    class Excon < Base
+
+      register :excon, :deps => %w(excon)
+
+      def initialize(request)
+        @request = request
+        @client  = ::Excon::Connection.new client_opts
+      end
+
+      attr_reader :client
+
+      # Executes arbitrary HTTP requests.
+      # @see HTTPI.request
+      def request(method)
+        respond_with @client.send(method)
+      rescue ::Excon::Errors::SocketError => e
+        case e.message
+        when /verify certificate/
+          raise SSLError
+        else
+          $!.extend ConnectionError
+        end
+        raise
+      end
+
+      private
+
+      def client_opts
+        url  = @request.url
+        ssl  = @request.auth.ssl
+
+        opts = {
+          :host => url.host,
+          :path => url.path,
+          :port => url.port.to_s,
+          :query => url.query,
+          :scheme => url.scheme,
+          :headers => @request.headers,
+          :body => @request.body
+        }
+
+        if @request.auth.digest?
+          raise NotSupportedError, "excon does not support HTTP digest authentication"
+        elsif @request.auth.ntlm?
+          raise NotSupportedError, "excon does not support NTLM authentication"
+        end
+
+        opts[:user], opts[:password] = *@request.auth.credentials if @request.auth.basic?
+        opts[:connect_timeout] = @request.open_timeout if @request.open_timeout
+        opts[:read_timeout]    = @request.read_timeout if @request.read_timeout
+        opts[:response_block]  = @request.on_body if @request.on_body
+        opts[:proxy]           = @request.proxy if @request.proxy
+
+        if ssl.verify_mode == :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
+        end
+
+        opts
+      end
+
+      def respond_with(response)
+        Response.new response.status, response.headers, response.body
+      end
+
+    end
+  end
+end

data/lib/httpi/adapter/httpclient.rb

@@ -23,7 +23,7 @@ module HTTPI
       # @see HTTPI.request
       def request(method)
         setup_client
-        respond_with @client.request(method, @request.url, nil, @request.body, @request.headers)
+        respond_with @client.request(method, @request.url, nil, @request.body, @request.headers, &@request.on_body)
       rescue OpenSSL::SSL::SSLError
         raise SSLError
       rescue Errno::ECONNREFUSED   # connection refused
@@ -35,6 +35,11 @@ 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_ssl_auth if @request.auth.ssl?
       end
@@ -52,14 +57,16 @@ module HTTPI
       def setup_ssl_auth
         ssl = @request.auth.ssl
 
-        unless ssl.verify_mode == :none
-          @client.ssl_config.client_cert = ssl.cert
-          @client.ssl_config.client_key = ssl.cert_key
-          @client.ssl_config.add_trust_ca(ssl.ca_cert_file) if ssl.ca_cert_file
+        if ssl.ca_cert_file && ssl.verify_mode != :none
+          @client.ssl_config.add_trust_ca(ssl.ca_cert_file)
         end
 
+        # Send client-side certificate regardless of state of SSL verify mode
+        @client.ssl_config.client_cert = ssl.cert
+        @client.ssl_config.client_key = ssl.cert_key
+
         @client.ssl_config.verify_mode = ssl.openssl_verify_mode
-        @client.ssl_config.ssl_version = ssl.ssl_version if ssl.ssl_version
+        @client.ssl_config.ssl_version = ssl.ssl_version.to_s if ssl.ssl_version
       end
 
       def respond_with(response)