excon 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ebf3518cde85fc3af71ea0cf17a505b2a94be1
-  data.tar.gz: be825cbf92ebc6383d2adcda8f536dd9e1c08575
+  metadata.gz: 647d29332f06eae2559b7cbf7696a8322d8d3e8f
+  data.tar.gz: a3dd6cf5992cdfd72afc431acececc4780460ea9
 SHA512:
-  metadata.gz: db487e313f577d715204046da7676e155061e5c954690217f318bf98238ae462d7a6b41b5edc4f587804c5bf4a42c7826d9fbef9ca9d3beecdff88ddc12fc0cb
-  data.tar.gz: 11f213779b3e188003abf391fe4d7304dd2a28481a6bf090c5e7b9fb6b57e3dfbbc8ab3a4162be385d67cb07cf49b1bb58f7e8f8f3c58a568fb635de9c9d3f33
+  metadata.gz: bd5e6a0818a8b9a1021a8ac38b971d13002d08c4e036cd436441931bf666fbcb16bec89b34fb2e7b527e1be3543ee63b35d1ad87f89386398f8d9e2ceb506dbc
+  data.tar.gz: c112ccbc1b761d1a68f144c13095dff7d42f07f63cb085b2afb97d81abb84be7866a4b3916929d9d15a80aab14ddbb8c4e22c17a4f874f7e1f29803cb70d34d4

data/Gemfile.lock

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

data/README.md

@@ -258,11 +258,11 @@ Or by enabling mock mode for a request.
 connection.request(:method => :get, :path => 'example', :mock => true)
 ```
 
-Add stubs by providing the request_attributes to match and response attributes to return. Response params can be specified as either a hash or block which will yield with response_params.
+Add stubs by providing the request attributes to match and response attributes to return. Response params can be specified as either a hash or block which will yield with the request params.
 
 ```ruby
 Excon.stub({}, {:body => 'body', :status => 200})
-Excon.stub({}, lambda {|request_params| :body => request_params[:body], :status => 200})
+Excon.stub({}, lambda {|request_params| {:body => request_params[:body], :status => 200}})
 ```
 
 Omitted attributes are assumed to match, so this stub will match *any* request and return an Excon::Response with a body of 'body' and status of 200.  You can add whatever stubs you might like this way and they will be checked against in the order they were added, if none of them match then excon will raise an `Excon::Errors::StubNotFound` error to let you know.
@@ -377,7 +377,6 @@ Either of these should allow you to work around the socket error and continue wi
 
 ## Getting Help
 
-* [General Documentation](http://excon.io).
 * Ask specific questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/excon).
 * Report bugs and discuss potential features in [Github issues](https://github.com/excon/excon/issues).
 

data/changelog.txt

@@ -1,3 +1,16 @@
+0.42.0 12/02/2014
+=================
+
+fix stubbing section of README
+follow redirect for all request methods
+remove unhelpful link for excon.io
+rescue/ignore illegal seek on rewind
+add ssl_cert_store option
+allow non-RSA ssl keys
+attempt to rewind request_block when idempotent
+add configurable thread safety for socket pool
+
+
 0.41.0 11/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.41.0'
-  s.date              = '2014-11-05'
+  s.version           = '0.42.0'
+  s.date              = '2014-12-02'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -158,8 +158,8 @@ module Excon
             if body.respond_to?(:binmode)
               body.binmode
             end
-            if body.respond_to?(:pos=)
-              body.pos = 0
+            if body.respond_to?(:rewind)
+              body.rewind  rescue nil
             end
             while chunk = body.read(datum[:chunk_size])
               socket.write(chunk)
@@ -384,7 +384,11 @@ module Excon
     end
 
     def sockets
-      Thread.current[:_excon_sockets] ||= {}
+      if @data[:thread_safe_sockets]
+        Thread.current[:_excon_sockets] ||= {}
+      else
+        @_excon_sockets ||= {}
+      end
     end
 
     def setup_proxy

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.41.0'
+  VERSION = '0.42.0'
 
   CR_NL = "\r\n"
 
@@ -82,11 +82,13 @@ module Excon
     :socket,
     :ssl_ca_file,
     :ssl_ca_path,
+    :ssl_cert_store,
     :ssl_verify_callback,
     :ssl_verify_peer,
     :ssl_verify_peer_host,
     :ssl_version,
     :tcp_nodelay,
+    :thread_safe_sockets,
     :uri_parser,
     :user
   ]
@@ -104,34 +106,35 @@ module Excon
   end
   # these come last as they rely on the above
   DEFAULTS = {
-    :chunk_size         => CHUNK_SIZE || DEFAULT_CHUNK_SIZE,
-    :ciphers            => 'HIGH:!SSLv2:!aNULL:!eNULL:!3DES',
-    :connect_timeout    => 60,
-    :debug_request      => false,
-    :debug_response     => false,
-    :headers            => {
+    :chunk_size           => CHUNK_SIZE || DEFAULT_CHUNK_SIZE,
+    :ciphers              => 'HIGH:!SSLv2:!aNULL:!eNULL:!3DES',
+    :connect_timeout      => 60,
+    :debug_request        => false,
+    :debug_response       => false,
+    :headers              => {
       'User-Agent' => USER_AGENT
     },
-    :idempotent         => false,
-    :instrumentor_name  => 'excon',
-    :middlewares        => [
+    :idempotent           => false,
+    :instrumentor_name    => 'excon',
+    :middlewares          => [
       Excon::Middleware::ResponseParser,
       Excon::Middleware::Expects,
       Excon::Middleware::Idempotent,
       Excon::Middleware::Instrumentor,
       Excon::Middleware::Mock
     ],
-    :mock               => false,
-    :nonblock           => true,
-    :omit_default_port  => false,
-    :persistent         => false,
-    :read_timeout       => 60,
-    :retry_limit        => DEFAULT_RETRY_LIMIT,
-    :ssl_verify_peer    => true,
-    :tcp_nodelay        => false,
-    :uri_parser         => URI,
-    :versions           => VERSIONS,
-    :write_timeout      => 60
+    :mock                 => false,
+    :nonblock             => true,
+    :omit_default_port    => false,
+    :persistent           => false,
+    :read_timeout         => 60,
+    :retry_limit          => DEFAULT_RETRY_LIMIT,
+    :ssl_verify_peer      => true,
+    :tcp_nodelay          => false,
+    :thread_safe_sockets  => true,
+    :uri_parser           => URI,
+    :versions             => VERSIONS,
+    :write_timeout        => 60
   }
 
 end

data/lib/excon/middlewares/idempotent.rb

@@ -4,8 +4,12 @@ module Excon
       def error_call(datum)
         if datum[:idempotent]
           if datum.has_key?(:request_block)
-            Excon.display_warning('Excon requests with a :request_block can not be :idempotent.')
-            datum[:idempotent] = false
+            if datum[:request_block].respond_to?(:rewind)
+              datum[:request_block].rewind
+            else
+              Excon.display_warning('Excon requests with a :request_block must implement #rewind in order to be :idempotent.')
+              datum[:idempotent] = false
+            end
           end
           if datum.has_key?(:pipeline)
             Excon.display_warning("Excon requests can not be :idempotent when pipelining.")

data/lib/excon/middlewares/redirect_follower.rb

@@ -2,9 +2,9 @@ module Excon
   module Middleware
     class RedirectFollower < Excon::Middleware::Base
       def response_call(datum)
-        if datum.has_key?(:response) && [:get, :head].include?(datum[:method].to_s.downcase.to_sym)
+        if datum.has_key?(:response)
           case datum[:response][:status]
-          when 301, 302, 303, 307
+          when 301, 302, 303, 307, 308
             uri_parser = datum[:uri_parser] || Excon.defaults[:uri_parser]
             _, location = datum[:response][:headers].detect do |key, value|
               key.casecmp('Location') == 0
@@ -12,11 +12,12 @@ module Excon
             uri = uri_parser.parse(location)
 
             # delete old/redirect response
-            datum.delete(:response)
+            response = datum.delete(:response)
 
             params = datum.dup
             params.delete(:stack)
             params.delete(:connection)
+            params[:method] = :get if [301, 302, 303].include? response[:status]
             params[:headers] = datum[:headers].dup
             params[:headers].delete('Authorization')
             params[:headers].delete('Proxy-Connection')

data/lib/excon/ssl_socket.rb

@@ -35,9 +35,12 @@ module Excon
         if ca_path = ENV['SSL_CERT_DIR'] || @data[:ssl_ca_path]
           ssl_context.ca_path = ca_path
         end
+        if cert_store = @data[:ssl_cert_store]
+          ssl_context.cert_store = cert_store
+        end
 
         # no defaults, fallback to bundled
-        unless ca_file || ca_path
+        unless ca_file || ca_path || cert_store
           ssl_context.cert_store = OpenSSL::X509::Store.new
           ssl_context.cert_store.set_default_paths
 
@@ -67,10 +70,18 @@ module Excon
 
       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), private_key_pass)
+        if OpenSSL::PKey.respond_to? :read
+          ssl_context.key = OpenSSL::PKey.read(File.read(private_key_path), private_key_pass)
+        else
+          ssl_context.key = OpenSSL::PKey::RSA.new(File.read(private_key_path), private_key_pass)
+        end
       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], private_key_pass)
+        if OpenSSL::PKey.respond_to? :read
+          ssl_context.key = OpenSSL::PKey.read(@data[:private_key], private_key_pass)
+        else
+          ssl_context.key = OpenSSL::PKey::RSA.new(@data[:private_key], private_key_pass)
+        end
       end
 
       if @data[:proxy]

data/tests/basic_tests.rb

@@ -144,6 +144,25 @@ Shindo.tests('Excon ssl verify peer (ssl)') do
   end
 end
 
+Shindo.tests('Excon ssl verify peer (ssl cert store)') do
+  with_rackup('ssl.ru') do
+    connection = nil
+    test do
+      ssl_ca_cert = File.read(File.join(File.dirname(__FILE__), 'data', '127.0.0.1.cert.crt'))
+      ssl_cert_store = OpenSSL::X509::Store.new
+      ssl_cert_store.add_cert OpenSSL::X509::Certificate.new ssl_ca_cert
+      connection = Excon.new('https://127.0.0.1:9443', :ssl_verify_peer => true, :ssl_cert_store => ssl_cert_store )
+      true
+    end
+
+    tests('response.status').returns(200) do
+      response = connection.request(:method => :get, :path => '/content-length/100')
+
+      response.status
+    end
+  end
+end
+
 Shindo.tests('Excon basics (ssl file)',['focus']) do
   with_rackup('ssl_verify_peer.ru') do
 

data/tests/thread_safety_tests.rb

@@ -1,4 +1,17 @@
 Shindo.tests('Excon thread safety') do
+  
+  tests('thread_safe_sockets configuration') do
+    tests('thread_safe_sockets default').returns(true) do
+      connection = Excon.new('http://foo.com')
+      connection.data[:thread_safe_sockets]
+    end
+
+    tests('with thread_safe_sockets set false').returns(false) do
+      connection = Excon.new('http://foo.com', :thread_safe_sockets => false)
+      connection.data[:thread_safe_sockets]
+    end
+  end
+
   with_rackup('thread_safety.ru') do
     connection = Excon.new('http://127.0.0.1:9292')
 

metadata

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