excon 0.61.0 → 0.63.0

data/tests/middlewares/idempotent_tests.rb

@@ -9,12 +9,12 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stubs.clear
   end
 
-  tests("Non-idempotent call with an erroring socket").raises(Excon::Errors::SocketError) do
+  tests("Non-idempotent call with an erroring socket").raises(Excon::Error::Socket) do
     run_count = 0
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 3 # First 3 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -28,7 +28,7 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 3 # First 3 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -38,12 +38,12 @@ Shindo.tests('Excon request idempotencey') do
     response.status
   end
 
-  tests("Idempotent request with socket erroring first 5 times").raises(Excon::Errors::SocketError) do
+  tests("Idempotent request with socket erroring first 5 times").raises(Excon::Error::Socket) do
     run_count = 0
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 5 # First 5 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -58,7 +58,7 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 1 # First call fails.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -68,12 +68,12 @@ Shindo.tests('Excon request idempotencey') do
     response.status
   end
 
-  tests("Lowered retry limit with socket erroring first 3 times").raises(Excon::Errors::SocketError) do
+  tests("Lowered retry limit with socket erroring first 3 times").raises(Excon::Error::Socket) do
     run_count = 0
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 3 # First 3 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -88,7 +88,7 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 5 # First 5 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -98,12 +98,12 @@ Shindo.tests('Excon request idempotencey') do
     response.status
   end
 
-  tests("Raised retry limit with socket erroring first 9 times").raises(Excon::Errors::SocketError) do
+  tests("Raised retry limit with socket erroring first 9 times").raises(Excon::Error::Socket) do
     run_count = 0
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 9 # First 9 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -118,7 +118,7 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 5 # First 5 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -133,7 +133,7 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 2 # First 5 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -145,12 +145,12 @@ Shindo.tests('Excon request idempotencey') do
     response.status
   end
 
-  tests("Retry limit and sleep in constructor with socket erroring first 2 times").raises(Excon::Errors::SocketError) do
+  tests("Retry limit and sleep in constructor with socket erroring first 2 times").raises(Excon::Error::Socket) do
     run_count = 0
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 2 # First 5 calls fail.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -161,6 +161,45 @@ Shindo.tests('Excon request idempotencey') do
     response.status
   end
 
+  tests("Idempotent request with custom error first 3 times").returns(200) do
+    run_count = 0
+    Excon.stub({:method => :get}) { |params|
+      run_count += 1
+      if run_count <= 3 # First 3 calls fail.
+        raise "oops"
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    response = @connection.request(:method => :get, :idempotent => true, :retry_errors => [RuntimeError], :path => '/some-path')
+    response.status
+  end
+
+  tests("Idempotent request with custom error first 5 times").raises(RuntimeError) do
+    run_count = 0
+    Excon.stub({:method => :get}) { |params|
+      run_count += 1
+      if run_count <= 5 # First 5 calls fail.
+        raise "oops"
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    response = @connection.request(:method => :get, :idempotent => true, :retry_errors => [RuntimeError], :path => '/some-path')
+    response.status
+  end
+
+  tests("Overriding default retry_errors").raises(Excon::Error::Socket) do
+    Excon.stub({:method => :get}) { |params|
+      raise Excon::Error::Socket.new(Exception.new "Mock Error")
+    }
+
+    response = @connection.request(:method => :get, :idempotent => true, :retry_errors => [RuntimeError], :path => '/some-path')
+    response.status
+  end
+
   class Block
     attr_reader :rewound
     def initialize
@@ -178,7 +217,7 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 1 # First call fails.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end
@@ -193,7 +232,7 @@ Shindo.tests('Excon request idempotencey') do
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count <= 1 # First call fails.
-        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+        raise Excon::Error::Socket.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
       end

data/tests/middlewares/mock_tests.rb

@@ -96,7 +96,7 @@ Shindo.tests('Excon stubs') do
       response.body
     end
 
-    tests('response.headers').returns({'Host' => '127.0.0.1:9292', 'User-Agent' => "excon/#{Excon::VERSION}"}) do
+    tests('response.headers').returns({'Accept' => '*/*', 'Host' => '127.0.0.1:9292', 'User-Agent' => "excon/#{Excon::VERSION}"}) do
       response.headers
     end
 
@@ -153,7 +153,7 @@ Shindo.tests('Excon stubs') do
     Excon.get('http://127.0.0.1:9292/', :mock => true)
   end
 
-  with_server('good') do
+  with_server('good_ipv4') do
     tests('allow mismatched stub').returns(200) do
       Excon.stub({:path => '/echo/request_count'}, {:body => 'body'})
       Excon.get(

data/tests/pipeline_tests.rb

@@ -1,5 +1,5 @@
 Shindo.tests('Pipelined Requests') do
-  with_server('good') do
+  with_server('good_ipv4') do
 
     tests('with default :persistent => true') do
       returns(%w{ 1 2 3 4 }, 'connection is persistent') do

data/tests/request_tests.rb

@@ -1,10 +1,9 @@
 Shindo.tests('Request Tests') do
-  with_server('good') do
-
-    tests('persistent connections') do
-      ip_ports = %w(127.0.0.1:9292)
-      ip_ports << "[::1]:9293" unless RUBY_PLATFORM == 'java'
-      ip_ports.each do |ip_port|
+  tests('persistent connections') do
+    ip_ports = [['127.0.0.1:9292', 'good_ipv4']]
+    ip_ports << ['[::1]:9293', 'good_ipv6'] unless RUBY_PLATFORM == 'java'
+    ip_ports.each do |ip_port, server|
+      with_server(server) do
 
         tests("with default :persistent => true, #{ip_port}") do
           connection = nil

data/tests/response_tests.rb

@@ -1,7 +1,7 @@
 Shindo.tests('Excon Response Parsing') do
   env_init
 
-  with_server('good') do
+  with_server('good_ipv4') do
 
     tests('responses with chunked transfer-encoding') do
 

data/tests/servers/bad.rb

@@ -5,6 +5,11 @@ require "eventmachine"
 module BadServer
   def receive_data(data)
     case data
+    when %r{^GET /echo\s}
+      send_data "HTTP/1.1 200 OK\r\n"
+      send_data "\r\n"
+      send_data data
+      close_connection(true)
     when %r{^GET /eof/no_content_length_and_no_chunking\s}
       send_data "HTTP/1.1 200 OK\r\n"
       send_data "\r\n"

data/tests/servers/good.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'eventmachine'
 require 'stringio'
 require 'uri'
@@ -342,9 +340,3 @@ module GoodServer
                         (?:,\s*|\Z)'xn).flatten
   end
 end
-
-EM.run do
-  EM.start_server("127.0.0.1", 9292, GoodServer)
-  EM.start_server("::1", 9293, GoodServer) unless RUBY_PLATFORM == 'java'
-  $stderr.puts "ready"
-end

data/tests/servers/good_ipv4.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'good')
+
+EM.run do
+  EM.start_server("127.0.0.1", 9292, GoodServer)
+  $stderr.puts "ready"
+end

data/tests/servers/good_ipv6.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'good')
+
+EM.run do
+  EM.start_server("::1", 9293, GoodServer) unless RUBY_PLATFORM == 'java'
+  $stderr.puts "ready"
+end

data/tests/test_helper.rb

@@ -4,11 +4,14 @@ require 'excon'
 require 'delorean'
 require 'open4'
 
+require './spec/helpers/warning_helpers.rb'
+
 Excon.defaults.merge!(
   :connect_timeout  => 5,
   :read_timeout     => 5,
   :write_timeout    => 5
 )
+Excon.set_raise_on_warnings!(true)
 
 def basic_tests(url = 'http://127.0.0.1:9292', options = {})
   ([true, false] * 2).combination(2).to_a.uniq.each do |nonblock, persistent|
@@ -211,14 +214,6 @@ def env_stack
   @env_stack ||= []
 end
 
-def silence_warnings
-  orig_verbose = $VERBOSE
-  $VERBOSE = nil
-  yield
-ensure
-  $VERBOSE = orig_verbose
-end
-
 def capture_response_block
   captures = []
   yield lambda {|chunk, remaining_bytes, total_bytes|
@@ -227,25 +222,34 @@ def capture_response_block
   captures
 end
 
-def rackup_path(*parts)
-  File.expand_path(File.join(File.dirname(__FILE__), 'rackups', *parts))
-end
-
-def with_rackup(name, host="127.0.0.1")
+def launch_process(*args)
   unless RUBY_PLATFORM == 'java'
     GC.disable if RUBY_VERSION < '1.9'
-    pid, w, r, e = Open4.popen4("rackup", "-s", "webrick", "--host", host, rackup_path(name))
+    pid, w, r, e = Open4.popen4(*args)
   else
-    pid, w, r, e = IO.popen4("rackup", "-s", "webrick", "--host", host, rackup_path(name))
+    pid, w, r, e = IO.popen4(*args)
   end
-  until e.gets =~ /HTTPServer#start:/; end
-  yield
-ensure
+  return pid, w, r, e
+end
+
+def cleanup_process(pid)
   Process.kill(9, pid)
   unless RUBY_PLATFORM == 'java'
     GC.enable if RUBY_VERSION < '1.9'
     Process.wait(pid)
   end
+end
+
+def rackup_path(*parts)
+  File.expand_path(File.join(File.dirname(__FILE__), 'rackups', *parts))
+end
+
+def with_rackup(name, host="127.0.0.1")
+  pid, w, r, e = launch_process("rackup", "-s", "webrick", "--host", host, rackup_path(name))
+  until e.gets =~ /HTTPServer#start:/; end
+  yield
+ensure
+  cleanup_process(pid)
 
   # dump server errors
   lines = e.read.split($/)
@@ -265,20 +269,16 @@ end
 
 def with_unicorn(name, listen='127.0.0.1:9292')
   unless RUBY_PLATFORM == 'java'
-    GC.disable if RUBY_VERSION < '1.9'
     unix_socket = listen.sub('unix://', '') if listen.start_with? 'unix://'
-    pid, w, r, e = Open4.popen4("unicorn", "--no-default-middleware","-l", listen, rackup_path(name))
+    pid, w, r, e = launch_process("unicorn", "--no-default-middleware","-l", listen, rackup_path(name))
     until e.gets =~ /worker=0 ready/; end
   else
     # need to find suitable server for jruby
   end
   yield
 ensure
-  unless RUBY_PLATFORM == 'java'
-    Process.kill(9, pid)
-    GC.enable if RUBY_VERSION < '1.9'
-    Process.wait(pid)
-  end
+  cleanup_process(pid)
+
   if not unix_socket.nil? and File.exist?(unix_socket)
     File.delete(unix_socket)
   end
@@ -289,18 +289,9 @@ def server_path(*parts)
 end
 
 def with_server(name)
-  unless RUBY_PLATFORM == 'java'
-    GC.disable if RUBY_VERSION < '1.9'
-    pid, w, r, e = Open4.popen4(server_path("#{name}.rb"))
-  else
-    pid, w, r, e = IO.popen4(server_path("#{name}.rb"))
-  end
+  pid, w, r, e = launch_process("ruby", server_path("#{name}.rb"))
   until e.gets =~ /ready/; end
   yield
 ensure
-  Process.kill(9, pid)
-  unless RUBY_PLATFORM == 'java'
-    GC.enable if RUBY_VERSION < '1.9'
-    Process.wait(pid)
-  end
+  cleanup_process(pid)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.61.0
+  version: 0.63.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -190,6 +190,7 @@ extra_rdoc_files:
 - CONTRIBUTING.md
 files:
 - ".document"
+- ".github/stale.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -254,11 +255,14 @@ files:
 - spec/excon/test/server_spec.rb
 - spec/excon_spec.rb
 - spec/helpers/file_path_helpers.rb
+- spec/helpers/warning_helpers.rb
 - spec/requests/basic_spec.rb
 - spec/requests/eof_requests_spec.rb
 - spec/requests/unix_socket_spec.rb
+- spec/requests/validation_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts/test_server_context.rb
+- spec/support/shared_contexts/test_stub_context.rb
 - spec/support/shared_examples/shared_example_for_clients.rb
 - spec/support/shared_examples/shared_example_for_streaming_clients.rb
 - spec/support/shared_examples/shared_example_for_test_servers.rb
@@ -274,6 +278,7 @@ files:
 - tests/data/xs
 - tests/error_tests.rb
 - tests/header_tests.rb
+- tests/instrumentors/logging_instrumentor_tests.rb
 - tests/middlewares/canned_response_tests.rb
 - tests/middlewares/capture_cookies_tests.rb
 - tests/middlewares/decompress_tests.rb
@@ -311,6 +316,8 @@ files:
 - tests/servers/eof.rb
 - tests/servers/error.rb
 - tests/servers/good.rb
+- tests/servers/good_ipv4.rb
+- tests/servers/good_ipv6.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
 - tests/timeout_tests.rb
@@ -318,7 +325,13 @@ files:
 homepage: https://github.com/excon/excon
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/excon/excon
+  bug_tracker_uri: https://github.com/excon/excon/issues
+  changelog_uri: https://github.com/excon/excon/blob/master/changelog.txt
+  documentation_uri: https://github.com/excon/excon/blob/master/README.md
+  source_code_uri: https://github.com/excon/excon
+  wiki_uri: https://github.com/excon/excon/wiki
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -335,8 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: speed, persistence, http(s)