httpkit 0.6.0.pre.5 → 0.6.0

data/lib/httpkit.rb

@@ -31,6 +31,7 @@ require 'httpkit/server/body_handler'
 require 'httpkit/server/mandatory_handler'
 require 'httpkit/server/keep_alive_handler'
 require 'httpkit/server/timeouts_handler'
+require 'httpkit/server/block_handler'
 
 module HTTPkit
   def self.run
@@ -56,4 +57,25 @@ module HTTPkit
     EM.add_timer(duration) { promise.fulfill }
     promise.sync
   end
+
+  def self.random_port(address)
+    server = TCPServer.new(address, 0)
+    server.addr[1]
+  ensure
+    server.shutdown if server
+  end
+
+  def self.server(uri, &block)
+    uri = URI(uri)
+    Server.start(address: uri.host, port: uri.port,
+                 handlers: [Server::KeepAliveHandler.new,
+                            Server::TimeoutsHandler.new,
+                            Server::BlockHandler.new(block)])
+  end
+
+  def self.request(*args)
+    uri = URI(args[1])
+    client = Client.start(address: uri.host, port: uri.port)
+    client.request(*args)
+  end
 end

data/lib/httpkit/body.rb

@@ -53,6 +53,10 @@ module HTTPkit
       each.to_a.join
     end
 
+    def chunks
+      @chunks.dup
+    end
+
     def inspect
       len = length_known? ? length : 'unknown'
       sprintf('#<%s:0x%d @length=%s>', self.class.name, object_id, len)

data/lib/httpkit/client.rb

@@ -25,12 +25,6 @@ module HTTPkit
       Connection::EventMachine.start_client(config, self)
     end
 
-    def self.request(*args)
-      uri = URI(args[1])
-      client = start(address: uri.host, port: uri.port)
-      client.request(*args)
-    end
-
     attr_reader :config
 
     def initialize(config, connection)
@@ -60,10 +54,8 @@ module HTTPkit
       request, served = find_request
 
       if request
-        # XXX: fulfillment should happen after invoke(:receive), so that all
-        #      handlers have run when the application code resumes
-        served.fulfill(response)
         request, response = @handlers.invoke(:receive, request, response)
+        served.fulfill(response)
         response.closed { finish(request) }
       end
     end

data/lib/httpkit/client/keep_alive_handler.rb

@@ -4,6 +4,7 @@ module HTTPkit
   class Client::KeepAliveHandler
     def perform(request)
       @previous, previous = request, @previous
+      # TODO: move to Serializer
       previous.closed! if previous
     end
   end

data/lib/httpkit/connection/eventmachine.rb

@@ -32,7 +32,8 @@ module HTTPkit
         # p data
         @parser << data
       rescue => ex
-        # puts [ex.message, *ex.backtrace].join("\n\t")
+        # message = ex.message.empty? ? ex.class : ex.message
+        # puts [message, *ex.backtrace].join("\n\t")
         close(ex)
       end
 

data/lib/httpkit/server/block_handler.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+module HTTPkit
+  class Server::BlockHandler
+    def initialize(block)
+      @block = block
+    end
+
+    def serve(request, served)
+      @block.call(request, served)
+    end
+  end
+end

data/lib/httpkit/server/keep_alive_handler.rb

@@ -47,6 +47,7 @@ module HTTPkit
 
     def synchronize_responses(request)
       served = @requests[sequence(request) - 1]
+      # TODO: only wait for served, move rest to Serializer
       served.sync.closed! if served
     end
 

data/lib/httpkit/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HTTPkit
-  VERSION = '0.6.0.pre.5'
+  VERSION = '0.6.0'
 end

data/spec/integration/timeouts_spec.rb

@@ -6,7 +6,7 @@ describe HTTPkit::Client, 'in connecting state', reactor: true do
   # connect to a non-existing host to provoke connection timeout
   let(:address) { '1.2.3.4' }
   let(:client_config) do
-    { address: address, port: random_port,
+    { address: address, port: 1234,
       handlers: [HTTPkit::Client::TimeoutsHandler.new] }
   end
   let!(:client)  { HTTPkit::Client.start(client_config) }
@@ -20,7 +20,8 @@ describe HTTPkit::Client, 'in connecting state', reactor: true do
 
   describe 'with :connect_timeout option' do
     let(:client_config) do
-      { address: address, port: random_port, connect_timeout: 0.01,
+      { address: address, port: 1234,
+        connect_timeout: 0.01,
         handlers: [HTTPkit::Client::TimeoutsHandler.new] }
     end
 

data/spec/support/helper.rb

@@ -46,18 +46,11 @@ module SpecHelper
     '127.0.0.1'
   end
 
-  def random_port
-    server = TCPServer.new(localhost, 0)
-    server.addr[1]
-  ensure
-    server.shutdown
-  end
-
   def server_client_pair(server_config, client_config, interceptor)
     server = nil
     inspect_server(server_config, interceptor) { |_, s, _| server = s }
 
-    config = { address: localhost, port: random_port }
+    config = { address: localhost, port: HTTPkit.random_port(localhost) }
     HTTPkit::Server.start(config.merge(server_config))
     client = HTTPkit::Client.start(config.merge(client_config))
 

data/spec/unit/client_spec.rb

@@ -6,7 +6,8 @@ describe HTTPkit::Client do
   let(:client) { described_class.new(config, connection) }
 
   let(:config) do
-    { address: localhost, port: random_port, handlers: [handler] }
+    { address: localhost, port: HTTPkit.random_port(localhost),
+      handlers: [handler] }
   end
   let(:connection) do
     double('connection', :'on_message=' => nil,
@@ -31,26 +32,6 @@ describe HTTPkit::Client do
     end
   end
 
-  describe '.request' do
-    let(:arg) { double }
-    let(:uri) { 'http://localhost:3000' }
-
-    let(:options)  { { address: 'localhost', port: 3000 } }
-    let(:client)   { double }
-    let(:response) { double }
-
-    before do
-      allow(described_class).to receive(:start).with(options) { client }
-      allow(client).to receive(:request).with(arg, uri, arg, arg) { response }
-    end
-
-    subject { described_class.request(arg, uri, arg, arg) }
-
-    it 'starts a client and performs the request' do
-      expect(subject).to be(response)
-    end
-  end
-
   describe '#initialize' do
     let(:on_message) { client.method(:receive) }
     let(:teadown) { client.method(:teardown) }

data/spec/unit/server_spec.rb

@@ -6,7 +6,8 @@ describe HTTPkit::Server do
   let(:server) { described_class.new(config, connection) }
 
   let(:config) do
-    { address: localhost, port: random_port, handlers: [handler] }
+    { address: localhost, port: HTTPkit.random_port(localhost),
+      handlers: [handler] }
   end
   let(:connection) do
     double('connection', :'on_message=' => nil,
@@ -53,6 +54,13 @@ describe HTTPkit::Server do
           .to be_a(HTTPkit::Server::BodyHandler)
       end
     end
+
+    let(:request) { double(sequence: nil) }
+
+    it 'sets up sequence numbering' do
+      server.serve(request)
+      expect(request).to have_received(:sequence).with(server, 1)
+    end
   end
 
   describe '#serve', reactor: true do
@@ -119,4 +127,6 @@ describe HTTPkit::Server do
   end
 
   describe '#setup_connection'
+
+  describe '#serve!'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpkit
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Lars Gierth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -94,7 +94,6 @@ files:
 - .yardopts
 - Gemfile
 - Gemfile.devtools
-- Procfile
 - README.md
 - Rakefile
 - UNLICENSE
@@ -105,8 +104,37 @@ files:
 - config/reek.yml
 - config/rubocop.yml
 - config/yardstick.yml
+- doc/api/httpkit.html
+- doc/api/httpkit/body.html
+- doc/api/httpkit/client.html
+- doc/api/httpkit/client/body_handler.html
+- doc/api/httpkit/client/keep_alive_handler.html
+- doc/api/httpkit/client/mandatory_handler.html
+- doc/api/httpkit/client/timeouts_handler.html
+- doc/api/httpkit/connection/eventmachine.html
+- doc/api/httpkit/connection/status.html
+- doc/api/httpkit/promise.html
+- doc/api/httpkit/request.html
+- doc/api/httpkit/response.html
+- doc/api/httpkit/serializer.html
+- doc/api/httpkit/server.html
+- doc/api/httpkit/server/block_handler.html
+- doc/api/httpkit/server/body_handler.html
+- doc/api/httpkit/server/keep_alive_handler.html
+- doc/api/httpkit/server/mandatory_handler.html
+- doc/api/httpkit/server/timeouts_handler.html
+- doc/api/httpkit/support/handler_manager.html
+- doc/api/httpkit/support/message.html
+- doc/api/httpkit/version.html
+- doc/examples/echo_server.html
+- doc/examples/error_handling.html
+- doc/examples/getting_started.html
+- doc/examples/streaming.html
+- doc/index.html
 - examples/echo_server.rb
+- examples/error_handling.rb
 - examples/getting_started.rb
+- examples/streaming.rb
 - httpkit.gemspec
 - lib/httpkit.rb
 - lib/httpkit/body.rb
@@ -122,6 +150,7 @@ files:
 - lib/httpkit/response.rb
 - lib/httpkit/serializer.rb
 - lib/httpkit/server.rb
+- lib/httpkit/server/block_handler.rb
 - lib/httpkit/server/body_handler.rb
 - lib/httpkit/server/keep_alive_handler.rb
 - lib/httpkit/server/mandatory_handler.rb
@@ -171,9 +200,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.3.0

data/Procfile

@@ -1 +0,0 @@
-web: env PORT=$PORT ADDRESS=0.0.0.0 bundle exec ruby examples/echo_server.rb