excon 0.7.8 → 0.7.9

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.7.8'
-  s.date              = '2011-11-24'
+  s.version           = '0.7.9'
+  s.date              = '2011-11-30'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   ## List the primary authors. If there are a bunch of authors, it's probably
   ## better to set the email to an email list or something. If you don't have
   ## a custom homepage, consider using your GitHub URL or the like.
-  s.authors  = ["geemus (Wesley Beary)"]
+  s.authors  = ["dpiddy (Dan Peterson)", "geemus (Wesley Beary)", "nextmat (Matt Sanders)"]
   s.email    = 'geemus@gmail.com'
   s.homepage = 'https://github.com/geemus/excon'
 

data/lib/excon/connection.rb

@@ -17,6 +17,7 @@ module Excon
     #     @option params [Hash]   :query Default query; appended to the 'scheme://host:port/path/' in the form of '?key=value'. Will only be used if params[:query] is not supplied to Connection#request
     #     @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
     #     @option params [String] :proxy Proxy server; e.g. 'http://myproxy.com:8888'
+    #     @option params [Fixnum] :retry_limit Set how many times we'll retry a failed request.  (Default 4)
     def initialize(url, params = {})
       uri = URI.parse(url)
       @connection = {
@@ -39,6 +40,8 @@ module Excon
         @proxy = setup_proxy(params[:proxy])
       end
 
+      self.retry_limit = params[:retry_limit] || DEFAULT_RETRY_LIMIT
+
       if @connection[:scheme] == 'https'
         # use https_proxy if that has been specified
         if ENV.has_key?('https_proxy')
@@ -198,7 +201,7 @@ module Excon
 
     rescue => request_error
       if params[:idempotent] && [Excon::Errors::SocketError, Excon::Errors::HTTPStatusError].any? {|ex| request_error.kind_of? ex }
-        retries_remaining ||= 4
+        retries_remaining ||= retry_limit
         retries_remaining -= 1
         if retries_remaining > 0
           if params[:body].respond_to?(:pos=)
@@ -226,6 +229,12 @@ module Excon
       DEF
     end
 
+    attr_writer :retry_limit
+
+    def retry_limit
+      @retry_limit ||= DEFAULT_RETRY_LIMIT
+    end
+
   private
 
     def socket

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.7.8'
+    VERSION = '0.7.9'
   end
 
   unless const_defined?(:CHUNK_SIZE)
@@ -11,6 +11,10 @@ module Excon
     HTTP_VERBS = %w{connect delete get head options post put trace}
   end
 
+  unless const_defined?(:DEFAULT_RETRY_LIMIT)
+    DEFAULT_RETRY_LIMIT = 4
+  end
+
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO
       module WaitReadable; end
@@ -22,5 +26,4 @@ module Excon
       module WaitWritable; end
     end
   end
-
 end

data/lib/excon/socket.rb

@@ -13,34 +13,54 @@ module Excon
       @read_buffer, @write_buffer = '', ''
       @eof = false
 
+      connect
+    end
+
+    def connect
+      @socket = nil
+      exception = nil
+
       addrinfo = if @proxy
         ::Socket.getaddrinfo(@proxy[:host], @proxy[:port].to_i, nil, ::Socket::Constants::SOCK_STREAM)
       else
         ::Socket.getaddrinfo(@params[:host], @params[:port].to_i, nil, ::Socket::Constants::SOCK_STREAM)
-      end.first
-
-      _, port, _, ip, a_family, s_type = addrinfo
+      end
 
-      @sockaddr = ::Socket.sockaddr_in(port, ip)
+      addrinfo.each do |_, port, _, ip, a_family, s_type|
+        # nonblocking connect
+        begin
+          sockaddr = ::Socket.sockaddr_in(port, ip)
 
-      @socket = ::Socket.new(a_family, s_type, 0)
+          socket = ::Socket.new(a_family, s_type, 0)
 
-      connect
+          socket.connect_nonblock(sockaddr)
 
-      @socket
-    end
+          @socket = socket
+          break
+        rescue Errno::EINPROGRESS
+          IO.select(nil, [socket], nil, @params[:connect_timeout])
+          begin
+            socket.connect_nonblock(sockaddr)
 
-    def connect
-      # nonblocking connect
-      begin
-        @socket.connect_nonblock(@sockaddr)
-      rescue Errno::EINPROGRESS
-        IO.select(nil, [@socket], nil, @params[:connect_timeout])
-        begin
-          @socket.connect_nonblock(@sockaddr)
-        rescue Errno::EISCONN
+            @socket = socket
+            break
+          rescue Errno::EISCONN
+            @socket = socket
+            break
+          rescue SystemCallError => exception
+            socket.close
+            next
+          end
+        rescue SystemCallError => exception
+          socket.close
+          next
         end
       end
+
+      unless @socket
+        # this will be our last encountered exception
+        raise exception
+      end
     end
 
     def read(max_length=nil)

data/lib/excon/ssl_socket.rb

@@ -6,7 +6,7 @@ module Excon
 
       undef_method :connect
       def connect
-        @socket.connect(@sockaddr)
+        @socket = TCPSocket.new(@params[:host], @params[:port])
       end
 
       undef_method :read

data/tests/idempotent_tests.rb

@@ -10,7 +10,7 @@ Shindo.tests('Excon request idempotencey') do
     run_count = 0
     Excon.stub({:method => :get}) { |params|
       run_count += 1
-      if run_count < 4 # First 3 calls fail.
+      if run_count <= 3 # First 3 calls fail.
         raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
       else
         {:body => params[:body], :headers => params[:headers], :status => 200}
@@ -53,5 +53,93 @@ Shindo.tests('Excon request idempotencey') do
     response.status
   end
 
+  tests("Lowered retry limit with socket erroring first time").returns(200) do
+    run_count = 0
+    Excon.stub({:method => :get}) { |params|
+      run_count += 1
+      if run_count <= 1 # First call fails.
+        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    connection.retry_limit = 2
+    response = connection.request(:method => :get, :idempotent => true, :path => '/some-path')
+    response.status
+  end
+
+  tests("Lowered retry limit with socket erroring first 3 times").raises(Excon::Errors::SocketError) 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")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    connection.retry_limit = 2
+    response = connection.request(:method => :get, :idempotent => true, :path => '/some-path')
+    response.status
+  end
+
+  tests("Raised retry limit with socket erroring first 5 times").returns(200) 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")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    connection.retry_limit = 8
+    response = connection.request(:method => :get, :idempotent => true, :path => '/some-path')
+    response.status
+  end
+
+  tests("Raised retry limit with socket erroring first 9 times").raises(Excon::Errors::SocketError) 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")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    connection.retry_limit = 8
+    response = connection.request(:method => :get, :idempotent => true, :path => '/some-path')
+    response.status
+  end
+
+  tests("Retry limit in constructor with socket erroring first 5 times").returns(200) do
+    run_count = 0
+
+    connection = Excon.new('http://127.0.0.1:9292', :retry_limit => 6)
+    tests("setter sets").returns(6) do
+      connection.retry_limit
+    end
+
+    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")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+    response = connection.request(:method => :get, :idempotent => true, :path => '/some-path')
+    response.status
+  end
+
   Excon.mock = false
 end

data/tests/request_method_tests.rb

@@ -5,18 +5,18 @@ Shindo.tests('Excon request methods') do
     tests 'one-offs' do
 
       tests('Excon.get').returns('GET') do
-        Excon.get('http://127.0.0.1:9292').body
+        Excon.get('http://localhost:9292').body
       end
 
       tests('Excon.post').returns('POST') do
-        Excon.post('http://127.0.0.1:9292').body
+        Excon.post('http://localhost:9292').body
       end
 
     end
 
     tests 'with a connection object' do
 
-      connection = Excon.new('http://127.0.0.1:9292')
+      connection = Excon.new('http://localhost:9292')
 
       tests('connection.get').returns('GET') do
         connection.get.body

data/tests/test_helper.rb

@@ -67,10 +67,12 @@ def rackup_path(*parts)
 end
 
 def with_rackup(name)
+  GC.disable
   pid, w, r, e = Open4.popen4("rackup #{rackup_path(name)}")
   until e.gets =~ /HTTPServer#start:/; end
   yield
 ensure
+  GC.enable
   Process.kill(9, pid)
 end
 

metadata

@@ -1,72 +1,83 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
+- dpiddy (Dan Peterson)
 - geemus (Wesley Beary)
+- nextmat (Matt Sanders)
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 -06:00
+date: 2011-11-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: open4
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: open4
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shindo
+  name: rake
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 2
         - 0
         version: 0.2.0
-  type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: shindo
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id004
+  name: sinatra
+  prerelease: false
+  type: :development
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -133,23 +144,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: excon
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)