net-ptth 0.0.2 → 0.0.3

data/Gemfile

@@ -2,3 +2,7 @@ source :rubygems
 
 gemspec
 gem "rake"
+
+group :development do
+  gem "debugger"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    net-ptth (0.0.2)
+    net-ptth (0.0.3)
       celluloid-io (~> 0.12.1)
       http-parser-lite (~> 0.6.0)
       rack (~> 1.4.4)
@@ -15,18 +15,38 @@ GEM
     celluloid-io (0.12.1)
       celluloid (~> 0.12.0)
       nio4r (>= 0.4.0)
+    columnize (0.3.6)
+    cuba (3.1.0)
+      rack
+    debugger (1.2.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.3)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.3)
     facter (1.6.17)
     http-parser-lite (0.6.0)
     minitest (4.4.0)
     nio4r (0.4.3)
     rack (1.4.4)
+    rack-protection (1.2.0)
+      rack
     rake (10.0.3)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
     timers (1.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  cuba (~> 3.1.0)
+  debugger
   minitest (~> 4.4.0)
   net-ptth!
   rake
+  sinatra (~> 1.3.3)

data/README.md

@@ -9,7 +9,7 @@ No I don't: http://wiki.secondlife.com/wiki/Reverse_HTTP
 ## Installation
 
 ```bash
-  gem install net-ptth
+gem install net-ptth
 ```
 
 ## Usage
@@ -28,3 +28,29 @@ ptth.request(request) do |incomming_request|
   # ptth.close
 end
 ```
+
+## Rack compatiblity
+
+_Remember that letting an app handle the responses it's also in charge of
+closing the reverse connection if needed_
+
+An app can be defined to be mounted like rackup will. So you can do things like
+this:
+
+```ruby
+require 'net/ptth'
+require 'net/http'
+
+ptth = Net::PTTH.new("http://localhost:23045")
+ptth.app = Cuba.define do
+  on "dog" do
+    res.write "Hello? this is dog"
+  end
+end
+
+request = Net::HTTP::Post.new("/reverse")
+ptth.request(request)
+```
+
+And let the app handle the responses of the reverse connection.
+Both Cuba and sinatra were tested

data/lib/net/ptth.rb

@@ -5,8 +5,18 @@ require "http-parser"
 require "celluloid/io"
 
 class Net::PTTH
+  class Request
+    attr_accessor :path, :body, :headers
+
+    def initialize(path = "", body = "", headers = {})
+      @path, @body, @headers = path, body, headers
+    end
+  end
+
   include Celluloid::IO
 
+  attr_accessor :app
+
   # Public: Constructor
   #
   #   address: The address where the connection will be made
@@ -66,32 +76,12 @@ class Net::PTTH
         log "[Incoming response]"
         log res
 
-        headers = {}
-        path = nil
-        body = ""
-
-        @parser.reset
-        parse_headers(headers)
+        request = Request.new
+        build_request(request)
 
-        @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)
+          env = build_env(request)
+          callbacks(env, &block)
         end
 
         @parser << res
@@ -104,6 +94,57 @@ class Net::PTTH
 
   private
 
+  # Private: Executes the app and/or block callbacks
+  #
+  #   env: The Rack compatible env
+  #   &block: From the request
+  #
+  def callbacks(env, &block)
+    case
+    when app then app.call(env)
+    when block
+      request = Rack::Request.new(env)
+      block.call(request)
+    else
+      close
+    end
+  end
+
+  # Private: Builds a Rack compatible env from a PTTH::Request
+  #
+  #   request: A PTTH parsed request
+  #
+  def build_env(request)
+    env = {
+      "PATH_INFO" => request.path,
+      "SCRIPT_NAME" => "",
+      "rack.input" => request.body,
+      "REQUEST_METHOD" => @parser.http_method,
+    }
+
+    env.tap do |h|
+      h["CONTENT_LENGTH"] = request.body.length if request.body
+    end
+
+    env.merge!(request.headers) if request.headers
+  end
+
+
+  # Private: Builds a PTTH::Request from the parsed input
+  #
+  #   request: The object where the parsed content will be placed
+  #
+  def build_request(request)
+    @parser.reset
+    parse_headers(request.headers)
+
+    @parser.on_url { |url| request.path = url }
+    @parser.on_body do |response_body|
+      request.body = StringIO.new(response_body)
+    end
+  end
+
+
   # Private: Logs a debug message
   #
   #   message: The string to be logged
@@ -125,7 +166,13 @@ class Net::PTTH
     @parser.on_header_value &add_header
     @parser.on_headers_complete do
       raw_headers.each_slice(2) do |key, value|
-        headers[key] = value
+        header_name = key.
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          upcase
+
+        headers["HTTP_" + header_name] = value
       end
     end
   end

data/net-ptth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "net-ptth"
-  s.version      = "0.0.2"
+  s.version      = "0.0.3"
   s.summary      = "Net::HTTP compatible reverse HTTP version"
   s.description  = "PTTH Ruby client. Net::HTTP compatible... kind of"
   s.authors      = ["elcuervo"]
@@ -15,4 +15,6 @@ Gem::Specification.new do |s|
   s.add_dependency("http-parser-lite", "~> 0.6.0")
 
   s.add_development_dependency("minitest", "~> 4.4.0")
+  s.add_development_dependency("cuba", "~> 3.1.0")
+  s.add_development_dependency("sinatra", "~> 1.3.3")
 end

data/test/ptth_test.rb

@@ -1,4 +1,6 @@
 require_relative "./test_helper"
+require "cuba"
+require "sinatra/base"
 require "net/ptth"
 require "net/ptth/test"
 
@@ -23,6 +25,63 @@ describe "PTTH connection" do
   end
 end
 
+describe "Using a Rack compatible app to receive requests" do
+  before do
+    response = Net::HTTP::Get.new("/custom_app")
+
+    @server = Net::PTTH::TestServer.new(port: 23045, response: response)
+    @ptth = Net::PTTH.new("http://localhost:23045")
+    @request = Net::HTTP::Post.new("/reverse")
+
+    Thread.new { @server.start }
+  end
+
+  after do
+    @server.close
+  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")
+  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
+
+    check_app_compatibility(CubaApp)
+  end
+
+  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
+
+    check_app_compatibility(SinatraApp)
+  end
+end
+
 describe "PTTH Test server" do
   before do
     response = Net::HTTP::Get.new("/other")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ptth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -75,6 +75,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.4.0
+- !ruby/object:Gem::Dependency
+  name: cuba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 description: PTTH Ruby client. Net::HTTP compatible... kind of
 email:
 - yo@brunoaguirre.com