net-ptth 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    net-ptth (0.0.5)
+    net-ptth (0.0.6.pre14)
       celluloid-io (~> 0.12.1)
-      http-parser-lite (~> 0.6.0)
+      http_parser.rb (~> 0.5.3)
       rack (~> 1.4.4)
 
 GEM
@@ -25,8 +25,8 @@ GEM
     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)
+    facter (1.6.18)
+    http_parser.rb (0.5.3)
     minitest (4.4.0)
     nio4r (0.4.3)
     rack (1.4.4)
@@ -38,7 +38,7 @@ GEM
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
-    timers (1.0.2)
+    timers (1.1.0)
 
 PLATFORMS
   ruby

data/SPEC.md

@@ -0,0 +1,6 @@
+host = "http://127.0.0.1:7000"
+ptth = Net::PTTH.new(host)
+
+request = Net::HTTP::Post.new("/reverse")
+ptth.app = Cuba
+response = ptth.request(request)

data/lib/net/ptth/incoming_request.rb

@@ -0,0 +1,16 @@
+class Net::PTTH
+  IncomingRequest = Struct.new(:method, :path, :headers, :body) do
+    def to_env
+      env = {
+        "PATH_INFO" => path,
+        "SCRIPT_NAME" => "",
+        "rack.input" => StringIO.new(body || ""),
+        "REQUEST_METHOD" => method,
+      }
+
+      env.tap { |h| h["CONTENT_LENGTH"] = body.length if !body.nil? }
+
+      env.merge!(headers) if headers
+    end
+  end
+end

data/lib/net/ptth/outgoing_request.rb

@@ -0,0 +1,19 @@
+class Net::PTTH
+  OutgoingRequest = Struct.new(:req) do
+    def to_s
+      package = "#{req.method} #{req.path} HTTP/1.1#{Net::PTTH::CRLF}"
+
+      req["Content-Length"] ||= req.body ? req.body.size : 0
+
+      req.each_header do |header, value|
+        header_parts = header.split("-").map(&:capitalize)
+        package += "#{header_parts.join("-")}: #{value}#{Net::PTTH::CRLF}"
+      end
+
+      package += Net::PTTH::CRLF
+
+      package += req.body if req.body
+      package
+    end
+  end
+end

data/lib/net/ptth/outgoing_response.rb

@@ -0,0 +1,12 @@
+class Net::PTTH
+  OutgoingResponse = Struct.new(:status, :headers, :body) do
+    def to_s
+      packet = "HTTP/1.1 #{status} OK\n"
+      headers.each { |key, value| packet += "#{key}: #{value}\n" }
+      packet += "\r\n"
+      body.each { |chunk| packet += chunk }
+
+      packet
+    end
+  end
+end

data/lib/net/ptth/parser.rb

@@ -0,0 +1,91 @@
+require "http/parser"
+
+class Net::PTTH
+  class Parser
+    attr_reader :headers, :chunk
+
+    # Public: Contructor
+    #
+    def initialize
+      @parser = Http::Parser.new(self)
+      reset
+    end
+
+    # Public: Adds data to be parsed.
+    #
+    #   data: string to be parsed
+    #
+    def add(data)
+      @parser << data
+    end
+    alias_method :<<, :add
+
+    # Public: Check for an upgrade header in the parsed string
+    #
+    def upgrade?
+      @parser.upgrade?
+    end
+
+    # Public: Gets the http method parsed
+    #
+    def http_method
+      @parser.http_method
+    end
+
+    # Public: Gets the http version parsed
+    #
+    def http_version
+      @parser.http_version
+    end
+
+    # Public: Gets the status code parsed
+    #
+    def status_code
+      @parser.status_code
+    end
+
+    # Public: Gets the url parsed
+    #
+    def url
+      @parser.request_url
+    end
+
+    # Public: Internal flag access to know when parsing ended
+    #
+    def finished?; @finished; end
+
+    # Public: Resets the parser internal flags
+    #
+    def reset
+      @finished = false
+      @headers  = nil
+      @chunk    = ""
+    end
+
+    # Public: Access the body of the string being parsed
+    #
+    def body
+      @chunk
+    end
+
+    def body=(chunk)
+      @chunk << chunk
+    end
+
+    # Protected: Sets the headers when the parser completes.
+    #
+    def on_headers_complete(headers)
+      @headers = headers
+    end
+
+    def on_message_begin
+      reset
+    end
+
+    # Protected: Flags the parsing as ended
+    #
+    def on_message_complete
+      @finished = true
+    end
+  end
+end

data/lib/net/ptth/response.rb

@@ -0,0 +1,7 @@
+class Net::PTTH
+  Response = Struct.new(:method, :status, :headers, :body) do
+    def [](key)
+      headers[key]
+    end
+  end
+end

data/lib/net/ptth/socket.rb

@@ -0,0 +1,27 @@
+require "celluloid/io"
+
+class Net::PTTH
+  Socket = Struct.new(:host, :port) do
+    include Celluloid::IO
+
+    def read(bytes = 10240)
+      raw_socket.readpartial(bytes)
+    end
+
+    def write(data)
+      raw_socket.write(data)
+    end
+
+    def close
+      raw_socket.close
+    end
+
+    def open?
+      !raw_socket.closed?
+    end
+
+    def raw_socket
+      @_socket ||= TCPSocket.new(host, port)
+    end
+  end
+end

data/lib/net/ptth.rb

@@ -1,33 +1,35 @@
 require "uri"
 require "rack"
 require "net/http"
-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
+require "net/ptth/socket"
+require "net/ptth/parser"
+require "net/ptth/response"
+require "net/ptth/incoming_request"
+require "net/ptth/outgoing_response"
+require "net/ptth/outgoing_request"
 
-  include Celluloid::IO
+# Public: PTTH constructor.
+#   Attempts to mimic HTTP when applicable
+#
+class Net::PTTH
+  include Celluloid
 
   attr_accessor :app
 
+  CRLF = "\r\n".freeze
+
   # Public: Constructor
   #
   #   address: The address where the connection will be made
   #   port: An optional port if the port is different from the one in the
   #         address
   #
-  def initialize(address, port = 80)
+  def initialize(address, options = {})
     info = URI.parse(address)
 
-    @host, @port = info.host, info.port || port
-    @parser = HTTP::Parser.new
+    @host, @port = info.host, info.port || options.fetch(:port, 80)
+    @keep_alive = options.fetch(:keep_alive, false)
     @debug_output = StringIO.new
   end
 
@@ -42,181 +44,118 @@ class Net::PTTH
   # Public: Closes de current connection
   #
   def close
-    log "Closing connection"
-    @socket.close if @socket
+    @keep_alive = false
+    socket.close if socket
+  end
+
+  # Public: Access to the PTTH::Socket
+  #
+  def socket
+    @_socket ||= Net::PTTH::Socket.new(@host, @port)
+  end
+
+  # Public: Access to the PTTH::Parser
+  #
+  def parser
+    @_parser ||= Net::PTTH::Parser.new
   end
 
   # Public: Generates a request based on a Net::HTTP object and yields a
   #         response
   #
   #   req: The request to be executed
-  #   &block: That will handle the response
   #
-  def request(req, &block)
-    @socket ||= TCPSocket.new(@host, @port)
-
-    log "Connecting to #{@host}:#{@port}"
-
-    packet = build(req)
+  def request(req)
+    outgoing = Net::PTTH::OutgoingRequest.new(req)
+    packet = outgoing.to_s + CRLF
 
-    write(packet)
+    socket.write(packet)
 
-    response = read
-    @parser << response
+    parser.reset
+    response = ""
+    while !parser.finished?
+      buffer = socket.read
+      debug "= #{buffer}"
 
-    if @parser.http_status == 101
-      log "Switching protocols"
-
-      while res = read
-        request = Request.new
-        build_request(request)
-
-        @parser.on_message_complete do
-          env = build_env(request)
-          callbacks(env, &block)
-        end
-
-        @parser << res
-      end
+      response << buffer
+      parser   << buffer
     end
-  rescue IOError => e
-  rescue EOFError => e
-    @socket.close
-  end
 
-  private
+    debug "* Initial Response: #{response}"
 
-  def read(bytes = 1024)
-    response = @socket.readpartial(bytes)
+    if parser.upgrade?
+      debug "* Upgrade response"
+      debug "* Reading socket"
+      parser.reset
 
-    log "Reading response"
-    log response, "-> "
+      while socket.open?
+        response = ""
+        parser.reset
 
-    response
-  end
+        buffer = socket.read
+        response << buffer
+        parser << buffer
 
-  def write(string)
-    log "Writting response"
-    log string[0..200], "<- "
+        if parser.finished?
+          parser.body = buffer.split(CRLF*2).last
+        end
 
-    bytes = @socket.write(string)
-    log "#{bytes} bytes written"
-  end
+        incoming = Net::PTTH::IncomingRequest.new(
+          parser.http_method,
+          parser.url,
+          parser.headers,
+          parser.body
+        )
 
-  # Private: Executes the app and/or block callbacks
-  #
-  #   env: The Rack compatible env
-  #   &block: From the request
-  #
-  def callbacks(env, &block)
-    case
-    when app
-      response = build_response(*app.call(env))
-      write response
-    when block
-      request = Rack::Request.new(env)
-      block.call(request)
+        env = incoming.to_env
+        outgoing_response = Net::PTTH::OutgoingResponse.new(*app.call(env))
+        socket.write(outgoing_response.to_s)
+      end
     else
-      close
-    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
+      debug "* Simple request"
 
-  # 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.nil?
-    end
-
-    env.merge!(request.headers) if request.headers
-  end
+      if parser.finished?
+        parser.body = buffer.split(CRLF*2).last
+      end
 
+      response = Net::PTTH::Response.new(
+        parser.http_method,
+        parser.status_code,
+        parser.headers,
+        parser.body
+      )
 
-  # 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)
+      keep_connection_active if keep_alive?(response)
 
-    @parser.on_url { |url| request.path = url }
-    @parser.on_body do |response_body|
-      request.body = StringIO.new(response_body)
+      response
     end
+
+  rescue IOError => e
+  rescue EOFError => e
+    close
   end
 
+  private
 
-  # Private: Logs a debug message
-  #
-  #   message: The string to be logged
-  #
-  def log(message, prepend = "*  ")
-    parts = (message || "").split("\n")
-    @debug_output << parts.map { |line| prepend + line }.join("\n")
-    @debug_output << "\n"
+  def keep_alive?(response)
+    response.status == 200 && @keep_alive
   end
 
-  # Private: Parses the incoming request headers and adds the information to a
-  #          given object
-  #
-  #   headers: The object in which the headers will be added
-  #
-  def parse_headers(headers)
-    raw_headers = []
-    add_header = proc { |header| raw_headers << header }
-
-    @parser.on_header_field &add_header
-    @parser.on_header_value &add_header
-    @parser.on_headers_complete do
-      raw_headers.each_slice(2) do |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
+  def keep_connection_active
+    after(1) do
+      while @keep_alive do
+        # All you need is love. Something to keep alive the connection of that
+        # given socket
+        socket.write("<3")
+        sleep 1
       end
     end
   end
 
-  # Private: Builds a reversed request
+  # Private: outputs debug information
+  #   string: The string to be logged
   #
-  #   req: The request to be build
-  #
-  def build(req)
-    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|
-      header_parts = header.split("-").map(&:capitalize)
-      package += "#{header_parts.join("-")}: #{value}\n"
-    end
-
-    package += "\n\r#{req.body}" if req.body
-    package += "\r\n\r\n"
-    package
+  def debug(string)
+    @debug_output << string + "\n"
   end
 end

data/net-ptth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "net-ptth"
-  s.version      = "0.0.5"
+  s.version      = "0.0.6"
   s.summary      = "Net::HTTP compatible reverse HTTP version"
   s.description  = "PTTH Ruby client. Net::HTTP compatible... kind of"
   s.authors      = ["elcuervo"]
@@ -10,9 +10,9 @@ 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")
+  s.add_dependency("rack", "~> 1.5.2")
+  s.add_dependency("celluloid-io", "~> 0.15.0")
+  s.add_dependency("http_parser.rb", "~> 0.5.3")
 
   s.add_development_dependency("minitest", "~> 4.4.0")
   s.add_development_dependency("cuba", "~> 3.1.0")

data/test/ptth_test.rb

@@ -4,27 +4,6 @@ require "sinatra/base"
 require "net/ptth"
 require "net/ptth/test"
 
-describe "PTTH connection" do
-  before do
-    @server = Net::PTTH::TestServer.new(port: 23045)
-    Thread.new { @server.start }
-  end
-
-  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")
-
-    ptth.request(request) do |incoming_request|
-      assert_equal "reversed", incoming_request.body.read
-      ptth.close
-    end
-  end
-end
-
 describe "Using a Rack compatible app to receive requests" do
   before do
     response = Net::HTTP::Get.new("/custom_app")
@@ -74,7 +53,8 @@ end
 
 describe "PTTH Test server" do
   before do
-    response = Net::HTTP::Get.new("/other")
+    response = Net::HTTP::Post.new("/other")
+    response.body = "thing"
     @server = Net::PTTH::TestServer.new(port: 23045, response: response)
 
     Thread.new { @server.start }
@@ -88,9 +68,12 @@ describe "PTTH Test server" do
     ptth = Net::PTTH.new("http://localhost:23045")
     request = Net::HTTP::Post.new("/reverse")
 
-    ptth.request(request) do |incoming_request|
-      assert_equal "/other", incoming_request.path
-      ptth.close
+    ptth.app = Cuba.define do
+      on "other" do
+        ptth.close
+      end
     end
+
+    ptth.request(request)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ptth
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
-  name: http-parser-lite
+  name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- SPEC.md
 - lib/net/ptth.rb
+- lib/net/ptth/incoming_request.rb
+- lib/net/ptth/outgoing_request.rb
+- lib/net/ptth/outgoing_response.rb
+- lib/net/ptth/parser.rb
+- lib/net/ptth/response.rb
+- lib/net/ptth/socket.rb
 - lib/net/ptth/test.rb
 - net-ptth.gemspec
 - test/ptth_test.rb