Pass through Rack::Response

Author: mkon

examples/aggregation/config.ru

@@ -1,4 +1,5 @@
 require 'api_valve'
+require 'byebug'
 
 app = Rack::Builder.new do
   use ApiValve::Middleware::ErrorHandling
@@ -9,11 +10,10 @@ app = Rack::Builder.new do
       threads = (1..5).map do |i|
         Thread.new { forwarder.call request, 'path' => "posts/#{i}" }
       end
-      threads.each(&:join)
       body = threads.map(&:value).map do |rack_response|
-        JSON.parse(rack_response[2].first)
+        JSON.parse(rack_response.body.first)
       end.to_json
-      [200, {'Content-Type' => 'application/json'}, [body]]
+      Rack::Response.new(body, 200, {'Content-Type' => 'application/json'})
     end
   end
 

examples/basic/config.ru

@@ -2,7 +2,7 @@ require 'api_valve'
 
 app = Rack::Builder.new do
   map '/api' do
-    run ApiValve::Proxy.from_hash(endpoint: 'http://api.host/api/')
+    run ApiValve::Proxy.from_hash(endpoint: 'https://jsonplaceholder.typicode.com')
   end
   map '/oauth' do
     run ApiValve::Proxy.from_hash(endpoint: 'http://auth.host/oauth/')

lib/api_valve/error_responder.rb

@@ -5,10 +5,10 @@ def initialize(error)
     end
 
     def call
-      [
+      Rack::Response[
         status,
         {'Content-Type' => 'application/vnd.api+json'},
-        [MultiJson.dump({errors: [json_error]}, mode: :compat)]
+        MultiJson.dump({errors: [json_error]}, mode: :compat)
       ]
     end
 

lib/api_valve/forwarder/response.rb

@@ -26,7 +26,7 @@ def initialize(original_request, original_response, options = {})
 
     # Must return a rack compatible response array of status code, headers and body
     def rack_response
-      [status, headers, [body]]
+      Rack::Response.new(body, status, headers)
     end
 
     protected

lib/api_valve/middleware/error_handling.rb

@@ -8,7 +8,7 @@ def call(env)
       @app.call(env)
     rescue Exception => e # rubocop:disable Lint/RescueException
       log_error e
-      self.class.const_get(ApiValve.error_responder).new(e).call
+      render_error(e).to_a
     end
 
     private
@@ -17,5 +17,9 @@ def log_error(error)
       ApiValve.logger.error { "#{error.class}: #{error.message}" }
       ApiValve.logger.error { error.backtrace.join("\n") }
     end
+
+    def render_error(error)
+      self.class.const_get(ApiValve.error_responder).new(error).call
+    end
   end
 end

lib/api_valve/proxy.rb

@@ -24,9 +24,9 @@ def initialize(forwarder)
     end
 
     def call(env)
-      to_app.call(env)
+      to_app.call(env).to_a
     rescue ApiValve::Error::Client, ApiValve::Error::Server => e
-      render_error e
+      render_error(e).to_a
     end
 
     delegate :add_route, to: :route_set

spec/api_valve/forwarder/response_spec.rb

@@ -20,7 +20,7 @@
     {'Location' => '/remote-prefix/see/other/path'}
   end
   let(:rack_response) { response.rack_response }
-  let(:headers) { rack_response[1] }
+  let(:headers) { rack_response.headers }
 
   describe 'Location header' do
     subject { headers['Location'] }