excon 0.23.0 → 0.24.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.23.0)
+    excon (0.24.0)
 
 GEM
   remote: http://rubygems.org/

data/changelog.txt

@@ -1,3 +1,8 @@
+0.24.0 06/12/2013
+=================
+
+allow passing ssl creds as strings or file paths
+
 0.23.0 06/10/2013
 =================
 

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.23.0'
-  s.date              = '2013-06-10'
+  s.version           = '0.24.0'
+  s.date              = '2013-06-12'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/constants.rb

@@ -35,6 +35,8 @@ module Excon
     :chunk_size,
     :client_key,
     :client_cert,
+    :certificate,
+    :private_key,
     :connect_timeout,
     :connection,
     :debug_request,
@@ -75,7 +77,7 @@ module Excon
     :write_timeout
   ]
 
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO

data/lib/excon/ssl_socket.rb

@@ -24,9 +24,16 @@ module Excon
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-      if @data.has_key?(:client_cert) && @data.has_key?(:client_key)
-        ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@data[:client_cert]))
-        ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@data[:client_key]))
+      # maintain existing API
+      certificate_path = @data[:client_cert] || @data[:certificate_path]
+      private_key_path = @data[:client_key] || @data[:private_key_path]
+
+      if certificate_path && private_key_path
+        ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(certificate_path))
+        ssl_context.key = OpenSSL::PKey::RSA.new(File.read(private_key_path))
+      elsif @data.has_key?(:certificate) && @data.has_key?(:private_key)
+        ssl_context.cert = OpenSSL::X509::Certificate.new(@data[:certificate])
+        ssl_context.key = OpenSSL::PKey::RSA.new(@data[:private_key])
       end
 
       if @data[:proxy]

data/tests/basic_tests.rb

@@ -52,7 +52,7 @@ with_rackup('ssl.ru') do
 end
 
 with_rackup('ssl_verify_peer.ru') do
-  Shindo.tests('Excon basics (ssl)',['focus']) do
+  Shindo.tests('Excon basics (ssl file)',['focus']) do
     connection = Excon::Connection.new({
       :host             => '127.0.0.1',
       :nonblock         => false,
@@ -69,5 +69,41 @@ with_rackup('ssl_verify_peer.ru') do
                 :client_key => File.join(File.dirname(__FILE__), 'data', 'excon.cert.key'),
                 :client_cert => File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt')
                )
+
+  end
+
+  Shindo.tests('Excon basics (ssl file paths)',['focus']) do
+    connection = Excon::Connection.new({
+      :host             => '127.0.0.1',
+      :nonblock         => false,
+      :port             => 8443,
+      :scheme           => 'https',
+      :ssl_verify_peer  => false
+    })
+
+    tests('GET /content-length/100').raises(Excon::Errors::SocketError) do
+      connection.request(:method => :get, :path => '/content-length/100')
+    end
+
+    basic_tests('https://127.0.0.1:8443',
+                :private_key_path => File.join(File.dirname(__FILE__), 'data', 'excon.cert.key'),
+                :certificate_path => File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt')
+               )
+
+  end
+
+  Shindo.tests('Excon basics (ssl string)', ['focus']) do
+    connection = Excon::Connection.new({
+      :host             => '127.0.0.1',
+      :nonblock         => false,
+      :port             => 8443,
+      :scheme           => 'https',
+      :ssl_verify_peer  => false
+    })
+
+    basic_tests('https://127.0.0.1:8443',
+                :private_key => File.read(File.join(File.dirname(__FILE__), 'data', 'excon.cert.key')),
+                :certificate => File.read(File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt'))
+               )
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -235,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3656231066806112421
+      hash: -4031892834274388538
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: