excon 0.39.3 → 0.39.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjUyYzk4Mzc5ZWNhZjc2ZmY1OTFhNjEwMWZjMDQyMGY2MWZmZGFhMg==
+    YTI3MWJmMGU1ZTg0OTg2ZWIwOTAyNzM4MTk2NWJkOTIwZjgwOGFkZg==
   data.tar.gz: !binary |-
-    YzhkZWViOWYyNjY1ZGRhYmVmODY4YTk0N2M5YWI3NmQ3NWUxMGFkZA==
+    MmZkOTNlY2Q4MzU1NmVhYmNjZWU3NmYyYzZkNTFiMTliM2M1ZWNmMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTVlMTFiNjFlNDEzNWI0NGNmZWJhNmU4ODYwYmI2ZDc3ZDNhOGY0ZTllMGY1
-    YWQ2NWFlOGZmM2I5MjJjZWI5M2Q5MTNlNmNjNjY4M2MwMTljZDk3ZTgwNTlk
-    YzU5NTc2Zjg5YmMxM2U2YjY1YzAyMTQ1ZjM4NjM4MWVkNWNmZmQ=
+    OTYyYTE2YTRhNjcyZTBhZTQ4ODhkYjI2MDAwN2U3NWZjYTBlYjhkYTFjMjdj
+    ZTc3NjJlNmNmZmIxNzY5ZmYwNjA1ZWNhYjhlNmU5ZjAxNTg3YjQwNTgwYmFj
+    OTc2Mjc3MGE3ODU0MTM4N2YxMDA5MmY3NjQ0OGYwZWEyNDYxNWI=
   data.tar.gz: !binary |-
-    MjI0Yzg2MDY1MWQ2YWYwMTg1MGFiYTZmOGUwOTVmMjQzZGZiZTAzNjY0Nzhi
-    N2EzNGU3YTRmYmJkYmRlZDllMzcyMzI2MDRlZTNiNWQyZDViNTQ4YjAzY2Q4
-    YzVkNzQ3ZTZiOTE4MmViZTg2NDZmZWYzY2Q3MjE0NmY1NThmZWY=
+    NjE0MmRlMjM2OGM4MzkzNTc1YjU1OTU2NGY5YmNhMDIwNjdlNGFlNjUzMzRi
+    NzdmNjAxMzVhMTkxNjllM2EwYWU4OGU3NDBlN2NjNmM0NDIxNTY1NTU1OTAz
+    MWYyYTg5NTFlMjUwYzRhMDlkYWYxYTUyYTk5YWI3N2U5MjM4MzI=

data/Gemfile.lock

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

data/README.md

@@ -344,6 +344,19 @@ For debugging purposes you can also use Excon::StandardInstrumentor to output al
 
 See [the documentation for ActiveSupport::Notifications](http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html) for more detail on using the subscription interface.  See excon's [instrumentation_test.rb](https://github.com/excon/excon/blob/master/tests/middlewares/instrumentation_tests.rb) for more examples of instrumenting excon.
 
+## HTTPS client certificate
+
+You can supply a client side certificate if the server requires it for authentication:
+
+```ruby
+connection = Excon.new('https://example.com',
+                       client_cert: 'mycert.pem',
+                       client_key: 'mycert.key',
+                       client_key_pass: 'my pass phrase')
+```
+
+`client_key_pass` is optional.
+
 ## HTTPS/SSL Issues
 
 By default excon will try to verify peer certificates when using SSL for HTTPS. Unfortunately on some operating systems the defaults will not work. This will likely manifest itself as something like `Excon::Errors::SocketError: SSL_connect returned=1 ...`

data/changelog.txt

@@ -1,3 +1,9 @@
+0.39.4 08/08/2014
+=================
+
+ensure Response#new uses case-insensitive headers
+add client cert pass phrase support
+
 0.39.3 08/05/2014
 =================
 

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.39.3'
-  s.date              = '2014-08-05'
+  s.version           = '0.39.4'
+  s.date              = '2014-08-08'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.39.3'
+  VERSION = '0.39.4'
 
   CR_NL = "\r\n"
 

data/lib/excon/headers.rb

@@ -14,6 +14,8 @@ module Excon
     alias_method :raw_include?, :include?
     alias_method :raw_key?, :key?
     alias_method :raw_member?, :member?
+    alias_method :raw_merge, :merge
+    alias_method :raw_merge!, :merge!
     alias_method :raw_rehash, :rehash
     alias_method :raw_store, :store
     alias_method :raw_values_at, :values_at
@@ -57,9 +59,20 @@ module Excon
       raw_key?(key) || @downcased.has_key?(key.downcase)
     end
 
+    def merge(other_hash)
+      self.dup.merge!(other_hash)
+    end
+
+    def merge!(other_hash)
+      other_hash.each do |key, value|
+        self[key] = value
+      end
+      raw_merge!(other_hash)
+    end
+
     def rehash
-      raw_rehash
       @downcased.rehash
+      raw_rehash
     end
 
     def values_at(*keys)

data/lib/excon/response.rb

@@ -159,9 +159,10 @@ module Excon
 
     def initialize(params={})
       @data = {
-        :body     => '',
-        :headers  => Excon::Headers.new
+        :body     => ''
       }.merge(params)
+      @data[:headers] = Excon::Headers.new.merge!(params[:headers] || {})
+
       @body          = @data[:body]
       @headers       = @data[:headers]
       @status        = @data[:status]

data/lib/excon/ssl_socket.rb

@@ -63,13 +63,14 @@ module Excon
       # maintain existing API
       certificate_path = @data[:client_cert] || @data[:certificate_path]
       private_key_path = @data[:client_key] || @data[:private_key_path]
+      private_key_pass = @data[:client_key_pass] || @data[:private_key_pass]
 
       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))
+        ssl_context.key = OpenSSL::PKey::RSA.new(File.read(private_key_path), private_key_pass)
       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])
+        ssl_context.key = OpenSSL::PKey::RSA.new(@data[:private_key], private_key_pass)
       end
 
       if @data[:proxy]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.39.3
+  version: 0.39.4
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport