httpi 0.7.2 → 0.7.3

data/httpi.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = s.name
 
+  s.add_dependency "rack"
+
   s.add_development_dependency "httpclient", "~> 2.1.5"
   s.add_development_dependency "curb", "~> 0.7.8"
 

data/lib/httpi/adapter/httpclient.rb

@@ -92,7 +92,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], response.content
       end
 
     end

data/lib/httpi/adapter/net_http.rb

@@ -106,9 +106,10 @@ module HTTPI
       end
 
       def respond_with(response)
-        Response.new response.code, response.to_hash, response.body
+        headers = response.to_hash
+        headers.each {|k,v| headers[k] = v[0]}
+        Response.new response.code, headers, response.body
       end
-
     end
   end
 end

data/lib/httpi/request.rb

@@ -1,5 +1,6 @@
 require "uri"
 require "httpi/auth/config"
+require "rack/utils"
 
 module HTTPI
 
@@ -47,11 +48,13 @@ module HTTPI
 
     # Returns a Hash of HTTP headers. Defaults to return an empty Hash.
     def headers
-      @headers ||= {}
+      @headers ||= Rack::Utils::HeaderHash.new
     end
 
     # Sets the Hash of HTTP headers.
-    attr_writer :headers
+    def headers=(headers)
+      @headers = Rack::Utils::HeaderHash.new(headers)
+    end
 
     # Adds a header information to accept gzipped content.
     def gzip

data/lib/httpi/response.rb

@@ -1,6 +1,7 @@
 require "zlib"
 require "stringio"
 require "httpi/dime"
+require "rack/utils"
 
 module HTTPI
 
@@ -15,7 +16,7 @@ module HTTPI
     # Initializer expects an HTTP response +code+, +headers+ and +body+.
     def initialize(code, headers, body)
       self.code = code.to_i
-      self.headers = headers
+      self.headers = Rack::Utils::HeaderHash.new(headers)
       self.raw_body = body
     end
 

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 
 end

data/spec/integration/request_spec.rb

@@ -16,32 +16,38 @@ describe HTTPI do
     @username = @password = "user1"
     @error_message = "Authorization Required"
     @example_web_page = "Example Web Page"
+    @content_type = "text/html"
   end
 
   shared_examples_for "an HTTP client" do
     it "and execute an HTTP GET request" do
       response = HTTPI.get "http://example.com", adapter
       response.body.should include(@example_web_page)
+      response.headers["Content-Type"].should include(@content_type)
     end
 
     it "and execute an HTTP POST request" do
       response = HTTPI.post "http://example.com", "<some>xml</some>", adapter
       response.body.should include(@example_web_page)
+      response.headers["Content-Type"].should include(@content_type)
     end
 
     it "and execute an HTTP HEAD request" do
       response = HTTPI.head "http://example.com", adapter
       response.code.should == 200
+      response.headers["Content-Type"].should include(@content_type)
     end
 
     it "and execute an HTTP PUT request" do
       response = HTTPI.put "http://example.com", "<some>xml</some>", adapter
       response.body.should include("PUT is not allowed")
+      response.headers["Content-Type"].should include(@content_type)
     end
 
     it "and execute an HTTP DELETE request" do
       response = HTTPI.delete "http://example.com", adapter
       response.body.should include("DELETE is not allowed")
+      response.headers["Content-Type"].should include(@content_type)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,13 +16,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 +01:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: httpclient
+  name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,11 +48,11 @@ dependencies:
         - 5
         version: 2.1.5
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: curb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,11 +64,11 @@ dependencies:
         - 8
         version: 0.7.8
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -66,11 +80,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,11 +96,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,7 +112,7 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: HTTPI provides a common interface for Ruby HTTP libraries.
 email: me@rubiii.com
 executables: []