httpi 0.7.3 → 0.7.4

data/Gemfile

@@ -1,2 +1,6 @@
 source :rubygems
 gemspec
+
+group :test do
+  gem "mock-server", :git => "git://github.com/ichverstehe/mock-server.git", :branch => "custom-class"
+end

data/httpi.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   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 "rspec", "~> 2.2"
   s.add_development_dependency "mocha", "~> 0.9.9"
   s.add_development_dependency "webmock", "~> 1.4.0"
 

data/lib/httpi/adapter/curb.rb

@@ -68,7 +68,7 @@ module HTTPI
         client.proxy_url = request.proxy.to_s if request.proxy
         client.timeout = request.read_timeout if request.read_timeout
         client.connect_timeout = request.open_timeout if request.open_timeout
-        client.headers = request.headers
+        client.headers = request.headers.to_hash
         client.verbose = false
       end
 

data/lib/httpi/version.rb

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

data/spec/integration/request_spec.rb

@@ -1,51 +1,57 @@
 require "spec_helper"
 require "httpi"
+require "integration/server"
+
+MockServer.new(IntegrationServer, 4000).start
 
 describe HTTPI do
   let(:client) { HTTPI }
 
-  # Uses example.com for basic request methods and webdav.org
-  # for HTTP basic and digest authentication.
-  #
-  # http://example.com
-  # http://test.webdav.org
-
   before :all do
     WebMock.allow_net_connect!
     
-    @username = @password = "user1"
+    @username = "admin"
+    @password = "pwd"
     @error_message = "Authorization Required"
-    @example_web_page = "Example Web Page"
-    @content_type = "text/html"
+    @example_web_page = "Hello"
+    @content_type = "text/plain"
   end
 
   shared_examples_for "an HTTP client" do
+    it "and send HTTP headers" do
+      request = HTTPI::Request.new :url => "http://localhost:4000/x-header"
+      request.headers["X-Header"] = "HTTPI"
+
+      response = HTTPI.get request, adapter
+      response.body.should include("X-Header is HTTPI")
+    end
+
     it "and execute an HTTP GET request" do
-      response = HTTPI.get "http://example.com", adapter
+      response = HTTPI.get "http://localhost:4000", 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 = HTTPI.post "http://localhost:4000", "<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 = HTTPI.head "http://localhost:4000", 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 = HTTPI.put "http://localhost:4000", "<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 = HTTPI.delete "http://localhost:4000", adapter
       response.body.should include("DELETE is not allowed")
       response.headers["Content-Type"].should include(@content_type)
     end
@@ -53,7 +59,7 @@ describe HTTPI do
 
   shared_examples_for "it works with HTTP basic auth" do
     it "and access a secured page" do
-      request = HTTPI::Request.new :url => "http://test.webdav.org/auth-basic/"
+      request = HTTPI::Request.new :url => "http://localhost:4000/auth/basic"
       request.auth.basic @username, @password
 
       response = HTTPI.get request, adapter
@@ -63,7 +69,7 @@ describe HTTPI do
 
   shared_examples_for "it works with HTTP digest auth" do
     it "and access a secured page" do
-      request = HTTPI::Request.new :url => "http://test.webdav.org/auth-digest/"
+      request = HTTPI::Request.new :url => "http://localhost:4000/auth/digest"
       request.auth.digest @username, @password
 
       response = HTTPI.get request, adapter

data/spec/integration/server.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+require "mock_server"
+
+IntegrationServer = Rack::Builder.new do
+  map "/" do
+    run lambda {|env|
+      case env["REQUEST_METHOD"]
+      when "HEAD" then
+        [200, {"Content-Type" => "text/plain", "Content-Length" => "5"}, []]
+      when "GET", "POST" then
+        [200, {"Content-Type" => "text/plain", "Content-Length" => "5"}, ["Hello"]]
+      when "PUT", "DELETE"
+        body = "#{env["REQUEST_METHOD"]} is not allowed"
+        [200, {"Content-Type" => "text/plain", "Content-Length" => body.size.to_s}, [body]]
+      end
+    }
+  end
+
+  map "/x-header" do
+    run lambda {|env|
+      body = "X-Header is #{env["HTTP_X_HEADER"]}"
+      [200, {"Content-Type" => "text/plain", "Content-Length" => body.size.to_s}, [body]]
+    }
+  end
+
+  map "/auth" do
+    map "/basic" do
+      run Rack::Auth::Basic do |user, password|
+        user == "admin" && password == "secret"
+      end
+    end
+
+    map "/digest" do
+      run Rack::Auth::Digest::MD5 do |username|
+        {"admin" => "pwd"}[username]
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,14 +71,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 2
+        version: "2.2"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -159,6 +158,7 @@ files:
 - spec/httpi/request_spec.rb
 - spec/httpi/response_spec.rb
 - spec/integration/request_spec.rb
+- spec/integration/server.rb
 - spec/spec_helper.rb
 - spec/support/fixture.rb
 - spec/support/matchers.rb