goliath-rack_proxy 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a7a0e1b05033aa36859754d967e1dc35a9521d1
-  data.tar.gz: 57213aee848373ccbc1cd57431cf68af0ece721b
+SHA256:
+  metadata.gz: '0389e88c7db998d12b5550d7dbd3a3bc323184e3bd1b8d080a1c5d81e0ed1123'
+  data.tar.gz: ee1fdf5d915de32cc4f15d05dcf3d53ca9fe1b5b5daeeb32eb404da02fb1c8eb
 SHA512:
-  metadata.gz: c6ca9cca21727aa34afe651b55b8b7a198d52b16916710fa494f3d1b524af520273925c514f9388d4340db74ffd32f04f99d94af0a1678899626b0797a6edfa8
-  data.tar.gz: 4f08b4ecb2e2e06932b2f135d4ccbe4d288ee0b537667f6044f58611977ca8c0087d9d81de80a6f2ff1b10d3101dec712189b153a1b29ab64bcee0174eb2d259
+  metadata.gz: 399119828686d758a0bc438c62b42467b41bc4ddd5189a0751dc9b64631bf107ef1c65c39a02ef8e89aaec3d05c6006aaa17dae758834f68bd318c5fde7d2ad3
+  data.tar.gz: 0a854cac90c5eab049b4e575e7efa230a16871ed446a195635880d84e265b8ab906861cd44c8552f3cdc0090c06f53db88d5ae18b433deb8775c393e1f0258e7

data/goliath-rack_proxy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name         = "goliath-rack_proxy"
-  gem.version      = "1.0.2"
+  gem.version      = "1.1.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -19,6 +19,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake", "~> 11.1"
   gem.add_development_dependency "minitest", "~> 5.8"
   gem.add_development_dependency "minitest-hooks"
-  gem.add_development_dependency "http"
+  gem.add_development_dependency "http", "~> 3.0"
   gem.add_development_dependency "rack", "~> 2.0"
 end

data/lib/goliath/rack_proxy.rb

@@ -27,12 +27,12 @@ module Goliath
       rewindable_input = self.class.rack_proxy_options.fetch(:rewindable_input, true)
 
       env["rack_proxy.call"] = RackCall.new(rack_app, env, rewindable_input: rewindable_input)
-      env["rack_proxy.call"].resume
+      env["rack_proxy.call"].resume(on_response: -> (response) { send_response(response, env) })
     end
 
     # Resumes the Rack request with the received request body data.
     def on_body(env, data)
-      env["rack_proxy.call"].resume(data)
+      env["rack_proxy.call"].resume(data, on_response: -> (response) { send_response(response, env) })
     end
 
     # Resumes the Rack request with no more data.
@@ -42,11 +42,30 @@ module Goliath
 
     # Resumes the Rack request with no more data.
     def response(env)
-      env["rack_proxy.call"].resume
+      env["rack_proxy.call"].resume(on_response: -> (response) { send_response(response, env) })
+      nil
     end
 
     private
 
+    # The env[ASYNC_CALLBACK] proc wraps sending response data in a
+    # Goliath::Request#callback, which gets executed after the whole request
+    # body has been received.
+    #
+    # This is not ideal for apps that receive large uploads, as when they
+    # validate request headers, they likely want to return error responses
+    # immediately. It's not good user experience to require the user to upload
+    # a large file, only to have the request fail with a validation error.
+    #
+    # To work around that, we mark the request as succeeded before sending the
+    # response, so that the response is sent immediately.
+    def send_response(response, env)
+      request = env[STREAM_SEND].binding.receiver # hack to get the Goliath::Request object
+      request.succeed # makes it so that response is sent immediately
+
+      env[ASYNC_CALLBACK].call(response)
+    end
+
     # Allows "curry-calling" the Rack application, resuming the call as we're
     # receiving more request body data.
     class RackCall
@@ -56,9 +75,11 @@ module Goliath
         @rewindable_input = rewindable_input
       end
 
-      def resume(data = nil)
-        @result = fiber.resume(data) if fiber.alive?
-        @result
+      def resume(data = nil, on_response: nil)
+        if fiber.alive?
+          response = fiber.resume(data)
+          on_response.call(response) if response && on_response
+        end
       end
 
       private
@@ -71,14 +92,14 @@ module Goliath
         @fiber ||= Fiber.new do
           rack_input = RackInput.new(rewindable: @rewindable_input) { Fiber.yield }
 
-          result = @app.call @env.merge(
+          response = @app.call @env.merge(
             "rack.input"     => rack_input,
             "async.callback" => nil, # prevent Roda/Sinatra from calling EventMachine while streaming the response
           )
 
           rack_input.close
 
-          result
+          response
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goliath-rack_proxy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -76,16 +76,16 @@ dependencies:
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Allows you to use Goliath as a web server for your Rack app, giving you streaming