ftw 0.0.33 → 0.0.34

data/lib/ftw/agent.rb

@@ -302,13 +302,22 @@ class FTW::Agent
   def execute(request)
     # TODO(sissel): Make redirection-following optional, but default.
 
-    connection, error = connect(request.headers["Host"], request.port,
-                                request.protocol == "https")
-    if !error.nil?
-      p :error => error
-      raise error
+    tries = 3
+    begin
+      connection, error = connect(request.headers["Host"], request.port,
+                                  request.protocol == "https")
+      if !error.nil?
+        p :error => error
+        raise error
+      end
+      response = request.execute(connection)
+    rescue EOFError => e
+      tries -= 1
+      @logger.warn("Error while sending request, will retry.",
+                   :tries_left => tries,
+                   :exception => e)
+      retry if tries > 0
     end
-    response = request.execute(connection)
 
     redirects = 0
     # Follow redirects

data/lib/ftw/connection.rb

@@ -232,7 +232,9 @@ class FTW::Connection
     if readable?(timeout)
       begin
         # Read at most 'length' data, so read less from the socket
-        @socket.sysread(@read_size - data.length, @read_buffer)
+        # We'll read less than 'length' if the pushback buffer has
+        # data in it already.
+        @socket.sysread(length - data.length, @read_buffer)
         data << @read_buffer
         return data
       rescue EOFError => e

data/lib/ftw/protocol.rb

@@ -134,12 +134,21 @@ module FTW::Protocol
     end
   end # def read_body
 
+  # A shorthand for discarding the body of a request or response.
+  #
+  # This is the same as:
+  #
+  #     foo.read_body { |c| }
+  def discard_body
+    read_body { |c| }
+  end # def discard_body
+
   # Read the length bytes from the body. Yield each chunk read to the block
   # given. This method is generally only called by http clients, not servers.
   def read_http_body_length(length, &block)
     remaining = length
     while remaining > 0
-      data = @body.read
+      data = @body.read(remaining)
       @logger.debug("Read bytes", :length => data.size)
       if data.size > remaining
         # Read too much data, only wanted part of this. Push the rest back.
@@ -165,6 +174,9 @@ module FTW::Protocol
     parser.on_message_complete = proc { done = true }
 
     while !done # will break on special conditions below
+      # TODO(sissel): In JRuby, this read will sometimes hang for ever
+      # because there's some wonkiness in IO.select on SSLSockets in JRuby.
+      # Maybe we should fix it... 
       data = @body.read
       offset = parser << data
       if offset != data.length

data/lib/ftw/version.rb

@@ -3,5 +3,5 @@ require "ftw/namespace"
 # :nodoc:
 module FTW
   # The version of this library
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

metadata

@@ -1,98 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ftw
 version: !ruby/object:Gem::Version
-  version: 0.0.33
-  prerelease: 
+  version: 0.0.34
+  prerelease:
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: cabin
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
-  name: cabin
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.3
-  name: http_parser.rb
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.3
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: addressable
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: addressable
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: backports
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
-  name: backports
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
-description: For The Web. Trying to build a solid and sane API for client and server
-  web stuff. Client and Server operations for HTTP, WebSockets, SPDY, etc.
+    none: false
+  prerelease: false
+  type: :development
+description: For The Web. Trying to build a solid and sane API for client and server web stuff. Client and Server operations for HTTP, WebSockets, SPDY, etc.
 email:
 - jls@semicomplete.com
 executables: []
@@ -100,6 +99,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ftw.rb
+- lib/rack/handler/ftw.rb
 - lib/ftw/websocket.rb
 - lib/ftw/protocol.rb
 - lib/ftw/webserver.rb
@@ -126,7 +126,6 @@ files:
 - lib/ftw/dns/dns.rb
 - lib/ftw/http/headers.rb
 - lib/ftw/http/message.rb
-- lib/rack/handler/ftw.rb
 - test/docs.rb
 - test/all.rb
 - test/testing.rb
@@ -138,28 +137,28 @@ files:
 homepage: http://github.com/jordansissel/ruby-ftw
 licenses:
 - Apache License (2.0)
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
-summary: For The Web. Trying to build a solid and sane API for client and server web
-  stuff. Client and Server operations for HTTP, WebSockets, SPDY, etc.
+summary: For The Web. Trying to build a solid and sane API for client and server web stuff. Client and Server operations for HTTP, WebSockets, SPDY, etc.
 test_files: []
+has_rdoc: