httpi 0.7.8 → 0.7.9

data/lib/httpi/adapter.rb

@@ -10,6 +10,7 @@ module HTTPI
   #
   # * httpclient
   # * curb
+  # * net/http
   module Adapter
 
     # The default adapter.

data/lib/httpi/adapter/curb.rb

@@ -79,6 +79,7 @@ module HTTPI
         client.cert_key = ssl.cert_key_file
         client.cert = ssl.cert_file
         client.cacert = ssl.ca_cert_file if ssl.ca_cert_file
+        client.certtype = ssl.cert_type.to_s.upcase
         client.ssl_verify_peer = ssl.verify_mode == :peer
       end
 

data/lib/httpi/auth/ssl.rb

@@ -9,6 +9,7 @@ module HTTPI
     class SSL
 
       VERIFY_MODES = [:none, :peer, :fail_if_no_peer_cert, :client_once]
+      CERT_TYPES = [:pem, :der]
 
       # Returns whether SSL configuration is present.
       def present?
@@ -16,7 +17,7 @@ module HTTPI
       rescue TypeError, Errno::ENOENT
         false
       end
-
+      
       # Accessor for the cert key file to validate SSL certificates.
       attr_accessor :cert_key_file
 
@@ -28,7 +29,18 @@ module HTTPI
 
       # Accessor for the cacert file to validate SSL certificates.
       attr_accessor :ca_cert_file
-
+      
+      # Returns the cert type to validate SSL certificates PEM|DER.
+      def cert_type
+        @cert_type ||= :pem
+      end
+      
+      # Sets the cert type to validate SSL certificates PEM|DER.
+      def cert_type=(type)
+        raise ArgumentError, "Invalid SSL cert type: #{type}" unless CERT_TYPES.include? type
+        @cert_type = type
+      end
+      
       # Returns the SSL verify mode. Defaults to <tt>:peer</tt>.
       def verify_mode
         @verify_mode ||= :peer

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -199,6 +199,14 @@ describe HTTPI::Adapter::Curb do
         curb.expects(:cert_key=).with(ssl_auth_request.auth.ssl.cert_key_file)
         curb.expects(:cert=).with(ssl_auth_request.auth.ssl.cert_file)
         curb.expects(:ssl_verify_peer=).with(true)
+        curb.expects(:certtype=).with(ssl_auth_request.auth.ssl.cert_type.to_s.upcase)
+        
+        adapter.get(ssl_auth_request)
+      end
+      
+      it "should set the cert_type to DER if specified" do
+        ssl_auth_request.auth.ssl.cert_type = :der
+        curb.expects(:certtype=).with(:der.to_s.upcase)
         
         adapter.get(ssl_auth_request)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 +01:00
+date: 2011-01-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency