net-ptth 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    net-ptth (0.0.3)
+    net-ptth (0.0.4)
       celluloid-io (~> 0.12.1)
       http-parser-lite (~> 0.6.0)
       rack (~> 1.4.4)

data/README.md

@@ -4,7 +4,7 @@
 
 ## You misspelled HTTP
 
-No I don't: http://wiki.secondlife.com/wiki/Reverse_HTTP
+No I didn't: http://wiki.secondlife.com/wiki/Reverse_HTTP
 
 ## Installation
 

data/lib/net/ptth.rb

@@ -42,7 +42,7 @@ class Net::PTTH
   # Public: Closes de current connection
   #
   def close
-    log "[Closing connection]"
+    log "Closing connection"
     @socket.close if @socket
   end
 
@@ -55,27 +55,19 @@ class Net::PTTH
   def request(req, &block)
     @socket ||= TCPSocket.new(@host, @port)
 
-    log "[Connecting...]"
+    log "Connecting to #{@host}:#{@port}"
 
     packet = build(req)
 
-    log "[Writting packet]"
-    log packet
+    write(packet)
 
-    @socket.write(packet)
-
-    response = @socket.readpartial(1024)
-    log "[Reading response]"
-    log response
+    response = read
     @parser << response
 
     if @parser.http_status == 101
-      log "[Switching protocols]"
-
-      while res = @socket.readpartial(1024)
-        log "[Incoming response]"
-        log res
+      log "Switching protocols"
 
+      while res = read
         request = Request.new
         build_request(request)
 
@@ -94,6 +86,23 @@ class Net::PTTH
 
   private
 
+  def read(bytes = 1024)
+    response = @socket.readpartial(bytes)
+
+    log "Reading response"
+    log response, "-> "
+
+    response
+  end
+
+  def write(string)
+    log "Writting response"
+    log string[0..200], "<- "
+
+    bytes = @socket.write(string)
+    log "#{bytes} bytes written"
+  end
+
   # Private: Executes the app and/or block callbacks
   #
   #   env: The Rack compatible env
@@ -101,7 +110,9 @@ class Net::PTTH
   #
   def callbacks(env, &block)
     case
-    when app then app.call(env)
+    when app
+      response = build_response(*app.call(env))
+      write response
     when block
       request = Rack::Request.new(env)
       block.call(request)
@@ -110,6 +121,16 @@ class Net::PTTH
     end
   end
 
+  def build_response(status, headers, body)
+    log "Building Response"
+    response = "HTTP/1.1 #{status} OK\n"
+    headers.each { |key, value| response += "#{key}: #{value}\n" }
+    response += "\n\r"
+    body.each { |chunk| response += chunk }
+
+    response
+  end
+
   # Private: Builds a Rack compatible env from a PTTH::Request
   #
   #   request: A PTTH parsed request
@@ -123,7 +144,7 @@ class Net::PTTH
     }
 
     env.tap do |h|
-      h["CONTENT_LENGTH"] = request.body.length if request.body
+      h["CONTENT_LENGTH"] = request.body.length if !request.body.nil?
     end
 
     env.merge!(request.headers) if request.headers
@@ -149,8 +170,10 @@ class Net::PTTH
   #
   #   message: The string to be logged
   #
-  def log(message)
-    @debug_output << message + "\n"
+  def log(message, prepend = "*  ")
+    parts = (message || "").split("\n")
+    @debug_output << parts.map { |line| prepend + line }.join("\n")
+    @debug_output << "\n"
   end
 
   # Private: Parses the incoming request headers and adds the information to a
@@ -182,15 +205,18 @@ class Net::PTTH
   #   req: The request to be build
   #
   def build(req)
-    req["Upgrade"]    ||= "PTTH/1.0"
-    req["Connection"] ||= "Upgrade"
+    req["Upgrade"]          = "PTTH/1.0"
+    req["Connection"]     ||= "Upgrade"
+    req["Content-Length"] ||= req.body.length if !req.body.nil?
 
     package  = "#{req.method} #{req.path} HTTP/1.1\n"
     req.each_header do |header, value|
-      package += "#{header.split("-").map(&:capitalize).join("-")}: #{value}\n"
+      header_parts = header.split("-").map(&:capitalize)
+      package += "#{header_parts.join("-")}: #{value}\n"
     end
 
-    package += "\n\r#{req.body}"
-    package += "\n\r\n\r"
+    package += "\n\r#{req.body}" if req.body
+    package += "\r\n\r\n"
+    package
   end
 end

data/lib/net/ptth/test.rb

@@ -26,9 +26,8 @@ module Net
             HTTP/1.1 101 Switching Protocols
             Date: Mon, 14 Jan 2013 11:54:24 GMT
             Upgrade: PTTH/1.0
+            Content-Length: 0
             Connection: Upgrade
-
-
           EOS
 
           post_response  = "#{@response.method} #{@response.path} HTTP/1.1\n"
@@ -40,6 +39,7 @@ module Net
           client.puts switch_protocols
           sleep 0.5
           client.puts post_response
+          client.read
         end
       end
 

data/net-ptth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "net-ptth"
-  s.version      = "0.0.3"
+  s.version      = "0.0.4"
   s.summary      = "Net::HTTP compatible reverse HTTP version"
   s.description  = "PTTH Ruby client. Net::HTTP compatible... kind of"
   s.authors      = ["elcuervo"]

data/test/ptth_test.rb

@@ -31,6 +31,7 @@ describe "Using a Rack compatible app to receive requests" do
 
     @server = Net::PTTH::TestServer.new(port: 23045, response: response)
     @ptth = Net::PTTH.new("http://localhost:23045")
+    @ptth.set_debug_output = $stdout if ENV['HTTP_DEBUG']
     @request = Net::HTTP::Post.new("/reverse")
 
     Thread.new { @server.start }
@@ -41,24 +42,18 @@ describe "Using a Rack compatible app to receive requests" do
   end
 
   def check_app_compatibility(app)
-    app.ptth = @ptth
     @ptth.app = app
 
-    timeout(1) { @ptth.request(@request) }
-  rescue Timeout::Error
-    flunk("The reverse connection was not closed")
+    @ptth.async.request(@request)
+    sleep 1
+    @ptth.close
   end
 
   it "should be able to receive a Cuba app" do
     CubaApp = Class.new(Cuba) do
-      class << self
-        attr_accessor :ptth
-      end
-
       define do
         on "custom_app" do
           res.write "indeeed!"
-          self.class.ptth.close
         end
       end
     end
@@ -68,12 +63,7 @@ describe "Using a Rack compatible app to receive requests" do
 
   it "should be able to receive a sinatra app" do
     SinatraApp = Sinatra.new do
-      class << self
-        attr_accessor :ptth
-      end
-
       get "/custom_app" do
-        self.class.ptth.close
         "indeeed!"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ptth
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack