goliath 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2657a958a80151a0eab64c006eb13a4905156cc3
-  data.tar.gz: b140e7bdc85173bb06adeef69b504d7ab39d5197
+  metadata.gz: 2bfab8c9906a1737abc3e7cdf163a52e13e516c7
+  data.tar.gz: a1ac6184a35dbfe56a04d117872d31b7c3647c71
 SHA512:
-  metadata.gz: bdf5b587bcc2edefd5242b4c447e45787bd9affff51010c47484b9644ba005bc194d68b939c7117f78d375e3ebc16e05abc1292ff3b34626d9329fd140551957
-  data.tar.gz: 1cec64325f506e5838ec7893055c5e15cd52375c0e435b8cab69057d17424aa535f02537eab764a551064a161baeab27245d3a00a451ca0ca8215e720c3d0f1e
+  metadata.gz: 833e67c341fde76ca1e5d69430f0f0c2d70186de0474979421fbbeeac78d5755eb79bfde0495e606105fb71f0291a6e8fa6be4c3e55ea6da2d663b8aa6c20937
+  data.tar.gz: 15de365fe175166182ead10d6c397971d33391e190f994552216433ebf121be35732805cd56cc364c3f9f0a5361589cd4205954014288fd52ab995d6807ccc93

data/goliath.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'amqp', '>=0.7.1'
   s.add_development_dependency 'em-websocket-client'
   s.add_development_dependency 'em-eventsource'
+  s.add_development_dependency 'rack', '< 2'
 
   s.add_development_dependency 'tilt', '>=1.2.2'
   s.add_development_dependency 'haml', '>=3.0.25'

data/lib/goliath/connection.rb

@@ -23,12 +23,13 @@ module Goliath
       @parser = Http::Parser.new
       @parser.on_headers_complete = proc do |h|
         env = Goliath::Env.new
-        env[SERVER_PORT] = port.to_s
-        env[RACK_LOGGER] = logger
-        env[OPTIONS]     = options
-        env[STATUS]      = status
-        env[CONFIG]      = config
-        env[REMOTE_ADDR] = remote_address
+        env[SERVER_PORT]     = port.to_s
+        env[RACK_LOGGER]     = logger
+        env[OPTIONS]         = options
+        env[STATUS]          = status
+        env[CONFIG]          = config
+        env[REMOTE_ADDR]     = remote_address
+        env[RACK_URL_SCHEME] = options[:ssl] ? "https" : "http"
 
         r = Goliath::Request.new(@app, self, env)
         r.parse_header(h, @parser) do
@@ -41,7 +42,8 @@ module Goliath
       end
 
       @parser.on_body = proc do |data|
-        @requests.first.parse(data)
+        req = @requests.first
+        req.parse(data) unless req.env[:terminate_connection]
       end
 
       @parser.on_message_complete = proc do
@@ -83,15 +85,17 @@ module Goliath
     end
 
     def terminate_request(keep_alive)
-      if req = @pending.shift
-        @current = req
-        @current.succeed
-      elsif @current
+      if @current
         @current.close
         @current = nil
       end
 
       close_connection_after_writing rescue nil if !keep_alive
+
+      if req = @pending.shift
+        @current = req
+        @current.succeed
+      end
     end
 
     def remote_address

data/lib/goliath/constants.rb

@@ -23,6 +23,7 @@ module Goliath
     RACK_VERSION_NUM = [1, 0]
     RACK_LOGGER     = 'rack.logger'
     RACK_EXCEPTION  = 'rack.exception'
+    RACK_URL_SCHEME = 'rack.url_scheme'
 
     ASYNC_CALLBACK  = 'async.callback'
     ASYNC_HEADERS   = 'async.headers'

data/lib/goliath/rack/default_response_format.rb

@@ -4,17 +4,11 @@ module Goliath
       include Goliath::Rack::AsyncMiddleware
 
       def post_process(env, status, headers, body)
-        return [status, headers, body] if body.respond_to?(:to_ary)
-
-        new_body = []
-        if body.respond_to?(:each)
-          body.each { |chunk| new_body << chunk }
+        if body.is_a?(String)
+          [status, headers, [body]]
         else
