goliath 0.9.2 → 0.9.4

data/lib/goliath/server.rb

@@ -69,11 +69,11 @@ module Goliath
     #
     # @return Does not return until the server has halted.
     def start(&blk)
+      EM.epoll
       EM.synchrony do
         trap("INT")  { EM.stop }
         trap("TERM") { EM.stop }
-
-        EM.epoll
+        trap("HUP")  { load_config(options[:config]) }
 
         load_config(options[:config])
         load_plugins
@@ -81,6 +81,14 @@ module Goliath
         EM.set_effective_user(options[:user]) if options[:user]
 
         EM.start_server(address, port, Goliath::Connection) do |conn|
+          if options[:ssl]
+            conn.start_tls(
+              :private_key_file => options[:ssl_key],
+              :cert_chain_file  => options[:ssl_cert],
+              :verify_peer      => options[:ssl_verify]
+            )
+          end
+
           conn.port = port
           conn.app = app
           conn.api = api
@@ -99,7 +107,7 @@ module Goliath
     # @param file [String] The file to load, if not set will use the basename of $0
     # @return [Nil]
     def load_config(file = nil)
-      api_name = api.class.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase!
+      api_name = api.class.to_s.gsub('::', '_').gsub(/([^_A-Z])([A-Z])/,'\1_\2').downcase!
       file ||= "#{config_dir}/#{api_name}.rb"
       return unless File.exists?(file)
 

data/lib/goliath/test_helper.rb

@@ -29,13 +29,13 @@ module Goliath
     end
 
     # Launches an instance of a given API server. The server
-    # will launch on the default settings of localhost port 9000.
+    # will launch on the specified port.
     #
     # @param api [Class] The API class to launch
     # @param port [Integer] The port to run the server on
     # @param options [Hash] The options hash to provide to the server
     # @return [Goliath::Server] The executed server
-    def server(api, port = 9000, options = {}, &blk)
+    def server(api, port, options = {}, &blk)
       op = OptionParser.new
 
       s = Goliath::Server.new
@@ -44,7 +44,7 @@ module Goliath
       s.app = Goliath::Rack::Builder.build(api, s.api)
       s.api.options_parser(op, options)
       s.options = options
-      s.port = port
+      s.port = @test_server_port = port
       s.start(&blk)
       s
     end
@@ -64,7 +64,7 @@ module Goliath
     # @param blk [Proc] The code to execute after the server is launched.
     # @note This will not return until stop is called.
     def with_api(api, options = {}, &blk)
-      server(api, 9000, options, &blk)
+      server(api, options.delete(:port) || 9900, options, &blk)
     end
 
     # Helper method to setup common callbacks for various request methods.
@@ -90,8 +90,7 @@ module Goliath
     # @param errback [Proc] An error handler to attach
     # @param blk [Proc] The callback block to execute
     def head_request(request_data = {}, errback = nil, &blk)
-      path = request_data.delete(:path) || ''
-      req = EM::HttpRequest.new("http://localhost:9000#{path}").head(request_data)
+      req = test_request(request_data).head(request_data)
       hookup_request_callbacks(req, errback, &blk)
     end
 
@@ -101,8 +100,7 @@ module Goliath
     # @param errback [Proc] An error handler to attach
     # @param blk [Proc] The callback block to execute
     def get_request(request_data = {}, errback = nil, &blk)
-      path = request_data.delete(:path) || ''
-      req = EM::HttpRequest.new("http://localhost:9000#{path}").get(request_data)
+      req = test_request(request_data).get(request_data)
       hookup_request_callbacks(req, errback, &blk)
     end
 
@@ -112,8 +110,7 @@ module Goliath
     # @param errback [Proc] An error handler to attach
     # @param blk [Proc] The callback block to execute
     def post_request(request_data = {}, errback = nil, &blk)
-      path = request_data.delete(:path) || ''
-      req = EM::HttpRequest.new("http://localhost:9000#{path}").post(request_data)
+      req = test_request(request_data).post(request_data)
       hookup_request_callbacks(req, errback, &blk)
     end
 
@@ -123,8 +120,7 @@ module Goliath
     # @param errback [Proc] An error handler to attach
     # @param blk [Proc] The callback block to execute
     def put_request(request_data = {}, errback = nil, &blk)
-      path = request_data.delete(:path) || ''
-      req = EM::HttpRequest.new("http://localhost:9000#{path}").put(request_data)
+      req = test_request(request_data).put(request_data)
       hookup_request_callbacks(req, errback, &blk)
     end
 
@@ -134,9 +130,13 @@ module Goliath
     # @param errback [Proc] An error handler to attach
     # @param blk [Proc] The callback block to execute
     def delete_request(request_data = {}, errback = nil, &blk)
-      path = request_data.delete(:path) || ''
-      req = EM::HttpRequest.new("http://localhost:9000#{path}").delete(request_data)
+      req = test_request(request_data).delete(request_data)
       hookup_request_callbacks(req, errback, &blk)
     end
+
+    def test_request(request_data)
+      path = request_data.delete(:path) || ''
+      EM::HttpRequest.new("http://localhost:#{@test_server_port}#{path}")
+    end
   end
 end

data/lib/goliath/version.rb

@@ -1,4 +1,4 @@
 module Goliath
   # The current version of Goliath
-  VERSION = '0.9.2'
+  VERSION = '0.9.4'
 end

data/spec/integration/early_abort_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require File.join(File.dirname(__FILE__), '../../', 'examples/early_abort')
+
+describe EarlyAbort do
+  let(:err) { Proc.new { fail "API request failed" } }
+
+  after do
+    File.unlink(EarlyAbort::TEST_FILE) if File.exist?(EarlyAbort::TEST_FILE)
+  end
+
+  it "should return OK" do
+    with_api(EarlyAbort) do
+      get_request({}, err) do |c|
+        c.response.should == "OK"
+      end
+    end
+  end
+
+  # The following two tests are very brittle, since they depend on the speed
+  # of the machine executing the test and the size of the incoming data
+  # packets. I hope someone more knowledgeable will be able to refactor these
+  # ;-)
+  it 'fails without going in the response method if exception is raised in on_header hook' do
+    with_api(EarlyAbort) do
+      request_data = {
+        :body => (["abcd"] * 200_000).join,
+        :head => {'X-Crash' => 'true'}
+      }
+
+      post_request(request_data, err) do |c|
+        c.response.should == "{\"error\":\"Can't handle requests with X-Crash: true.\"}"
+        File.exist?("/tmp/goliath-test-error.log").should be_false
+      end
+    end
+  end
+
+  it 'fails without going in the response method if exception is raised in on_body hook' do
+    with_api(EarlyAbort) do
+      request_data = {
+        :body => (["abcd"] * 200_000).join
+      }
+
+      post_request(request_data, err) do |c|
+        c.response.should =~ /Payload size can't exceed 10 bytes/
+        File.exist?("/tmp/goliath-test-error.log").should be_false
+      end
+    end
+  end
+
+end

data/spec/integration/keepalive_spec.rb

@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '../../', 'examples/echo')
 
 describe 'HTTP Keep-Alive support' do
   it 'serves multiple requests via single connection' do
-    with_api(Echo) do
-      conn = EM::HttpRequest.new('http://localhost:9000')
+    with_api(Echo, :port => 9901) do
+      conn = EM::HttpRequest.new('http://localhost:9901')
       r1 = conn.get(:query => {:echo => 'test'}, :keepalive => true)
 
       r1.errback { fail }

data/spec/integration/pipelining_spec.rb

@@ -13,11 +13,11 @@ end
 
 describe 'HTTP Pipelining support' do
   it 'serves multiple requests via single connection' do
-    with_api(Interleaving) do
+    with_api(Interleaving, :port => 9901) do
       start = Time.now.to_f
       res = []
 
-      conn = EM::HttpRequest.new('http://localhost:9000')
+      conn = EM::HttpRequest.new('http://localhost:9901')
       r1 = conn.aget :query => {:delay => 0.3}, :keepalive => true
       r2 = conn.aget :query => {:delay => 0.2}
 

data/spec/integration/rack_routes_spec.rb

@@ -75,6 +75,7 @@ describe RackRoutes do
           end
         end
       end
+
       it 'should reject other request methods' do
         with_api(RackRoutes) do
           put_request({:path => '/hello_world'}, err) do |c|
@@ -94,6 +95,9 @@ describe RackRoutes do
           end
         end
       end
+    end
+
+    context 'routes defined with head' do
       it 'should allow head' do
         with_api(RackRoutes) do
           head_request({:path => '/hello_world'}, err) do |c|
@@ -140,5 +144,26 @@ describe RackRoutes do
       end
     end
 
+    context "with event handlers" do
+      it "collects header events" do
+        with_api(RackRoutes) do
+          get_request({:path => '/headers'}, err) do |c|
+            c.response_header.status.should == 200
+            c.response.should == 'headers: {"Connection"=>"close", "Host"=>"localhost:9900", "User-Agent"=>"EventMachine HttpClient"}'
+          end
+        end
+      end
+
+      it "rejects POST request" do
+        with_api(RackRoutes) do
+          post_request({:path => '/headers'}, err) do |c|
+            # the /headers route only supports GET requests
+            c.response_header.status.should == 405
+            c.response.should == '[:error, "Invalid request method"]'
+            c.response_header['ALLOW'].should == 'GET'
+          end
+        end
+      end
+    end
   end
 end

data/spec/integration/template_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require File.join(File.dirname(__FILE__), '../../', 'examples/template')
 
+
 describe Template do
 
   def config_file
@@ -10,6 +11,7 @@ describe Template do
   let(:api_options) { { :config => config_file } }
 
   it 'renders haml template with default haml layout' do
+    
     with_api(Template, api_options) do
       get_request do |c|
         c.response.should =~ %r{<li><a href="/joke">Tell me a joke</a></li>}

data/spec/unit/rack/heartbeat_spec.rb

@@ -43,5 +43,15 @@ describe Goliath::Rack::Heartbeat do
       headers.should == {}
       body.should == 'OK'
     end
+
+    it 'allows path and response to be set using options' do
+      @hb = Goliath::Rack::Heartbeat.new(@app, :path => '/isup', :response => [204, {}, nil])
+      @env['PATH_INFO'] = '/isup'
+      status, headers, body = @hb.call(@env)
+      status.should == 204
+      headers.should == {}
+      body.should == nil
+    end
   end
-end
+end
+

data/spec/unit/rack/validation/required_param_spec.rb

@@ -91,6 +91,16 @@ describe Goliath::Rack::Validation::RequiredParam do
         @env['params']['mk'] = [1, 2, 3, 4]
         @rp.key_valid?(@env['params']).should be_true
       end
+
+      it "doesn't raise if the key provided is multiline and has blanks" do
+        @env['params']['mk'] = "my\n  \nvalue"
+        @rp.key_valid?(@env['params']).should be_true
+      end
+
+      it "doesn't raise if the key provided is an array and contains multiline with blanks" do
+        @env['params']['mk'] = ["my\n  \nvalue", "my\n  \nother\n  \nvalue"]
+        @rp.key_valid?(@env['params']).should be_true
+      end
     end
   end
 end

data/spec/unit/runner_spec.rb

@@ -10,6 +10,13 @@ describe Goliath::Runner do
     @r.stub!(:setup_logger).and_return(@log_mock)
   end
 
+  after(:each) do
+    # Runner default env is development.
+    # We do need to revert to test
+    Goliath.env = :test
+  end
+
+  
   describe 'server execution' do
     describe 'daemonization' do
       it 'daemonizes if specified' do
@@ -30,6 +37,12 @@ describe Goliath::Runner do
         @r = Goliath::Runner.new([], nil)
       end
 
+      after(:each) do
+        # Runner default env is development.
+        # We do need to revert to test
+        Goliath.env = :test
+      end
+      
       describe 'without setting up file logger' do
         before(:each) do
           @r.stub!(:setup_file_logger)

data/spec/unit/server_spec.rb

@@ -105,6 +105,10 @@ describe Goliath::Server do
 
   context 'config parsing' do
     context 'environment' do
+      after(:all) do
+        # Be sure to revert to correct env
+        Goliath.env = :test        
+      end
       it 'executes the block if the environment matches the provided string' do
         Goliath.env = :development
         block_run = false

metadata

@@ -1,334 +1,281 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: goliath
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.4
   prerelease: 
-  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - dan sinclair
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-21 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152695420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.beta.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-synchrony
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152695420
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: &2152694920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0.beta.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: http_parser.rb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152694920
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
+  requirement: &2152694540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: log4r
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152694540
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: &2157802800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2157802800
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2157802300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-contrib
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2157802300
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: &2157801880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack-respond_to
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2157801880
+- !ruby/object:Gem::Dependency
+  name: rack-respond_to
+  requirement: &2157801420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: async-rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2157801420
+- !ruby/object:Gem::Dependency
+  name: async-rack
+  requirement: &2157801000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2157801000
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &2157800580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: http_router
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2157800580
+- !ruby/object:Gem::Dependency
+  name: http_router
+  requirement: &2157800080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.9
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2157800080
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2157799580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2157799580
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2157799120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *2157799120
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2157798740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *2157798740
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2157798200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0.beta.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: em-mongo
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *2157798200
+- !ruby/object:Gem::Dependency
+  name: em-mongo
+  requirement: &2157797700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *2157797700
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &2157797320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: rack-rewrite
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *2157797320
+- !ruby/object:Gem::Dependency
+  name: rack-rewrite
+  requirement: &2157796860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: multipart_body
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: *2157796860
+- !ruby/object:Gem::Dependency
+  name: multipart_body
+  requirement: &2157796440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: amqp
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: *2157796440
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: &2157795940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: *2157795940
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &2157795440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.2
   type: :development
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  version_requirements: *2157795440
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2157811340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.25
   type: :development
-  version_requirements: *id021
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  version_requirements: *2157811340
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2157810960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  version_requirements: *2157810960
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &2157810500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id023
-description: Framework for writing API servers
-email: 
+  prerelease: false
+  version_requirements: *2157810500
+description: Async framework for writing API servers
+email:
 - dj2@everburning.com
 - ilya@igvita.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- doc/_index.html
-- doc/class_list.html
-- doc/css/common.css
-- doc/css/full_list.css
-- doc/css/style.css
-- doc/file.LICENSE.html
-- doc/file.README.html
-- doc/file_list.html
-- doc/frames.html
-- doc/Goliath/API.html
-- doc/Goliath/Constants.html
-- doc/Goliath/Env.html
-- doc/Goliath/Plugin/Latency.html
-- doc/Goliath/Plugin.html
-- doc/Goliath/Rack/AsyncMiddleware.html
-- doc/Goliath/Rack/Builder.html
-- doc/Goliath/Rack/DefaultMimeType.html
-- doc/Goliath/Rack/DefaultResponseFormat.html
-- doc/Goliath/Rack/Formatters/HTML.html
-- doc/Goliath/Rack/Formatters/JSON.html
-- doc/Goliath/Rack/Formatters/XML.html
-- doc/Goliath/Rack/Formatters/YAML.html
-- doc/Goliath/Rack/Formatters.html
-- doc/Goliath/Rack/Heartbeat.html
-- doc/Goliath/Rack/JSONP.html
-- doc/Goliath/Rack/Params.html
-- doc/Goliath/Rack/Render.html
-- doc/Goliath/Rack/Templates.html
-- doc/Goliath/Rack/Tracer.html
-- doc/Goliath/Rack/Validation/BooleanValue.html
-- doc/Goliath/Rack/Validation/DefaultParams.html
-- doc/Goliath/Rack/Validation/NumericRange.html
-- doc/Goliath/Rack/Validation/RequestMethod.html
-- doc/Goliath/Rack/Validation/RequiredParam.html
-- doc/Goliath/Rack/Validation/RequiredValue.html
-- doc/Goliath/Rack/Validation.html
-- doc/Goliath/Rack/Validator.html
-- doc/Goliath/Rack.html
-- doc/Goliath/Runner.html
-- doc/Goliath/TestHelper.html
-- doc/Goliath/Validation/Error.html
-- doc/Goliath/Validation.html
-- doc/Goliath.html
-- doc/index.html
-- doc/js/app.js
-- doc/js/full_list.js
-- doc/js/jquery.js
-- doc/method_list.html
-- doc/top-level-namespace.html
+files:
 - examples/activerecord/config/srv.rb
 - examples/activerecord/srv.rb
+- examples/api_proxy.rb
 - examples/async_aroundware_demo.rb
 - examples/async_upload.rb
 - examples/auth_and_rate_limit.rb
@@ -343,12 +290,14 @@ files:
 - examples/config/template.rb
 - examples/content_stream.rb
 - examples/custom_server.rb
+- examples/early_abort.rb
 - examples/echo.rb
 - examples/env_use_statements.rb
-- examples/Gemfile.lock
+- examples/favicon.rb
 - examples/gziped.rb
 - examples/hello_world.rb
 - examples/http_log.rb
+- examples/public/favicon.ico
 - examples/public/stylesheets/style.css
 - examples/rack_routes.rb
 - examples/rasterize/rasterize.js
@@ -366,18 +315,22 @@ files:
 - examples/views/root.haml
 - Gemfile
 - goliath.gemspec
-- HISTORY
+- HISTORY.md
 - lib/goliath/api.rb
 - lib/goliath/application.rb
 - lib/goliath/connection.rb
 - lib/goliath/constants.rb
+- lib/goliath/deprecated/async_aroundware.rb
+- lib/goliath/deprecated/mongo_receiver.rb
+- lib/goliath/deprecated/response_receiver.rb
 - lib/goliath/env.rb
 - lib/goliath/goliath.rb
 - lib/goliath/headers.rb
 - lib/goliath/http_status_codes.rb
 - lib/goliath/plugins/latency.rb
-- lib/goliath/rack/async_aroundware.rb
 - lib/goliath/rack/async_middleware.rb
+- lib/goliath/rack/barrier_aroundware.rb
+- lib/goliath/rack/barrier_aroundware_factory.rb
 - lib/goliath/rack/builder.rb
 - lib/goliath/rack/default_mime_type.rb
 - lib/goliath/rack/default_response_format.rb
@@ -391,6 +344,8 @@ files:
 - lib/goliath/rack/jsonp.rb
 - lib/goliath/rack/params.rb
 - lib/goliath/rack/render.rb
+- lib/goliath/rack/simple_aroundware.rb
+- lib/goliath/rack/simple_aroundware_factory.rb
 - lib/goliath/rack/templates.rb
 - lib/goliath/rack/tracer.rb
 - lib/goliath/rack/validation/boolean_value.rb
@@ -406,8 +361,6 @@ files:
 - lib/goliath/response.rb
 - lib/goliath/runner.rb
 - lib/goliath/server.rb
-- lib/goliath/synchrony/mongo_receiver.rb
-- lib/goliath/synchrony/response_receiver.rb
 - lib/goliath/test_helper.rb
 - lib/goliath/validation/error.rb
 - lib/goliath/validation/standard_http_errors.rb
@@ -415,10 +368,13 @@ files:
 - lib/goliath/version.rb
 - lib/goliath.rb
 - LICENSE
-- pkg/goliath-0.9.1.gem
+- pkg/data.tar.gz
+- pkg/goliath-0.9.3.gem
+- pkg/metadata
 - Rakefile
 - README.md
 - spec/integration/async_request_processing.rb
+- spec/integration/early_abort_spec.rb
 - spec/integration/echo_spec.rb
 - spec/integration/empty_body_spec.rb
 - spec/integration/http_log_spec.rb
@@ -458,36 +414,33 @@ files:
 - .gitignore
 - .rspec
 - .yardopts
-has_rdoc: true
-homepage: http://labs.postrank.com/
+homepage: http://goliath.io/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Framework for writing API servers
-test_files: 
+summary: Async framework for writing API servers
+test_files:
 - spec/integration/async_request_processing.rb
+- spec/integration/early_abort_spec.rb
 - spec/integration/echo_spec.rb
 - spec/integration/empty_body_spec.rb
 - spec/integration/http_log_spec.rb