net-ptth 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    net-ptth (0.0.1)
+    net-ptth (0.0.2)
       celluloid-io (~> 0.12.1)
       http-parser-lite (~> 0.6.0)
+      rack (~> 1.4.4)
 
 GEM
   remote: http://rubygems.org/
@@ -18,6 +19,7 @@ GEM
     http-parser-lite (0.6.0)
     minitest (4.4.0)
     nio4r (0.4.3)
+    rack (1.4.4)
     rake (10.0.3)
     timers (1.0.2)
 

data/README.md

@@ -2,6 +2,10 @@
 
 `Net::HTTP` compatible `PTTH` client
 
+## You misspelled HTTP
+
+No I don't: http://wiki.secondlife.com/wiki/Reverse_HTTP
+
 ## Installation
 
 ```bash
@@ -16,7 +20,11 @@ require 'net/http'
 
 ptth = Net::PTTH.new("http://localhost:23045")
 request = Net::HTTP::Post.new("/reverse")
-ptth.request(request) do |body, headers|
+ptth.request(request) do |incomming_request|
   # Handle the body of the incomming request through the reverse connection
+  # This will be executed with each new request.
+  # incomming_request it's a Rack::Request object
+  # You can close the connection with:
+  # ptth.close
 end
 ```

data/lib/net/ptth/test.rb

@@ -0,0 +1,53 @@
+require "net/http"
+
+module Net
+  class PTTH
+    class TestServer
+      # Public: Initialize the PTTH test server
+      #
+      #   port: the port in which the server will listen
+      #
+      def initialize(configuration = {})
+        port = configuration.fetch(:port, 23045)
+        response = Net::HTTP::Post.new("/reverse")
+        response.body = "reversed"
+
+        @response = configuration.fetch(:response, response)
+        @server = TCPServer.new(port)
+      end
+
+      # Public: Starts the test server
+      #
+      def start
+        loop do
+          client = @server.accept
+
+          switch_protocols = <<-EOS.gsub(/^\s+/, '')
+            HTTP/1.1 101 Switching Protocols
+            Date: Mon, 14 Jan 2013 11:54:24 GMT
+            Upgrade: PTTH/1.0
+            Connection: Upgrade
+
+
+          EOS
+
+          post_response  = "#{@response.method} #{@response.path} HTTP/1.1\n"
+          post_response += "Content-Length: #{@response.body.length}\n" if @response.body
+          post_response += "Accept: */*\n"
+          post_response += "\n"
+          post_response += @response.body if @response.body
+
+          client.puts switch_protocols
+          sleep 0.5
+          client.puts post_response
+        end
+      end
+
+      # Public: Stops the current server
+      #
+      def close
+        @server.close
+      end
+    end
+  end
+end

data/lib/net/ptth.rb

@@ -1,4 +1,5 @@
 require "uri"
+require "rack"
 require "net/http"
 require "http-parser"
 require "celluloid/io"
@@ -66,13 +67,32 @@ class Net::PTTH
         log res
 
         headers = {}
-        body = nil
+        path = nil
+        body = ""
 
         @parser.reset
         parse_headers(headers)
 
-        @parser.on_body { |response_body| body = response_body }
-        @parser.on_message_complete { block.call(body, headers) }
+        @parser.on_url { |url| path = url }
+        @parser.on_body { |response_body| body = StringIO.new(response_body) }
+        @parser.on_message_complete do
+          env = {
+            "PATH_INFO" => path,
+            "rack.input" => body,
+            "REQUEST_METHOD" => @parser.http_method,
+          }
+
+          env.tap do |h|
+            h["CONTENT_LENGTH"] = body.length if body
+          end
+
+          request = Rack::Request.new(env)
+          headers.each do |header, value|
+            request[header] = value
+          end
+
+          block.call(request)
+        end
 
         @parser << res
       end

data/net-ptth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "net-ptth"
-  s.version      = "0.0.1"
+  s.version      = "0.0.2"
   s.summary      = "Net::HTTP compatible reverse HTTP version"
   s.description  = "PTTH Ruby client. Net::HTTP compatible... kind of"
   s.authors      = ["elcuervo"]
@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files test`.split("\n")
 
+  s.add_dependency("rack", "~> 1.4.4")
   s.add_dependency("celluloid-io", "~> 0.12.1")
   s.add_dependency("http-parser-lite", "~> 0.6.0")
 

data/test/ptth_test.rb

@@ -1,46 +1,46 @@
 require_relative "./test_helper"
 require "net/ptth"
+require "net/ptth/test"
 
 describe "PTTH connection" do
   before do
-    Thread.new do
-      @server = TCPServer.new(23045)
-
-      loop do
-        client = @server.accept
+    @server = Net::PTTH::TestServer.new(port: 23045)
+    Thread.new { @server.start }
+  end
 
-        switch_protocols = <<-EOS.gsub(/^\s+/, '')
-          HTTP/1.1 101 Switching Protocols
-          Date: Mon, 14 Jan 2013 11:54:24 GMT
-          Upgrade: PTTH/1.0
-          Connection: Upgrade
+  after do
+    @server.close
+  end
 
+  it "should stablish a reverse connection" do
+    ptth = Net::PTTH.new("http://localhost:23045")
+    request = Net::HTTP::Post.new("/reverse")
 
-        EOS
+    ptth.request(request) do |incoming_request|
+      assert_equal "reversed", incoming_request.body.read
+      ptth.close
+    end
+  end
+end
 
-        post_response  = "POST /reversed HTTP/1.1\n"
-        post_response += "Content-Length: 8\n"
-        post_response += "Accept: */*\n"
-        post_response += "\n"
-        post_response += "reversed"
+describe "PTTH Test server" do
+  before do
+    response = Net::HTTP::Get.new("/other")
+    @server = Net::PTTH::TestServer.new(port: 23045, response: response)
 
-        client.puts switch_protocols
-        sleep 0.5
-        client.puts post_response
-      end
-    end
+    Thread.new { @server.start }
   end
 
   after do
     @server.close
   end
 
-  it "should stablish a reverse connection" do
+  it "should be able to switch the incoming test request" do
     ptth = Net::PTTH.new("http://localhost:23045")
     request = Net::HTTP::Post.new("/reverse")
 
-    ptth.request(request) do |body|
-      assert_equal "reversed", body
+    ptth.request(request) do |incoming_request|
+      assert_equal "/other", incoming_request.path
       ptth.close
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ptth
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +89,7 @@ files:
 - README.md
 - Rakefile
 - lib/net/ptth.rb
+- lib/net/ptth/test.rb
 - net-ptth.gemspec
 - test/ptth_test.rb
 - test/test_helper.rb