-          new_body << body
+          [status, headers, body]
         end
-        new_body.collect! { |item| item.to_s }
-
-        [status, headers, new_body.flatten]
       end
     end
   end

data/lib/goliath/rack/formatters/json.rb

@@ -19,7 +19,7 @@ module Goliath
         end
 
         def json_response?(headers)
-          headers['Content-Type'] =~ %r{^application/(json|javascript)}
+          headers['Content-Type'] =~ %r{^application/((vnd\.api\+)?json|javascript)}
         end
       end
     end

data/lib/goliath/rack/params.rb

@@ -4,7 +4,7 @@ require 'rack/utils'
 module Goliath
   module Rack
     URL_ENCODED = %r{^application/x-www-form-urlencoded}
-    JSON_ENCODED = %r{^application/json}
+    JSON_ENCODED = %r{^application/((vnd\.api\+)?json|javascript)}
 
     # A middle ware to parse params. This will parse both the
     # query string parameters and the body and place them into

data/lib/goliath/request.rb

@@ -197,22 +197,14 @@ module Goliath
         callback do
           begin
             @response.status, @response.headers, @response.body = status, headers, body
-            @response.each { |chunk| @conn.send_data(chunk) }
-
-            elapsed_time = (Time.now.to_f - @env[:start_time]) * 1000
-            begin
-              Goliath::Request.log_block.call(@env, @response, elapsed_time)
-            rescue => err
-              # prevent an infinite loop if the block raised an error
-              @env[RACK_LOGGER].error("log block raised #{err}")
-            end
 
-            @conn.terminate_request(keep_alive)
+            stream_data(@response.each) do
+              terminate_request
+            end
           rescue Exception => e
             server_exception(e)
           end
         end
-
       rescue Exception => e
         server_exception(e)
       end
@@ -220,6 +212,31 @@ module Goliath
 
     private
 
+    # Writes each chunk of the response data in a new tick. This achieves
+    # streaming, because EventMachine flushes the sent data to the socket at
+    # the end of each tick.
+    def stream_data(chunks, &block)
+      @conn.send_data(chunks.next)
+      EM.next_tick { stream_data(chunks, &block) }
+    rescue StopIteration
+      block.call
+    rescue Exception => e
+      server_exception(e)
+    end
+
+    # Logs the response time and terminates the request.
+    def terminate_request
+      elapsed_time = (Time.now.to_f - @env[:start_time]) * 1000
+      begin
+        Goliath::Request.log_block.call(@env, @response, elapsed_time)
+      rescue => err
+        # prevent an infinite loop if the block raised an error
+        @env[RACK_LOGGER].error("log block raised #{err}")
+      end
+
+      @conn.terminate_request(keep_alive)
+    end
+
     # Handles logging server exceptions
     #
     # @param e [Exception] The exception to log
@@ -228,20 +245,20 @@ module Goliath
       if e.is_a?(Goliath::Validation::Error)
         status, headers, body = [e.status_code, e.headers, ('{"error":"%s"}' % e.message)]
       else
-        @env[RACK_LOGGER].error("#{e.message}\n#{e.backtrace.join("\n")}")
-        message = Goliath.env?(:production) ? 'An error happened' : e.message
+        logthis = "#{e.backtrace[0]}: #{e.message} (#{e.class})\n"
+        e.backtrace[1..-1].each do |bt|
+          logthis += "    from #{bt}\n"
+        end
+        @env.logger.error(logthis)
+        @env[RACK_EXCEPTION] = e
 
+        message = Goliath.env?(:production) ? 'An error happened' : e.message
         status, headers, body = [500, {}, message]
       end
 
       headers['Content-Length'] = body.bytesize.to_s
       @env[:terminate_connection] = true
       post_process([status, headers, body])
-
-      # Mark the request as complete to force a flush on the response.
-      # Note: #on_body and #response hooks may still fire if the data
-      # is already in the parser buffer.
-      succeed
     end
 
     # Used to determine if the connection should  be kept open

data/lib/goliath/response.rb

@@ -79,6 +79,8 @@ module Goliath
     # @yield [String] The header line, headers and body content
     # @return [Nil]
     def each
