ftw 0.0.19 → 0.0.20

data/lib/ftw/agent.rb

@@ -209,6 +209,7 @@ class FTW::Agent
     req.headers["Upgrade"] = protocol
     response = execute(req)
     if response.status == 101
+      # Success, return the response object and the connection to hand off.
       return response, response.body
     else
       return response, nil
@@ -230,13 +231,24 @@ class FTW::Agent
     if ws.handshake_ok?(response)
       # response.body is a FTW::Connection
       ws.connection = response.body
+
+      # There seems to be a bug in http_parser.rb where websocket responses
+      # lead with a newline for some reason.  It's like the header terminator
+      # CRLF still has the LF character left in the buffer. Work around it.
+      data = response.body.read
+      if data[0] == "\n"
+        response.body.pushback(data[1..-1])
+      else
+        response.body.pushback(data)
+      end
+
       return ws
     else
       return response
     end
   end # def websocket!
 
-  # Make a request. Returns a FTW::Request object.
+  # Build a request. Returns a FTW::Request object.
   #
   # Arguments:
   #
@@ -283,7 +295,8 @@ 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")
+    connection, error = connect(request.headers["Host"], request.port,
+                                request.protocol == "https")
     if !error.nil?
       p :error => error
       raise error
@@ -400,5 +413,5 @@ class FTW::Agent
   # TODO(sissel): Implement methods for managing the cookie store
   # TODO(sissel): Implement methods for managing the cache
   # TODO(sissel): Implement configuration stuff? Is FTW::Agent::Configuration the best way?
-  public(:initialize, :execute, :websocket!, :upgrade!, :shutdown)
+  public(:initialize, :execute, :websocket!, :upgrade!, :shutdown, :request)
 end # class FTW::Agent

data/lib/ftw/protocol.rb

@@ -114,12 +114,25 @@ module FTW::Protocol
       # If this is a poolable resource, release it (like a FTW::Connection)
       @body.release if @body.respond_to?(:release)
     elsif !@body.nil?
-      yield @body
+      block.call(@body)
     end
   end # def read_http_body
 
-  # Old api compat
-  alias_method :read_body, :read_http_body
+  # Read the body of this message. The block is called with chunks of the
+  # response as they are read in.
+  #
+  # This method is generally only called by http clients, not servers.
+  #
+  # If no block is given, the entire response body is returned as a string.
+  def read_body(&block)
+    if !block_given?
+      content = ""
+      read_http_body { |chunk| content << chunk }
+      return content
+    else
+      read_http_body(&block)
+    end
+  end # def read_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.

data/lib/ftw/version.rb

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

data/lib/ftw/websocket/rack.rb

@@ -105,6 +105,16 @@ class FTW::WebSocket::Rack
   #     end
   def each
     connection = @env["ftw.connection"]
+    # There seems to be a bug in http_parser.rb where websocket responses
+    # lead with a newline for some reason.  It's like the header terminator
+    # CRLF still has the LF character left in the buffer. Work around it.
+    data = connection.read
+    if data[0] == "\n"
+      connection.pushback(data[1..-1])
+    else
+      connection.pushback(data)
+    end
+
     while true
       begin
         data = connection.read(16384)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftw
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -115,41 +115,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rack/handler/ftw.rb
 - lib/ftw.rb
-- lib/ftw/dns.rb
+- lib/rack/handler/ftw.rb
 - lib/ftw/cacert.pem
-- lib/ftw/websocket/rack.rb
-- lib/ftw/websocket/writer.rb
-- lib/ftw/websocket/parser.rb
-- lib/ftw/websocket/constants.rb
+- lib/ftw/crlf.rb
+- lib/ftw/singleton.rb
+- lib/ftw/dns/hash.rb
+- lib/ftw/dns/dns.rb
 - lib/ftw/poolable.rb
-- lib/ftw/connection.rb
-- lib/ftw/version.rb
+- lib/ftw/protocol.rb
+- lib/ftw/namespace.rb
+- lib/ftw/cookies.rb
 - lib/ftw/agent.rb
-- lib/ftw/pool.rb
-- lib/ftw/server.rb
+- lib/ftw/websocket/parser.rb
+- lib/ftw/websocket/rack.rb
+- lib/ftw/websocket/constants.rb
+- lib/ftw/websocket/writer.rb
 - lib/ftw/websocket.rb
-- lib/ftw/http/message.rb
 - lib/ftw/http/headers.rb
+- lib/ftw/http/message.rb
+- lib/ftw/dns.rb
+- lib/ftw/server.rb
+- lib/ftw/version.rb
 - lib/ftw/agent/configuration.rb
 - lib/ftw/request.rb
-- lib/ftw/protocol.rb
 - lib/ftw/response.rb
-- lib/ftw/namespace.rb
-- lib/ftw/dns/dns.rb
-- lib/ftw/dns/hash.rb
-- lib/ftw/cookies.rb
-- lib/ftw/singleton.rb
-- lib/ftw/crlf.rb
+- lib/ftw/pool.rb
 - lib/ftw/webserver.rb
-- test/testing.rb
+- lib/ftw/connection.rb
 - test/docs.rb
+- test/all.rb
+- test/ftw/crlf.rb
+- test/ftw/singleton.rb
 - test/ftw/http/dns.rb
 - test/ftw/http/headers.rb
-- test/ftw/singleton.rb
-- test/ftw/crlf.rb
-- test/all.rb
+- test/testing.rb
 - README.md
 homepage: http://github.com/jordansissel/ruby-ftw
 licenses: