hatetepe 0.6.0.pre.1 → 0.6.0.pre.2

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
 rvm:
   - 1.9.3
-script: bundle exec rake ci:metrics
+  - 2.0.0
+  - jruby-19mode
+  - rbx
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+script: bundle exec rake -t ci:metrics spec:integration

data/.yardopts

@@ -1 +1,2 @@
-- LICENSE
+- LICENSE.txt
+- examples/*

data/Gemfile

@@ -9,5 +9,11 @@ gem 'fuubar',   git: 'https://github.com/lgierth/fuubar.git',
                 ref: 'static-percentage'
 gem 'awesome_print'
 
+platform :rbx do
+  gem 'rubysl-fiber', '~> 2.0'
+  gem 'rubysl-weakref', '~> 2.0'
+  gem 'rubinius', '~> 2.0'
+end
+
 # Added by devtools
 eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -4,6 +4,10 @@ group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
   gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
@@ -11,14 +15,13 @@ group :yard do
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.1'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 3.0.2'
-  gem 'guard-rubocop', '~> 0.2.0'
-  gem 'guard-mutant',  '~> 0.0.1'
+  gem 'guard',         '~> 2.2.4'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.0.4'
+  gem 'guard-rubocop', '~> 1.0.0'
 
   # file system change event handling
-  gem 'listen',     '~> 1.3.0'
+  gem 'listen',     '~> 2.2.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -30,18 +33,27 @@ group :guard do
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.6.7'
+  gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.1.1'
+  gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.12.0'
-  gem 'simplecov', '~> 0.7.1'
+  gem 'rubocop',   '~> 0.15.0'
+  gem 'simplecov', '~> 0.8.2'
   gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
+    gem 'mutant',          '~> 0.3.0.rc3', git: 'https://github.com/mbj/mutant.git'
+    gem 'unparser',        '~> 0.1.5',     git: 'https://github.com/mbj/unparser.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
+
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4.10'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
+  end
 end
 
 group :benchmarks do

data/Procfile

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

data/README.md

@@ -1,9 +1,19 @@
-# Hatetepe, the HTTP toolkit [![Build Status](https://travis-ci.org/lgierth/hatetepe.png?branch=master)](https://travis-ci.org/lgierth/hatetepe) [![Code Climate](https://codeclimate.com/github/lgierth/hatetepe.png)](https://codeclimate.com/github/lgierth/hatetepe)
+# The HTTP toolkit [![Build Status](https://travis-ci.org/lgierth/hatetepe.png?branch=master)](https://travis-ci.org/lgierth/hatetepe) [![Code Climate](https://codeclimate.com/github/lgierth/hatetepe.png)](https://codeclimate.com/github/lgierth/hatetepe) [![Coverage Status](https://coveralls.io/repos/lgierth/hatetepe/badge.png?branch=master)](https://coveralls.io/r/lgierth/hatetepe?branch=master)
 
-General purpose toolkit for HTTP clients and servers.
+Hatetepe is a Ruby toolkit for building HTTP clients and servers,
+as well as compositions of them.
 
-Note: The `master` branch contains the latest development effort. Look at the
-`0.5.x` branch for stable releases.
+- \#1 feature: readable, high-quality, extendable code with 61.11% mutation coverage (wip)
+- \#2 feature: sophisticated request and response streaming
+- \#3 feature: compatible with Rack, Faraday, and Webmachine for Ruby (todo)
+- \#4 feature: concurrenct or non-concurrent
+  - Non-concurrent using one-off EventMachine reactor (clients only)
+  - Evented using EventMachine
+  - Synchronously evented using EventMachine and Fibers
+  - Threaded using Celluloid (todo)
+
+*Note:* The `master` branch contains the latest development effort. Look at the
+`0.5.x` branch for stable, but very old releases.
 
 ## Installation
 
@@ -21,30 +31,29 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Code examples
+
+- [Getting started ](http://rubydoc.info/github/lgierth/hatetepe/master/file/examples/getting_started.rb)
+- [HTTP echo server](http://rubydoc.info/github/lgierth/hatetepe/master/file/examples/echo_server.rb)
+
+API Reference
+
+- [Hatetepe::Client    ](http://rubydoc.info/github/lgierth/hatetepe/master/Hatetepe/Client)
+- [Hatetepe::Server    ](http://rubydoc.info/github/lgierth/hatetepe/master/Hatetepe/Server)
+- [Hatetepe::Response  ](http://rubydoc.info/github/lgierth/hatetepe/master/Hatetepe/Request)
+- [Hatetepe::Request   ](http://rubydoc.info/github/lgierth/hatetepe/master/Hatetepe/Response)
+- [Hatetepe::Body      ](http://rubydoc.info/github/lgierth/hatetepe/master/Hatetepe/Body)
+- [Hatetepe::Promise   ](http://rubydoc.info/github/lgierth/hatetepe/master/Hatetepe/Promise)
+- [Hatetepe::Serializer](http://rubydoc.info/github/lgierth/hatetepe/master/Hatetepe/Serializer)
 
 ## To do
 
-- Next
-  - Error handling
-  - Unit tests
-  - Method/Status semantics (GET/HEAD/204/etc.)
-  - Host header
-  - Date header
-  - Documentation
-- Future
-  - SSL support
-  - Webmachine adapter
-  - Request/Response pass-through
-  - Graceful shutdown
-  - Celluloid::IO backend
-  - Circuit breaker
-- Nice to have
-  - Rack handler
-  - Faraday adapter
-  - Following redirects
-  - Proxy support
-  - Client handling multipart responses
+Here: https://trello.com/b/OoxEq1ze/hatetepe
+
+## License
+
+Hatetepe is licensed under the [MIT License](http://opensource.org/licenses/MIT).
+See LICENSE.txt for details.
 
 ## Contributing
 

data/config/devtools.yml

@@ -1,2 +1,2 @@
 ---
-unit_test_timeout: 0.1
+unit_test_timeout: 0.0

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 8
-total_score: 147
+total_score: 164

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 9.6
+threshold: 10.0

data/config/reek.yml

@@ -34,6 +34,8 @@ LongParameterList:
   overrides:
     initialize:
       max_params: 4
+    setup:
+      max_params: 3
 LongYieldList:
   enabled: true
   exclude: []
@@ -57,7 +59,7 @@ TooManyInstanceVariables:
 TooManyMethods:
   enabled: true
   exclude: []
-  max_methods: 10
+  max_methods: 11
 TooManyStatements:
   enabled: true
   exclude:
@@ -95,6 +97,8 @@ UncommunicativeVariableName:
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
   accept:
+  - k
+  - v
   - a
   - e
   - _

data/config/rubocop.yml

@@ -24,14 +24,8 @@ CollectionMethods:
     find:     'detect'
     find_all: 'select'
 
-# Do not force public/protected/private keyword to be indented at the same
-# level as the def keyword. My personal preference is to outdent these keywords
-# because I think when scanning code it makes it easier to identify the
-# sections of code and visually separate them. When the keyword is at the same
-# level I think it sort of blends in with the def keywords and makes it harder
-# to scan the code and see where the sections are.
-AccessControl:
-  Enabled: false
+AccessModifierIndentation:
+  EnforcedStyle: indent
 
 # Limit line length
 LineLength:

data/examples/echo_server.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require 'hatetepe'
+
+class EchoServer
+  def serve(request, served)
+    response = streaming_response
+    served.fulfill(response)
+
+    serialize(request, response)
+    request.closed { response.close }
+  end
+
+  private
+
+  def streaming_response
+    Hatetepe::Response.new(200, { 'Content-Type' => 'text/plain' },
+                           Hatetepe::Body.new)
+  end
+
+  def serialize(request, response)
+    writer     = response.body.closed.method(:progress)
+    serializer = Hatetepe::Serializer.new(request, writer)
+    serializer.serialize
+  end
+
+  def writer(response)
+    proc { |data| response.body.closed.progress(data) }
+  end
+end
+
+Hatetepe.run do
+  Hatetepe::Server.start(address:  ENV.fetch('ADDRESS', '127.0.0.1'),
+                         port:     ENV.fetch('PORT', 3000).to_i,
+                         handlers: [Hatetepe::Server::KeepAlive, EchoServer])
+
+  terminated = Hatetepe::Promise.new
+  Signal.trap(:INT)  { terminated.fulfill }
+  Signal.trap(:TERM) { terminated.fulfill }
+  terminated.sync
+end

data/examples/getting_started.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+require 'hatetepe'
+
+class HelloServer
+  def serve(request, served)
+    p request.http_method # => :get
+    p request.uri         # => "/"
+    p request.headers     # => {"Host"=>"127.0.0.1:3000",
+                          #     "Content-Length"=>"0"}
+    p request.body.to_s   # => ""
+
+    served.fulfill(response)
+  end
+
+  def response
+    Hatetepe::Response.new(200, { 'Content-Type' => 'text/plain' }, 'hello')
+  end
+end
+
+Hatetepe.run do
+  Hatetepe::Server.start(address:  '127.0.0.1', port: 3000,
+                         handlers: [HelloServer])
+
+  client = Hatetepe::Client.new(address: '127.0.0.1', port: 3000)
+
+  response = client.request(:get, '/')
+
+  p response.status      # => 200
+  p response.status_name # => "OK"
+  p response.headers     # => {"Content-Type"=>"text/plain",
+                         #     "Content-Length"=>"5"}
+  p response.body.to_s   # => "hello"
+end

data/hatetepe.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "eventmachine"
   spec.add_dependency "http_parser.rb"
-  spec.add_dependency "promise.rb"
+  spec.add_dependency "promise.rb", "~> 0.3.0"
 
   spec.add_development_dependency "rspec"
 end

data/lib/hatetepe/body.rb

@@ -15,6 +15,7 @@ module Hatetepe
       end
     end
 
+    # TODO: eliminate string param
     def initialize(string = '')
       @io = StringIO.new(string)
 
@@ -49,6 +50,10 @@ module Hatetepe
       @io.string
     end
 
+    def string
+      @io.string
+    end
+
     private
 
     def optimized_read?(length)

data/lib/hatetepe/client/keep_alive.rb

@@ -2,10 +2,6 @@
 
 module Hatetepe
   class Client::KeepAlive
-    def initialize(*_)
-      @previous = nil
-    end
-
     def perform(request)
       @previous, previous = request, @previous
       previous.closed! if previous

data/lib/hatetepe/client/timeouts.rb

@@ -3,17 +3,12 @@
 module Hatetepe
   # @see EM.heartbeat_interval
   class Client::Timeouts
-    def initialize(config, _, connection)
+    def setup(config, _, connection)
       @config = config
       @connection = connection
 
-      @config[:timeout]         ||= 2.0
-      @config[:connect_timeout] ||= 2.0
-    end
-
-    def setup
-      @connection.comm_inactivity_timeout = @config[:timeout]
-      @connection.pending_connect_timeout = @config[:connect_timeout]
+      @connection.comm_inactivity_timeout = @config[:timeout]         ||= 2.0
+      @connection.pending_connect_timeout = @config[:connect_timeout] ||= 2.0
     end
   end
 end

data/lib/hatetepe/client.rb

@@ -2,6 +2,11 @@
 
 module Hatetepe
   class Client
+    USER_AGENT = 'User-Agent'.freeze
+    USER_AGENT_VALUE = "hatetepe/#{Hatetepe::VERSION}".freeze
+    HOST = 'Host'.freeze
+    HOST_VALUE = '%s:%d'.freeze
+
     include Support::Handlers
     include Connection::Status
 
@@ -13,11 +18,11 @@ module Hatetepe
 
       setup_connection
       setup_handlers
-      notify_handlers(:setup)
+      notify_handlers(:setup, @config, self, @connection)
     end
 
-    def request(http_method, uri)
-      request = Request.new(http_method, uri)
+    def request(*args)
+      request = Request.new(*args)
       perform(request).sync
     end
 
@@ -25,7 +30,9 @@ module Hatetepe
       served = Promise.new
       @requests << [request, served]
 
+      add_extra_headers(request)
       Fiber.new { perform!(request) }.resume
+
       served
     end
 
@@ -33,13 +40,12 @@ module Hatetepe
       request, served = correlate
 
       served.fulfill(response)
-      response.closed { finish(request) }
-
       notify_handlers(:receive, request, response)
+      response.closed { finish(request) }
     end
 
     def finish(request)
-      @requests.delete_if { |(req, _)| req == request }
+      @requests.delete_if { |(req)| req == request }
       notify_handlers(:finish, request)
     end
 
@@ -48,7 +54,7 @@ module Hatetepe
     end
 
     def teardown(reason)
-      @requests.each do |(_, served)|
+      @requests.each do |_, served|
         served.reject(reason)
         if (response = served.value)
           response.reject_closed(reason)
@@ -58,14 +64,19 @@ module Hatetepe
 
     private
 
+    def add_extra_headers(request)
+      host = sprintf(HOST_VALUE, config[:address], config[:port])
+      request.add_extra_headers(USER_AGENT => USER_AGENT_VALUE, HOST => host)
+    end
+
     def perform!(request)
       notify_handlers(:perform, request)
       @connection.serialize(request)
     end
 
     def correlate
-      tuple = @requests.detect { |(_, served)| served.pending? }
-      raise ClientError, 'Unable to correlate with request' unless tuple
+      tuple = @requests.detect { |_, served| served.pending? }
+      fail ClientError, 'Unable to correlate with request' unless tuple
       tuple
     end
 

data/lib/hatetepe/connection/eventmachine.rb

@@ -17,11 +17,13 @@ module Hatetepe
 
       def serialize(message)
         serializer = Serializer.new(message, method(:send_data))
+        serializer.setup_body
         serializer.serialize
       end
 
       def receive_data(data)
-        # ap [__id__, :receive, data]
+        # p [__id__, :receive, data]
+        # p data
         @parser << data
       # rescue => error
       #   $stderr.puts(error.to_s)
@@ -30,7 +32,8 @@ module Hatetepe
       end
 
       # def send_data(data)
-      #   ap [__id__, :send, data]
+      #   # p [__id__, :send, data]
+      #   p data
       #   super
       # end
 

data/lib/hatetepe/promise.rb

@@ -4,48 +4,22 @@ module Hatetepe
   class Promise < ::Promise
     include ::Promise::Progress
 
-    def fulfill(value = nil)
-      super(value)
-    end
-
-    def reject(reason = nil)
-      super(reason)
-    end
-
-    def sync
-      if fulfilled?
-        return value
-      elsif rejected?
-        return reason
-      end
+    private
 
-      sync!
+    def defer
+      EM.next_tick { yield }
     end
 
-    def sync!
+    def wait
       fiber = Fiber.current
       resume = proc do |arg|
-        EM.next_tick { fiber.resume(arg) }
-        # fiber.resume(arg)
+        defer { fiber.resume(arg) }
       end
 
       self.then(resume, resume)
       Fiber.yield
     end
 
-    private
-
-    def defer(callback, arg)
-      EM.next_tick { safe_dispatch(callback, arg) }
-      # safe_dispatch(callback, arg)
-    end
-
-    def safe_dispatch(callback, arg)
-      callback.dispatch(arg)
-    # rescue => error
-    #   ...
-    end
-
     module Attribute
       def self.included(klass)
         klass.extend(ClassMethods)

data/lib/hatetepe/response.rb

@@ -16,6 +16,30 @@ module Hatetepe
       STATUS_NAMES[status.to_i] || UNKNOWN_STATUS
     end
 
+    def status_class
+      status / 100
+    end
+
+    def informational?
+      status_class == 1
+    end
+
+    def successful?
+      status_class == 2
+    end
+
+    def redirection?
+      status_class == 3
+    end
+
+    def client_error?
+      status_class == 4
+    end
+
+    def server_error?
+      status_class == 5
+    end
+
     UNKNOWN_STATUS = 'Unknown Status'.freeze
 
     STATUS_NAMES =

data/lib/hatetepe/serializer/encoding.rb

@@ -8,15 +8,6 @@ module Hatetepe
       CRLF = "\r\n".freeze
       CONTENT_LENGTH = 'Content-Length'.freeze
 
-      def setup_body
-        if body.closed.pending?
-          setup_chunked_encoding
-          setup_chunked_streaming
-        else
-          setup_identity_encoding
-        end
-      end
-
       def setup_chunked_encoding
         headers.delete(CONTENT_LENGTH)
         headers[TRANSFER_ENCODING] = CHUNKED
@@ -33,7 +24,9 @@ module Hatetepe
       end
 
       def write_body
-        if headers.key?(CONTENT_LENGTH)
+        if headers.key?(TRANSFER_ENCODING)
+          write_chunk(body.string)
+        else
           write(body.to_s)
         end
       end
@@ -43,7 +36,7 @@ module Hatetepe
       end
 
       def write_chunk!(chunk)
-        write(chunk.bytesize, CRLF, chunk, CRLF)
+        write(chunk.bytesize.to_s(16), CRLF, chunk, CRLF)
       end
     end
   end

data/lib/hatetepe/serializer.rb

@@ -21,18 +21,25 @@ module Hatetepe
     end
 
     def serialize
-      setup_body
-
       write(banana_line)
       write(header_block)
 
       write_body
     end
 
+    def setup_body
+      if body.closed.pending?
+        setup_chunked_encoding
+        setup_chunked_streaming
+      else
+        setup_identity_encoding
+      end
+    end
+
     private
 
     def write(*data)
-      data.each { |str| @writer.call(str) }
+      @writer.call(data.join(''))
     end
 
     def banana_line
@@ -54,7 +61,15 @@ module Hatetepe
     end
 
     def header_block
-      headers.reduce('') { |a, e| a << sprintf(HEADER, *e) } + CRLF
+      headers.reduce('') { |a, e| a << header_line(*e) } + CRLF
+    end
+
+    def header_line(key, value)
+      if value.to_s.empty?
+        ''
+      else
+        sprintf(HEADER, key, value)
+      end
     end
   end
 end

data/lib/hatetepe/server/keep_alive.rb

@@ -6,7 +6,7 @@ module Hatetepe
     CLOSE = 'close'.freeze
     KEEP_ALIVE = 'keep-alive'.freeze
 
-    def initialize(_, server, _)
+    def setup(_, server, _)
       @server = server
       @requests, @previous = {}, nil
     end

data/lib/hatetepe/server/timeouts.rb

@@ -3,15 +3,11 @@
 module Hatetepe
   # @see EM.heartbeat_interval
   class Server::Timeouts
-    def initialize(config, _, connection)
+    def setup(config, _, connection)
       @config = config
       @connection = connection
 
-      @config[:timeout] ||= 2.0
-    end
-
-    def setup
-      @connection.comm_inactivity_timeout = @config[:timeout]
+      @connection.comm_inactivity_timeout = @config[:timeout] ||= 2.0
     end
   end
 end

data/lib/hatetepe/server.rb

@@ -2,6 +2,10 @@
 
 module Hatetepe
   class Server
+    SERVER = 'Server'.freeze
+    SERVER_VALUE = "hatetepe/#{Hatetepe::VERSION}".freeze
+    DATE = 'Date'.freeze
+
     def self.start(config)
       callback = proc { |connection| new(config, connection) }
       EM.start_server(config[:address], config[:port],
@@ -18,7 +22,7 @@ module Hatetepe
 
       setup_connection(connection)
       setup_handlers
-      notify_handlers(:setup)
+      notify_handlers(:setup, @config, self, @connection)
     end
 
     def serve(request)
@@ -30,8 +34,8 @@ module Hatetepe
 
     def respond(request, response)
       fiber = Fiber.new do
-        notify_handlers(:respond, request, response)
-        @connection.serialize(response)
+        add_extra_headers(response)
+        respond!(request, response)
         response.closed { finish(request) }
       end
       fiber.resume
@@ -47,13 +51,19 @@ module Hatetepe
 
     private
 
+    def add_extra_headers(response)
+      date = Time.now.httpdate
+      response.add_extra_headers(SERVER => SERVER_VALUE, DATE => date)
+    end
+
+    def respond!(request, response)
+      notify_handlers(:respond, request, response)
+      @connection.serialize(response)
+    end
+
     def setup_connection(connection)
       @connection = connection
       @connection.parse(method(:serve))
-      @connection.closed.then(method(:shutdown))
-    end
-
-    def shutdown(_)
     end
   end
 end

data/lib/hatetepe/support/handlers.rb

@@ -4,9 +4,7 @@ module Hatetepe
   module Support
     module Handlers
       def setup_handlers
-        @handlers = @config[:handlers].map do |klass|
-          klass.new(@config, self, @connection)
-        end
+        @handlers = (@config[:handlers] || []).map(&:new)
       end
 
       def notify_handlers(hook, *args)

data/lib/hatetepe/support/message.rb

@@ -23,6 +23,10 @@ module Hatetepe
         body.closed.reject(reason)
       end
 
+      def add_extra_headers(extra)
+        extra.each { |k, v| headers.key?(k) || headers[k] = v }
+      end
+
       def self.build(parser)
         if parser.http_method
           build_request(parser)
@@ -31,7 +35,7 @@ module Hatetepe
         end
       end
 
-    private
+      private
 
       def self.build_request(parser)
         request = Request.new(http_method_from(parser),

data/lib/hatetepe/version.rb

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

data/lib/hatetepe.rb

@@ -4,6 +4,7 @@ require 'eventmachine'
 require 'fiber'
 require 'promise'
 require 'http/parser'
+require 'time'
 
 require 'hatetepe/version'
 
@@ -27,3 +28,19 @@ require 'hatetepe/client/timeouts'
 require 'hatetepe/server'
 require 'hatetepe/server/keep_alive'
 require 'hatetepe/server/timeouts'
+
+module Hatetepe
+  def self.run
+    EM.run do
+      Fiber.new do
+        yield
+        stop
+      end.resume
+    end
+  end
+
+  def self.stop
+    EM.stop
+    EM.next_tick {}
+  end
+end

data/spec/integration/keep_alive_spec.rb

@@ -55,7 +55,7 @@ describe do
 
     describe 'and Connection: keep-alive' do
       let(:requests) do
-        [closed_request(:get, '/', { 'Connection' => 'keep-alive' })
+        [closed_request(:get, '/', 'Connection' => 'keep-alive')
           .tap { |r| r.http_version = 1.0 }]
       end
 

data/spec/spec_helper.rb

@@ -28,20 +28,21 @@ RSpec.configure do |config|
   config.include(SpecHelper)
 
   config.around do |example|
-    EM.run do
-      fiber = Fiber.new do
-        example.call
-        EM.stop
-        EM.next_tick {}
-      end
+    stop = proc do
+      EM.stop
+      EM.next_tick {}
+    end
 
+    EM.run do
       EM.add_timer(0.5) do
-        EM.stop
-        EM.next_tick {}
-        raise 'Example timed out'
+        stop.call
+        fail 'Example timed out'
       end
 
-      fiber.resume
+      Fiber.new do
+        example.call
+        stop.call
+      end.resume
     end
   end
 end

data/spec/support/handler.rb

@@ -1,9 +1,6 @@
 # encoding: utf-8
 
 class SpecHandler
-  def initialize(config, server, connection)
-  end
-
   def serve(request, served)
     served.fulfill(response_for(request))
   end

data/spec/support/helper.rb

@@ -53,10 +53,7 @@ module SpecHelper
 
   def server_client_pair(server_config, client_config, interceptor)
     server = nil
-    inspect_server(server_config) do |_, s, _|
-      server = s
-      interceptor
-    end
+    inspect_server(server_config, interceptor) { |_, s, _| server = s }
 
     config = { address: localhost, port: random_port }
     Hatetepe::Server.start(config.merge(server_config))
@@ -66,9 +63,11 @@ module SpecHelper
     [server, client]
   end
 
-  def inspect_server(server_config, &block)
-    interceptor_class = double('interceptor_class')
-    allow(interceptor_class).to receive(:new, &block)
-    server_config[:handlers].unshift(interceptor_class)
+  def inspect_server(server_config, interceptor, &block)
+    klass = double
+    allow(klass).to       receive(:new) { interceptor }
+    allow(interceptor).to receive(:setup, &block)
+
+    server_config[:handlers].unshift(klass)
   end
 end

data/spec/unit/client_spec.rb

@@ -15,7 +15,9 @@ describe Hatetepe::Client do
                          close: nil)
   end
   let(:handler_class) { double('handler_class', new: handler) }
-  let(:handler)       { double('handler', setup: nil, receive: nil) }
+  let(:handler) do
+    double('handler', setup: nil, receive: nil, finish: nil)
+  end
 
   before do
     allow(EM).to receive(:connect) { connection }
@@ -37,9 +39,8 @@ describe Hatetepe::Client do
     end
 
     specify do
-      expect(handler_class).to have_received(:new)
+      expect(handler).to have_received(:setup)
         .with(config, subject, connection)
-      expect(handler).to       have_received(:setup)
     end
   end
 
@@ -66,7 +67,7 @@ describe Hatetepe::Client do
   end
 
   describe '#perform' do
-    let(:request) { double('request') }
+    let(:request) { double('request', add_extra_headers: nil) }
 
     before do
       @fibers = []
@@ -82,6 +83,10 @@ describe Hatetepe::Client do
 
       expect(@fibers).not_to   include(Fiber.current)
       expect(@fibers.uniq).to  be_one
+
+      expect(request).to have_received(:add_extra_headers)
+        .with('User-Agent' => "hatetepe/#{Hatetepe::VERSION}",
+              'Host'       => "#{config[:address]}:#{config[:port]}")
     end
   end
 
@@ -94,19 +99,29 @@ describe Hatetepe::Client do
   end
 
   describe '#receive' do
-    let(:request)  { open_request }
-    let(:response) { open_response }
+    let(:request)        { open_request }
+    let(:other_request)  { open_request }
+    let(:response)       { open_response }
+    let(:other_response) { open_response }
 
     describe 'with outstanding request' do
-      let!(:served) { client.perform(request) }
+      let!(:served)       { client.perform(request) }
+      let!(:other_served) { client.perform(other_request) }
 
-      subject! { client.receive(response) }
+      subject! do
+        client.receive(response)
+        client.receive(other_response)
+      end
 
       it 'correlates response with request, and notifies handlers' do
         expect(served).to       be_fulfilled
         expect(served.value).to be(response)
+        expect(other_served).to       be_fulfilled
+        expect(other_served.value).to be(other_response)
 
         expect(handler).to have_received(:receive).with(request, response)
+        expect(handler)
+          .to have_received(:receive).with(other_request, other_response)
       end
     end
 
@@ -118,6 +133,27 @@ describe Hatetepe::Client do
       end
     end
 
+    describe 'wiring' do
+      let(:request)  { open_request }
+      let(:response) { open_response }
+
+      before do
+        client.perform(request)
+
+        allow(client).to receive(:finish)
+      end
+
+      subject! do
+        client.receive(response)
+        response.close
+        tick
+      end
+
+      it 'wires up #finish' do
+        client.should have_received(:finish).with(request)
+      end
+    end
+
     [:fulfill, :reject].each do |action|
       describe "after #{action}ed response" do
         let(:request)  { WeakRef.new(closed_request) }
@@ -146,6 +182,30 @@ describe Hatetepe::Client do
     end
   end
 
+  describe '#finish' do
+    let(:request)        { open_request }
+    let(:other_request)  { open_request }
+    let(:response)       { open_response }
+
+    before do
+      client.perform(request)
+      client.perform(other_request)
+    end
+
+    subject! do
+      client.finish(request)
+      client.receive(response)
+    end
+
+    it 'removes the request' do
+      expect(handler).to have_received(:receive).with(other_request, response)
+    end
+
+    it 'notifies the handlers' do
+      expect(handler).to have_received(:finish).with(request)
+    end
+  end
+
   describe '#teardown' do
     let(:requests)  { [closed_request, closed_request] }
     let(:responses) { [open_response] }

data/spec/unit/connection/eventmachine_spec.rb

@@ -6,7 +6,7 @@ describe Hatetepe::Connection::EventMachine do
   let(:connection) { described_class.allocate }
   let(:callback)   { double('callback', call: nil) }
   let(:parser)     { double('parser', :<< => nil) }
-  let(:serializer) { double('serializer', serialize: nil) }
+  let(:serializer) { double('serializer', setup_body: nil, serialize: nil) }
   let(:message)    { open_request }
 
   before do
@@ -51,7 +51,8 @@ describe Hatetepe::Connection::EventMachine do
 
     it 'feeds a serializer' do
       expect(Hatetepe::Serializer).to have_received(:new).with(message, writer)
-      expect(serializer).to       have_received(:serialize)
+      expect(serializer).to           have_received(:setup_body)
+      expect(serializer).to           have_received(:serialize)
     end
   end
 

data/spec/unit/server/keep_alive_spec.rb

@@ -7,7 +7,7 @@ describe Hatetepe::Server::KeepAlive do
   let(:server)     { double('server') }
   let(:connection) { double('connection') }
 
-  let(:object)  { described_class.new(config, server, connection) }
+  let(:object)  { described_class.new }
   let(:request) do
     double('request', http_version: http_version,
                       headers: { 'Connection' => header })
@@ -15,6 +15,8 @@ describe Hatetepe::Server::KeepAlive do
   let(:served)   { double('served', value: response) }
   let(:response) { double('response', headers: { 'Connection' => header }) }
 
+  before { object.setup(config, server, connection) }
+
   describe '#close_connection?' do
     before { object.serve(request, served) }
 

data/spec/unit/server_spec.rb

@@ -15,7 +15,9 @@ describe Hatetepe::Server do
                          close: nil)
   end
   let(:handler_class) { double('handler_class', new: handler) }
-  let(:handler)       { double('handler', setup: nil, respond: nil) }
+  let(:handler) do
+    double('handler', setup: nil, respond: nil, finish: nil)
+  end
 
   describe '.start' do
     specify { pending }
@@ -27,16 +29,11 @@ describe Hatetepe::Server do
     its(:config) { should be(config) }
 
     it 'sets up connection' do
-      expect(connection).to        have_received(:parse)
-        .with(server.method(:serve))
-      expect(connection.closed).to have_received(:then)
-        .with(server.method(:shutdown))
+      expect(connection).to have_received(:parse).with(server.method(:serve))
     end
 
     it 'sets up handlers' do
-      expect(handler_class).to have_received(:new)
-        .with(config, server, connection)
-      expect(handler).to       have_received(:setup)
+      expect(handler).to have_received(:setup).with(config, server, connection)
     end
   end
 
@@ -68,8 +65,9 @@ describe Hatetepe::Server do
   end
 
   describe '#respond' do
+    let(:headers)  { {} }
     let(:request)  { open_request }
-    let(:response) { open_response }
+    let(:response) { open_response(200, headers) }
 
     subject! { server.respond(request, response) }
 
@@ -80,6 +78,46 @@ describe Hatetepe::Server do
     it 'notifies the handlers' do
       expect(handler).to have_received(:respond).with(request, response)
     end
+
+    it 'sets Server and Date headers' do
+      expect(headers['Server']).to eq("hatetepe/#{Hatetepe::VERSION}")
+      expect(headers['Date']).to eq(Time.now.httpdate)
+    end
+
+    describe 'with Server or Date header set to anything' do
+      let(:headers) { { 'Server' => nil, 'Date' => nil } }
+
+      it 'does not override' do
+        expect(headers['Server']).to be(nil)
+        expect(headers['Date']).to   be(nil)
+      end
+    end
+
+    describe 'wiring' do
+      let(:request)  { open_request }
+      let(:response) { open_response }
+
+      before do
+        allow(server).to receive(:finish)
+
+        response.close
+        tick
+      end
+
+      it 'wires up #finish' do
+        expect(server).to have_received(:finish).with(request)
+      end
+    end
+  end
+
+  describe '#finish' do
+    let(:request) { open_request }
+
+    subject! { server.finish(request) }
+
+    it 'notifies the handlers' do
+      expect(handler).to have_received(:finish).with(request)
+    end
   end
 
   describe '#close' do
@@ -89,8 +127,4 @@ describe Hatetepe::Server do
       expect(connection).to have_received(:close)
     end
   end
-
-  describe '#teardown' do
-    specify { pending }
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.1
+  version: 0.6.0.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,8 +78,7 @@ dependencies:
 description: The HTTP toolkit
 email:
 - lars.gierth@gmail.com
-executables:
-- hatetepe
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -90,9 +89,9 @@ files:
 - Gemfile
 - Gemfile.devtools
 - LICENSE.txt
+- Procfile
 - README.md
 - Rakefile
-- bin/hatetepe
 - config/devtools.yml
 - config/flay.yml
 - config/flog.yml
@@ -100,6 +99,8 @@ files:
 - config/reek.yml
 - config/rubocop.yml
 - config/yardstick.yml
+- examples/echo_server.rb
+- examples/getting_started.rb
 - hatetepe.gemspec
 - lib/hatetepe.rb
 - lib/hatetepe/body.rb
@@ -120,7 +121,6 @@ files:
 - lib/hatetepe/support/handlers.rb
 - lib/hatetepe/support/message.rb
 - lib/hatetepe/version.rb
-- spec/integration/error_handling_spec.rb
 - spec/integration/keep_alive_spec.rb
 - spec/integration/smoke_spec.rb
 - spec/integration/streaming_spec.rb
@@ -162,7 +162,6 @@ signing_key:
 specification_version: 3
 summary: General purpose toolkit for HTTP clients and servers
 test_files:
-- spec/integration/error_handling_spec.rb
 - spec/integration/keep_alive_spec.rb
 - spec/integration/smoke_spec.rb
 - spec/integration/streaming_spec.rb

data/bin/hatetepe

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require 'hatetepe'
-
-class RequestHandler
-  def initialize(config, server, connection)
-  end
-
-  def serve(request, served)
-    puts "#{request.http_method.upcase} #{request.uri}"
-    response = build_response
-    served.fulfill(response)
-  end
-
-  def build_response
-    Hatetepe::Response.new(
-      200, { 'Content-Type' => 'text/plain' }, "hello, world\n")
-  end
-end
-
-address = ENV.fetch('ADDRESS', '127.0.0.1')
-port    = ENV.fetch('PORT',    3000)
-
-$stdout.sync = true
-
-EM.run do
-  puts "Listening on http://#{address}:#{port}"
-  Hatetepe::Server.start(address:  address, port: port,
-                     handlers: [Hatetepe::Server::KeepAlive,
-                                Hatetepe::Server::Timeouts,
-                                RequestHandler])
-end

data/spec/integration/error_handling_spec.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-describe 'Error handling' do
-  specify { pending('Needs more thought') }
-end