+      return enum_for(__method__) unless block_given?
+
       yield head
       yield headers_output
 

data/lib/goliath/version.rb

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

data/spec/integration/async_request_processing.rb

@@ -13,8 +13,8 @@ describe 'Async Request processing' do
 
       post_request(request_data, err) do |c|
         resp = MultiJson.load(c.response)
-        resp['body'].should match('some=data')
-        resp['head'].should include('X-Upload')
+        expect(resp['body']).to match('some=data')
+        expect(resp['head']).to include('X-Upload')
       end
     end
   end

data/spec/integration/chunked_streaming_spec.rb

@@ -27,7 +27,7 @@ describe "ChunkedStreaming" do
   it "should stream content" do
     with_api(ChunkedStreaming, {:verbose => true, :log_stdout => true}) do |server|
       streaming_client_connect('/streaming') do |client|
-        client.receive.should == "chunked"
+        expect(client.receive).to eq("chunked")
       end
     end
   end

data/spec/integration/early_abort_spec.rb

@@ -11,7 +11,7 @@ describe EarlyAbort do
   it "should return OK" do
     with_api(EarlyAbort) do
       get_request({}, err) do |c|
-        c.response.should == "OK"
+        expect(c.response).to eq("OK")
       end
     end
   end
@@ -24,8 +24,8 @@ describe EarlyAbort do
       }
 
       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
+        expect(c.response).to eq("{\"error\":\"Can't handle requests with X-Crash: true.\"}")
+        expect(File.exist?("/tmp/goliath-test-error.log")).to be false
       end
     end
   end
@@ -35,8 +35,8 @@ describe EarlyAbort do
       request_data = { :body => "a" * 20 }
 
       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
