httpi 0.5.0 → 0.6.0

data/spec/httpi/request_spec.rb

@@ -5,15 +5,15 @@ describe HTTPI::Request do
   let(:request) { HTTPI::Request.new }
 
   describe ".new" do
-    it "accepts a Hash of accessors to set" do
-      request = HTTPI::Request.new :url => "http://example.com", :open_timeout => 30
+    it "should accept just a url" do
+      request = HTTPI::Request.new "http://example.com"
       request.url.should == URI("http://example.com")
-      request.open_timeout.should == 30
     end
 
-    it "accepts a Hash of authentication credentials to set" do
-      request = HTTPI::Request.new :basic_auth => ["username", "password"]
-      request.basic_auth.should == ["username", "password"]
+    it "should accept a Hash of accessors to set" do
+      request = HTTPI::Request.new :url => "http://example.com", :open_timeout => 30
+      request.url.should == URI("http://example.com")
+      request.open_timeout.should == 30
     end
   end
 
@@ -49,6 +49,29 @@ describe HTTPI::Request do
     end
   end
 
+  describe "#ssl" do
+    it "should return false if no request url was specified" do
+      request.should_not be_ssl
+    end
+
+    it "should return false if the request url does not start with https" do
+      request.url = "http://example.com"
+      request.should_not be_ssl
+    end
+
+    it "should return true if the request url starts with https" do
+      request.url = "https://example.com"
+      request.should be_ssl
+    end
+
+    context "with an explicit value" do
+      it "should return the value" do
+        request.ssl = true
+        request.should be_ssl
+      end
+    end
+  end
+
   describe "#headers" do
     it "lets you specify a Hash of HTTP request headers" do
       request.headers = { "Accept-Encoding" => "gzip" }
@@ -88,83 +111,25 @@ describe HTTPI::Request do
     end
   end
 
-  describe "#basic_auth" do
-    it "lets you specify the basic auth credentials" do
-      request.basic_auth "username", "password"
-      request.basic_auth.should == ["username", "password"]
-    end
-   
-    it "also accepts an Array of credentials" do
-      request.basic_auth ["username", "password"]
-      request.basic_auth.should == ["username", "password"]
-    end
-
-    it "lets you reset the credentials" do
-      request.basic_auth "username", "password"
-      request.basic_auth.should == ["username", "password"]
-
-      request.basic_auth nil
-      request.basic_auth.should be_nil
-    end
-  end
-
-  describe "#digest_auth" do
-    it "lets you specify the digest auth credentials" do
-      request.digest_auth "username", "password"
-      request.digest_auth.should == ["username", "password"]
+  describe "#auth" do
+    it "should return the authentication object" do
+      request.auth.should be_an(HTTPI::Auth::Config)
     end
-   
-    it "also accepts an Array of credentials" do
-      request.digest_auth ["username", "password"]
-      request.digest_auth.should == ["username", "password"]
-    end
-
-    it "lets you reset the credentials" do
-      request.digest_auth "username", "password"
-      request.digest_auth.should == ["username", "password"]
 
-      request.digest_auth nil
-      request.digest_auth.should be_nil
+    it "should memoize the authentication object" do
+      request.auth.should equal(request.auth)
     end
   end
 
   describe "#auth?" do
-    it "should return false unless any authentication credentials were specified" do
-      request.auth?.should be_false
-    end
-
-    it "should return true if HTTP basic auth authentication credentials were specified" do
-      request.basic_auth "username", "password"
+    it "should return true when auth credentials are specified" do
+      request.auth.basic "username", "password"
       request.auth?.should be_true
     end
 
-    it "should return true if HTTP digest auth authentication credentials were specified" do
-      request.digest_auth "username", "password"
-      request.auth?.should be_true
-    end
-  end
-
-  describe "#credentials" do
-    it "return the credentials for HTTP basic auth" do
-      request.basic_auth "username", "basic"
-      request.credentials.should == ["username", "basic"]
-    end
-
-    it "return the credentials for HTTP digest auth" do
-      request.digest_auth "username", "digest"
-      request.credentials.should == ["username", "digest"]
+    it "should return false otherwise" do
+      request.auth?.should be_false
     end
   end
 
-  describe "#auth_type" do
-    it "should return :basic for HTTP basic auth" do
-      request.basic_auth "username", "password"
-      request.auth_type.should == :basic
-    end
-
-    it "should return :digest for HTTP basic auth" do
-      request.digest_auth "username", "password"
-      request.auth_type.should == :digest
-    end
-  end
 end

data/spec/integration/request_spec.rb

@@ -48,7 +48,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.basic_auth @username, @password
+      request.auth.basic @username, @password
 
       response = HTTPI.get request, adapter
       response.body.should_not include(@error_message)
@@ -56,9 +56,9 @@ describe HTTPI do
   end
 
   shared_examples_for "it works with HTTP digest auth" do
-    it "requires a username and password" do
+    it "and access a secured page" do
       request = HTTPI::Request.new :url => "http://test.webdav.org/auth-digest/"
-      request.digest_auth @username, @password
+      request.auth.digest @username, @password
 
       response = HTTPI.get request, adapter
       response.body.should_not include(@error_message)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +02:00
+date: 2010-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,16 +57,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196431
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        version: 2.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -101,7 +99,7 @@ dependencies:
         version: 1.3.5
   type: :development
   version_requirements: *id005
-description: HTTPI provides a common interface for different HTTP libraries.
+description: HTTPI provides a common interface for Ruby HTTP libraries.
 email: me@rubiii.com
 executables: []
 
@@ -122,16 +120,22 @@ files:
 - 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
 - spec/fixtures/xml.xml
 - spec/httpi/adapter/curb_spec.rb
 - spec/httpi/adapter/httpclient_spec.rb
 - spec/httpi/adapter/net_http_spec.rb
 - spec/httpi/adapter_spec.rb
+- spec/httpi/auth/config_spec.rb
+- spec/httpi/auth/ssl_spec.rb
 - spec/httpi/httpi_spec.rb
 - spec/httpi/request_spec.rb
 - spec/httpi/response_spec.rb