httpi 0.6.0 → 0.6.1

data/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+.yardoc
+doc
+coverage
+tmp
+*~
+*.gem
+.bundle
+Gemfile.lock

data/README.md

@@ -121,6 +121,10 @@ HTTPI::Auth
     request = HTTPI::Request.new
     request.auth.basic "username", "password"
 
+### TODO
+
+* Add support for NTLM authentication
+
 HTTPI::Auth::SSL
 ----------------
 
@@ -138,10 +142,6 @@ HTTPI::Auth::SSL
     request.auth.ssl.cert_file = "client_cert.pem"
     request.auth.ssl.verify_mode = :none
 
-### TODO
-
-* Add support for NTLM authentication
-
 HTTPI::Adapter
 --------------
 

data/httpi.gemspec

@@ -0,0 +1,26 @@
+lib = File.expand_path("../lib/", __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require "httpi/version"
+
+Gem::Specification.new do |s|
+  s.name = "httpi"
+  s.version = HTTPI::VERSION
+  s.authors = ["Daniel Harrington", "Martin Tepper"]
+  s.email = "me@rubiii.com"
+  s.homepage = "http://github.com/rubiii/#{s.name}"
+  s.summary = "Interface for Ruby HTTP libraries"
+  s.description = "HTTPI provides a common interface for Ruby HTTP libraries."
+
+  s.rubyforge_project = s.name
+
+  s.add_development_dependency "httpclient", "~> 2.1.5"
+  s.add_development_dependency "curb", "~> 0.7.8"
+
+  s.add_development_dependency "rspec", "2.0.0"
+  s.add_development_dependency "mocha", "~> 0.9.9"
+  s.add_development_dependency "webmock", "~> 1.4.0"
+
+  s.files = `git ls-files`.split("\n")
+  s.require_path = "lib"
+end

data/lib/httpi/adapter/curb.rb

@@ -85,7 +85,34 @@ module HTTPI
       end
 
       def respond_with(client)
-        Response.new client.response_code, client.headers, client.body_str
+        status, headers = parse_header_string(client.header_str)
+        Response.new client.response_code, headers, client.body_str
+      end
+
+      # Borrowed from Webmock's Curb adapter:
+      # http://github.com/bblimke/webmock/blob/master/lib/webmock/http_lib_adapters/curb.rb
+      def parse_header_string(header_string)
+        status, headers = nil, {}
+        return [status, headers] unless header_string
+        
+        header_string.split(/\r\n/).each do |header|
+          if header =~ %r|^HTTP/1.[01] \d\d\d (.*)|
+            status = $1
+          else
+            parts = header.split(':', 2)
+            unless parts.empty?
+              parts[1].strip! unless parts[1].nil?
+              if headers.has_key?(parts[0])
+                headers[parts[0]] = [headers[parts[0]]] unless headers[parts[0]].kind_of? Array
+                headers[parts[0]] << parts[1]
+              else
+                headers[parts[0]] = parts[1]
+              end
+            end
+          end
+        end
+        
+        [status, headers]
       end
 
     end

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], response.content
+        Response.new response.code, Hash[response.header.all.flatten], response.content
       end
 
     end

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -19,7 +19,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_get)
       curb.expects(:response_code).returns(200)
-      curb.expects(:headers).returns(Hash.new)
+      curb.expects(:header_str).returns("")
       curb.expects(:body_str).returns(Fixture.xml)
     end
 
@@ -32,7 +32,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_post)
       curb.expects(:response_code).returns(200)
-      curb.expects(:headers).returns(Hash.new)
+      curb.expects(:header_str).returns("")
       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(:headers).returns(Hash.new)
+      curb.expects(:header_str).returns("")
       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(:headers).returns(Hash.new)
+      curb.expects(:header_str).returns("")
       curb.expects(:body_str).returns(Fixture.xml)
     end
 
@@ -71,7 +71,7 @@ describe HTTPI::Adapter::Curb do
     before do
       curb.expects(:http_delete)
       curb.expects(:response_code).returns(200)
-      curb.expects(:headers).returns(Hash.new)
+      curb.expects(:header_str).returns("")
       curb.expects(:body_str).returns("")
     end
 

data/spec/httpi/httpi_spec.rb

@@ -207,7 +207,7 @@ describe HTTPI do
 
     describe ".#{method}" do
       it "should raise an ArgumentError in case of an invalid adapter" do
-        lambda { client.request method, request, :invalid }.should raise_error(ArgumentError)
+        lambda { client.request method, HTTPI::Request.new, :invalid }.should raise_error(ArgumentError)
       end
 
       it "should raise an ArgumentError in case of an invalid request" do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require "mocha"
 require "webmock/rspec"
 
 RSpec.configure do |config|
-  config.include WebMock
+  config.include WebMock::API
   config.mock_with :mocha
 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
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +02:00
+date: 2010-11-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 0
         - 9
-        - 8
-        version: 0.9.8
+        - 9
+        version: 0.9.9
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -91,12 +91,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 7
         segments: 
         - 1
-        - 3
-        - 5
-        version: 1.3.5
+        - 4
+        - 0
+        version: 1.4.0
   type: :development
   version_requirements: *id005
 description: HTTPI provides a common interface for Ruby HTTP libraries.
@@ -108,24 +108,25 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .autotest
+- .gitignore
+- .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
-- Rakefile
 - README.md
-- .autotest
-- .rspec
+- Rakefile
 - autotest/discover.rb
+- httpi.gemspec
+- lib/httpi.rb
+- lib/httpi/adapter.rb
 - lib/httpi/adapter/curb.rb
 - lib/httpi/adapter/httpclient.rb
 - lib/httpi/adapter/net_http.rb
-- lib/httpi/adapter.rb
 - lib/httpi/auth/config.rb
 - lib/httpi/auth/ssl.rb
 - lib/httpi/request.rb
 - lib/httpi/response.rb
 - lib/httpi/version.rb
-- lib/httpi.rb
 - spec/fixtures/client_cert.pem
 - spec/fixtures/client_key.pem
 - spec/fixtures/xml.gz

data/Gemfile.lock

@@ -1,40 +0,0 @@
-PATH
-  remote: .
-  specs:
-    httpi (0.5.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.1)
-    crack (0.1.8)
-    curb (0.7.8)
-    diff-lcs (1.1.2)
-    httpclient (2.1.5.2)
-    mocha (0.9.8)
-      rake
-    rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-    webmock (1.3.5)
-      addressable (>= 2.1.1)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  curb (~> 0.7.8)
-  httpclient (~> 2.1.5)
-  httpi!
-  mocha (~> 0.9.8)
-  rspec (~> 2.0.0)
-  webmock (~> 1.3.5)