+        expect(c.response).to match(/Payload size can't exceed 10 bytes/)
+        expect(File.exist?("/tmp/goliath-test-error.log")).to be false
       end
     end
   end

data/spec/integration/echo_spec.rb

@@ -10,7 +10,7 @@ describe Echo do
     with_api(Echo) do
       get_request({:query => {:echo => 'test'}}, err) do |c|
         b = MultiJson.load(c.response)
-        b['response'].should == 'test'
+        expect(b['response']).to eq('test')
       end
     end
   end
@@ -19,8 +19,8 @@ describe Echo do
     with_api(Echo) do
       get_request({}, err) do |c|
         b = MultiJson.load(c.response)
-        b['error'].should_not be_nil
-        b['error'].should == 'echo identifier missing'
+        expect(b['error']).not_to be_nil
+        expect(b['error']).to eq('echo identifier missing')
       end
     end
   end
@@ -29,7 +29,7 @@ describe Echo do
     with_api(Echo) do
       post_request({:body => {'echo' => 'test'}}, err) do |c|
         b = MultiJson.load(c.response)
-        b['response'].should == 'test'
+        expect(b['response']).to eq('test')
       end
     end
   end
@@ -42,7 +42,7 @@ describe Echo do
       post_request({:body => body.to_s,
                     :head => head}, err) do |c|
         b = MultiJson.load(c.response)
-        b['response'].should == 'test'
+        expect(b['response']).to eq('test')
       end
     end
   end
@@ -55,7 +55,7 @@ describe Echo do
       post_request({:body => body.to_s,
                     :head => head}, err) do |c|
         b = MultiJson.load(c.response)
-        b['response'].should == 'My Echo'
+        expect(b['response']).to eq('My Echo')
       end
     end
   end
@@ -64,7 +64,7 @@ describe Echo do
     with_api(Echo) do
       patch_request({:body => {'echo' => 'test'}}, err) do |c|
         b = MultiJson.load(c.response)
-        b['response'].should == 'test'
+        expect(b['response']).to eq('test')
       end
     end
   end

data/spec/integration/empty_body_spec.rb

@@ -12,8 +12,8 @@ describe 'Empty body API' do
   it 'serves a 201 with no body' do
     with_api(Empty) do
       get_request({}, err) do |c|
-        c.response_header.status.should == 201
-        c.response_header['CONTENT_LENGTH'].should == '0'
+        expect(c.response_header.status).to eq(201)
+        expect(c.response_header['CONTENT_LENGTH']).to eq('0')
       end
     end
   end

data/spec/integration/event_stream_spec.rb

@@ -30,8 +30,8 @@ describe 'EventStream' do
         sse_client_connect('/stream') do |client|
           client.listen_to('custom_event')
           EventStreamEndpoint.events.push(name: 'custom_event', data: 'content')
-          client.receive_on('custom_event').should == ['content']
-          client.receive.should == []
+          expect(client.receive_on('custom_event')).to eq(['content'])
+          expect(client.receive).to eq([])
         end
       end
     end
@@ -42,7 +42,7 @@ describe 'EventStream' do
       with_api(EventStreamEndpoint, {:verbose => true, :log_stdout => true}) do |server|
         sse_client_connect('/stream') do |client|
           EventStreamEndpoint.events.push(data: 'content')
-          client.receive.should == ['content']
+          expect(client.receive).to eq(['content'])
         end
       end
     end

data/spec/integration/exception_handling_spec.rb

@@ -83,8 +83,8 @@ describe ExceptionHandlingAPI do
     it 'returns a normal response' do
       with_api(ExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 200
-          c.response.should == 'No exceptions raised'
+          expect(c.response_header.status).to eq(200)
+          expect(c.response).to eq('No exceptions raised')
         end
       end
     end
@@ -96,8 +96,8 @@ describe ExceptionHandlingAPI do
     it 'handles the exception using ExceptionHandlingMiddleware' do
       with_api(ExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 200
-          c.response.should == 'Exception raised: zoinks'
+          expect(c.response_header.status).to eq(200)
+          expect(c.response).to eq('Exception raised: zoinks')
         end
       end
     end
@@ -109,8 +109,8 @@ describe ExceptionHandlingAPI do
     it 'handles the exception using ExceptionHandlingMiddleware' do
       with_api(ExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 200
-          c.response.should == 'Exception raised: jinkies'
+          expect(c.response_header.status).to eq(200)
+          expect(c.response).to eq('Exception raised: jinkies')
         end
       end
     end
@@ -122,8 +122,8 @@ describe ExceptionHandlingAPI do
     it 'returns a validation error generated by Goliath::Rack::Params' do
       with_api(ExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 400
-          c.response.should == "[:error, \"Invalid parameters: Rack::Utils::ParameterTypeError\"]"
+          expect(c.response_header.status).to eq(400)
+          expect(c.response).to eq("[:error, \"Invalid parameters: Rack::Utils::ParameterTypeError\"]")
         end
       end
     end
@@ -154,8 +154,8 @@ describe PassiveExceptionHandlingAPI do
     it 'returns a normal response' do
       with_api(PassiveExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 200
-          c.response.should == 'No exceptions raised'
+          expect(c.response_header.status).to eq(200)
+          expect(c.response).to eq('No exceptions raised')
         end
       end
     end
@@ -167,8 +167,8 @@ describe PassiveExceptionHandlingAPI do
     it 'returns the server error generated by Goliath::Request#process' do
       with_api(PassiveExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 500
-          c.response.should == 'ruh-roh'
+          expect(c.response_header.status).to eq(500)
+          expect(c.response).to eq('ruh-roh')
         end
       end
     end
@@ -180,8 +180,8 @@ describe PassiveExceptionHandlingAPI do
     it 'returns the validation error generated by Goliath::API#call' do
       with_api(PassiveExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 500
-          c.response.should == '[:error, "puppy-power"]'
+          expect(c.response_header.status).to eq(500)
+          expect(c.response).to eq('[:error, "puppy-power"]')
         end
       end
     end
@@ -193,8 +193,8 @@ describe PassiveExceptionHandlingAPI do
     it 'returns a validation error generated by Goliath::Rack::Params' do
       with_api(PassiveExceptionHandlingAPI) do
         get_request({ query: query }, err) do |c|
-          c.response_header.status.should == 400
-          c.response.should == '[:error, "Invalid parameters: Rack::Utils::ParameterTypeError"]'
+          expect(c.response_header.status).to eq(400)
+          expect(c.response).to eq('[:error, "Invalid parameters: Rack::Utils::ParameterTypeError"]')
         end
       end
     end