httpi 0.9.2 → 0.9.3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.9.3 (2010-04-28)
+
+* Fix: [issue 31](https://github.com/rubiii/httpi/issues/31) missing headers when using httpclient.
+
+* Fix: [issue 30](https://github.com/rubiii/httpi/issues/30) fix for using SSL with Net::HTTP.
+
+## 0.9.2 (2011-04-05)
+
+* Fix: issues [161](https://github.com/rubiii/savon/issues/161) and [165](https://github.com/rubiii/savon/issues/165)
+  reported at [rubiii/savon](https://github.com/rubiii/savon).
+
 ## 0.9.1 (2011-04-04)
 
 * Fix: [issue 25](https://github.com/rubiii/httpi/issues/22) problem with HTTPI using the Net::HTTP adapter [hakanensari].

data/httpi.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rack"
   s.add_dependency "ntlm-http", ">= 0.1.1"
 
-  s.add_development_dependency "httpclient", "~> 2.1.5"
+  s.add_development_dependency "httpclient", "~> 2.1.7"
   s.add_development_dependency "curb", "~> 0.7.8"
 
   s.add_development_dependency "rspec", "~> 2.2"

data/lib/httpi/adapter.rb

@@ -48,10 +48,6 @@ module HTTPI
       end
 
       def default_adapter
-        return :httpclient if defined?(::HTTPClient)
-        return :curb if defined?(::Curl::Easy)
-        return :net_http if defined?(::Net::HTTP)
-
         DEPENDENCIES.each do |(adapter, dependencies)|
           begin
             dependencies.each { |dependency| require dependency }

data/lib/httpi/adapter/httpclient.rb

@@ -90,7 +90,7 @@ module HTTPI
       end
 
       def respond_with(response)
-        Response.new response.code, Hash[response.header.all.flatten], response.content
+        Response.new response.code, Hash[*response.header.all.flatten], response.content
       end
 
     end

data/lib/httpi/adapter/net_http.rb

@@ -9,7 +9,7 @@ module HTTPI
     # Adapter for the Net::HTTP client.
     # http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/
     class NetHTTP
-      
+
       def initialize(request)
         self.client = new_client request
       end
@@ -70,7 +70,7 @@ module HTTPI
       def do_request(type, request)
         setup_client request
         setup_ssl_auth request.auth.ssl if request.auth.ssl?
-        
+
         respond_with(client.start do |http|
           yield http, request_client(type, request)
         end)
@@ -88,7 +88,6 @@ module HTTPI
         client.ca_file = ssl.ca_cert_file if ssl.ca_cert_file
         client.verify_mode = ssl.openssl_verify_mode
       end
-      
 
       def request_client(type, request)
         request_class = case type
@@ -98,20 +97,21 @@ module HTTPI
           when :put    then Net::HTTP::Put
           when :delete then Net::HTTP::Delete
         end
-        
+
         request_client = request_class.new request.url.request_uri, request.headers
-        
+
         request_client.basic_auth *request.auth.credentials if request.auth.basic?
         request_client.ntlm_auth *request.auth.credentials if request.auth.ntlm?
-        
+
         request_client
       end
 
       def respond_with(response)
         headers = response.to_hash
-        headers.each {|k,v| headers[k] = v[0]}
+        headers.each { |key, value| headers[key] = value[0] }
         Response.new response.code, headers, response.body
       end
+
     end
   end
 end

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -12,7 +12,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_get)
       curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("")
+      curb.expects(:header_str).returns("Accept-encoding: utf-8")
       curb.expects(:body_str).returns(Fixture.xml)
     end
 
@@ -25,7 +25,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_post)
       curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("")
+      curb.expects(:header_str).returns("Accept-encoding: utf-8")
       curb.expects(:body_str).returns(Fixture.xml)
     end
 
@@ -45,7 +45,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_head)
       curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("")
+      curb.expects(:header_str).returns("Accept-encoding: utf-8")
       curb.expects(:body_str).returns(Fixture.xml)
     end
 
@@ -58,7 +58,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_put)
       curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("")
+      curb.expects(:header_str).returns("Accept-encoding: utf-8")
       curb.expects(:body_str).returns(Fixture.xml)
     end
 
@@ -78,7 +78,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_delete)
       curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("")
+      curb.expects(:header_str).returns("Accept-encoding: utf-8")
       curb.expects(:body_str).returns("")
     end
 
@@ -105,7 +105,7 @@ describe HTTPI::Adapter::Curb do
 
       it "should be set if specified" do
         request = basic_request { |request| request.proxy = "http://proxy.example.com" }
-        
+
         curb.expects(:proxy_url=).with(request.proxy.to_s)
         adapter.get(request)
       end
@@ -156,14 +156,14 @@ describe HTTPI::Adapter::Curb do
     describe "http_auth_types" do
       it "should be set to :basic for HTTP basic auth" do
         request = basic_request { |request| request.auth.basic "username", "password" }
-        
+
         curb.expects(:http_auth_types=).with(:basic)
         adapter.get(request)
       end
 
       it "should be set to :digest for HTTP digest auth" do
         request = basic_request { |request| request.auth.digest "username", "password" }
-        
+
         curb.expects(:http_auth_types=).with(:digest)
         adapter.get(request)
       end
@@ -172,7 +172,7 @@ describe HTTPI::Adapter::Curb do
     describe "username and password" do
       it "should be set for HTTP basic auth" do
         request = basic_request { |request| request.auth.basic "username", "password" }
-        
+
         curb.expects(:username=).with("username")
         curb.expects(:password=).with("password")
         adapter.get(request)
@@ -180,7 +180,7 @@ describe HTTPI::Adapter::Curb do
 
       it "should be set for HTTP digest auth" do
         request = basic_request { |request| request.auth.digest "username", "password" }
-        
+
         curb.expects(:username=).with("username")
         curb.expects(:password=).with("password")
         adapter.get(request)
@@ -200,21 +200,21 @@ describe HTTPI::Adapter::Curb do
         curb.expects(:cert=).with(ssl_auth_request.auth.ssl.cert_file)
         curb.expects(:ssl_verify_peer=).with(true)
         curb.expects(:certtype=).with(ssl_auth_request.auth.ssl.cert_type.to_s.upcase)
-        
+
         adapter.get(ssl_auth_request)
       end
-      
+
       it "should set the cert_type to DER if specified" do
         ssl_auth_request.auth.ssl.cert_type = :der
         curb.expects(:certtype=).with(:der.to_s.upcase)
-        
+
         adapter.get(ssl_auth_request)
       end
 
       it "should set the cacert if specified" do
         ssl_auth_request.auth.ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
         curb.expects(:cacert=).with(ssl_auth_request.auth.ssl.ca_cert_file)
-        
+
         adapter.get(ssl_auth_request)
       end
     end

data/spec/httpi/adapter/httpclient_spec.rb

@@ -150,7 +150,9 @@ describe HTTPI::Adapter::HTTPClient do
   end
 
   def http_message(body = Fixture.xml)
-    HTTP::Message.new_response body
+    message = HTTP::Message.new_response body
+    message.header.set "Accept-encoding", "utf-8"
+    message
   end
 
   def basic_request

data/spec/httpi/adapter/net_http_spec.rb

@@ -4,6 +4,7 @@ require "httpi/request"
 
 describe HTTPI::Adapter::NetHTTP do
   let(:net_http) { Net::HTTP.any_instance }
+  let(:basic_response) { { :body => Fixture.xml, :headers => { "Accept-encoding" => "utf-8" } } }
 
   def adapter(request)
     @adapter ||= HTTPI::Adapter::NetHTTP.new request
@@ -11,7 +12,7 @@ describe HTTPI::Adapter::NetHTTP do
 
   describe "#get" do
     it "should return a valid HTTPI::Response" do
-      stub_request(:get, basic_request.url.to_s).to_return(:body => Fixture.xml)
+      stub_request(:get, basic_request.url.to_s).to_return(basic_response)
       adapter(basic_request).get(basic_request).should match_response(:body => Fixture.xml)
     end
   end
@@ -19,32 +20,36 @@ describe HTTPI::Adapter::NetHTTP do
   describe "#post" do
     it "should return a valid HTTPI::Response" 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)
-      
+      stub_request(:post, request.url.to_s).with(:body => request.body).to_return(basic_response)
+
       adapter(request).post(request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#head" do
     it "should return a valid HTTPI::Response" do
-      stub_request(:head, basic_request.url.to_s).to_return(:body => Fixture.xml)
+      stub_request(:head, basic_request.url.to_s).to_return(basic_response)
       adapter(basic_request).head(basic_request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#put" do
     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)
-      
+      request = HTTPI::Request.new(
+        :url     => "http://example.com",
+        :headers => { "Accept-encoding" => "utf-8" },
+        :body    => Fixture.xml
+      )
+      stub_request(:put, request.url.to_s).with(:body => request.body).to_return(basic_response)
+
       adapter(request).put(request).should match_response(:body => Fixture.xml)
     end
   end
 
   describe "#delete" do
     it "should return a valid HTTPI::Response" do
-      stub_request(:delete, basic_request.url.to_s)
-      adapter(basic_request).delete(basic_request).should match_response(:body => "")
+      stub_request(:delete, basic_request.url.to_s).to_return(basic_response)
+      adapter(basic_request).delete(basic_request).should match_response(:body => Fixture.xml)
     end
   end
 
@@ -59,7 +64,7 @@ describe HTTPI::Adapter::NetHTTP do
 
       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
@@ -73,7 +78,7 @@ describe HTTPI::Adapter::NetHTTP do
 
       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
@@ -87,7 +92,7 @@ describe HTTPI::Adapter::NetHTTP do
 
       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
@@ -96,7 +101,7 @@ describe HTTPI::Adapter::NetHTTP do
     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)
@@ -115,14 +120,14 @@ describe HTTPI::Adapter::NetHTTP 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

data/spec/support/matchers.rb

@@ -1,11 +1,19 @@
 RSpec::Matchers.define :match_response do |options|
-  defaults = { :code => 200, :headers => {}, :body => "" }
+  defaults = { :code => 200, :headers => { "Accept-encoding" => "utf-8" }, :body => "" }
   response = defaults.merge options
-  
+
   match do |actual|
     actual.should be_an(HTTPI::Response)
     actual.code.should == response[:code]
-    actual.headers.should == response[:headers]
+    downcase(actual.headers).should == downcase(response[:headers])
     actual.body.should == response[:body]
   end
+
+  def downcase(hash)
+    hash.inject({}) do |memo, (key, value)|
+      memo[key.downcase] = value.downcase
+      memo
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +02:00
+date: 2011-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 5
         segments: 
         - 2
         - 1
-        - 5
-        version: 2.1.5
+        - 7
+        version: 2.1.7
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: httpi
-rubygems_version: 1.4.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Interface for Ruby HTTP libraries