httpi 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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)
 
 * Feature: [#66](https://github.com/savonrb/httpi/pull/66) adds a `query` method

data/lib/httpi/adapter/httpclient.rb

@@ -63,7 +63,15 @@ module HTTPI
       end
 
       def respond_with(response)
-        Response.new response.code, Hash[*response.header.all.flatten], response.content
+        headers = {}
+        response.header.all.each do |(header, value)|
+          if headers.key?(header)
+            headers[header] = Array(headers[header]) << value
+          else
+            headers[header] = value
+          end
+        end
+        Response.new response.code, headers, response.content
       end
 
     end

data/lib/httpi/adapter/net_http.rb

@@ -92,7 +92,9 @@ module HTTPI
 
       def respond_with(response)
         headers = response.to_hash
-        headers.each { |key, value| headers[key] = value[0] }
+        headers.each do |key, value|
+          headers[key] = value[0] if value.size <= 1
+        end
         Response.new response.code, headers, response.body
       end
 

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 
 end

data/spec/integration/curb_spec.rb

@@ -25,6 +25,14 @@ describe HTTPI::Adapter::Curb do
         response.body.should include("HTTPI")
       end
 
+      it "it supports headers with multiple values" do
+        request = HTTPI::Request.new(@server.url + "cookies")
+
+        response = HTTPI.get(request, adapter)
+        cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
+        response.headers["Set-Cookie"].should eq(cookies)
+      end
+
       it "executes GET requests" do
         response = HTTPI.get(@server.url, adapter)
         response.body.should eq("get")

data/spec/integration/em_http_spec.rb

@@ -34,6 +34,14 @@ describe HTTPI::Adapter::EmHttpRequest do
         response.body.should include("HTTPI")
       end
 
+      it "it supports headers with multiple values" do
+        request = HTTPI::Request.new(@server.url + "cookies")
+
+        response = HTTPI.get(request, adapter)
+        cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
+        response.headers["Set-Cookie"].should eq(cookies)
+      end
+
       it "executes GET requests" do
         response = HTTPI.get(@server.url, adapter)
         response.body.should eq("get")

data/spec/integration/httpclient_spec.rb

@@ -22,6 +22,14 @@ describe HTTPI::Adapter::HTTPClient do
       response.body.should include("HTTPI")
     end
 
+    it "it supports headers with multiple values" do
+      request = HTTPI::Request.new(@server.url + "cookies")
+
+      response = HTTPI.get(request, adapter)
+      cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
+      response.headers["Set-Cookie"].should eq(cookies)
+    end
+
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
       response.body.should eq("get")

data/spec/integration/net_http_spec.rb

@@ -22,6 +22,14 @@ describe HTTPI::Adapter::NetHTTP do
       response.body.should include("HTTPI")
     end
 
+    it "it supports headers with multiple values" do
+      request = HTTPI::Request.new(@server.url + "cookies")
+
+      response = HTTPI.get(request, adapter)
+      cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
+      response.headers["Set-Cookie"].should eq(cookies)
+    end
+
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
       response.body.should eq("get")

data/spec/integration/support/application.rb

@@ -26,6 +26,17 @@ class IntegrationServer
       }
     end
 
+    map "/cookies" do
+      run lambda { |env|
+        status, headers, body = IntegrationServer.respond_with("Many Cookies")
+        response = Rack::Response.new(body, status, headers)
+
+        response.set_cookie("cookie1", {:value => "chip1", :path => "/"})
+        response.set_cookie("cookie2", {:value => "chip2", :path => "/"})
+        response.finish
+      }
+    end
+
     map "/basic-auth" do
       use Rack::Auth::Basic, "basic-realm" do |username, password|
         username == "admin" && password == "secret"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -511386314545034600
+      hash: -1005658617748404150
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -511386314545034600
+      hash: -1005658617748404150
 requirements: []
 rubyforge_project: httpi
 rubygems_version: 1.8.24