api_valve 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efc4ab150d52d51871f9f354981bc593ee5498ceb18a8360903dc852e7236ac1
-  data.tar.gz: 6e7a6baf1e21e480d37b9051d7af404bb597665571aa0904d5fad58e09c5852c
+  metadata.gz: 06a97139becbc8072fd7a530580b48ca5b5ba0ea13321524833d470fd868d175
+  data.tar.gz: 0abefffd5835c0c2eabd3c8095b75dc9d529815992f1bc0449bea9d96ad6d2dd
 SHA512:
-  metadata.gz: 141e76749cc7dc127434882786ab90f7574a9e5fe0c826b7932e3ac9b4949821c05d79080fc91a2643af5d0893e39c8694769f2516fd3fc16765c46e38db443b
-  data.tar.gz: 706c645a89c86349fdd91b7bd7ee74530636dd71df43fafe999e4a479575aee37f6217dc47a41b1c9c591806826886ecf82c1b16b6771f1c493a6c05f13765ec
+  metadata.gz: 6fb2949969a28eb1c05fec05d936b91af13124a0e6a0d7e7c4cfaae40f8cf7e2abb3737e23f5d5e036ceab2f89dae1d273fcdaef04513c6d4890d8dacae4d0cc
+  data.tar.gz: 633b4057742e3271366a241103a6afa80278ec1f384b68da01a57974c7d116c0310f852dc1d1413b800dc9ffecb46d25d321b211cfd63cc98197c9260b920e08

data/lib/api_valve/error_responder.rb

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

data/lib/api_valve/forwarder/location_converter.rb

@@ -0,0 +1,38 @@
+module ApiValve
+  class Forwarder::LocationConverter
+    def initialize(location, options)
+      @location = location
+      @options = options
+    end
+
+    def call
+      if other_host? || same_prefix?
+        @location.to_s
+      else
+        convert_location
+      end
+    end
+
+    private
+
+    def local_prefix
+      @options[:local_prefix].presence
+    end
+
+    def other_host?
+      @location.host && @options[:response_uri].host != @location.host
+    end
+
+    def same_prefix?
+      local_prefix == target_prefix
+    end
+
+    def target_prefix
+      @options[:target_prefix].presence
+    end
+
+    def convert_location
+      @location.to_s.gsub(/^#{@options[:target_prefix]}/, @options[:local_prefix])
+    end
+  end
+end

data/lib/api_valve/forwarder/response.rb

@@ -26,7 +26,7 @@ module ApiValve
 
     # 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
@@ -56,9 +56,15 @@ module ApiValve
     end
 
     def adjust_location(location)
-      return location if @options[:target_prefix] == @options[:local_prefix]
+      return unless location
 
-      location&.gsub(/^#{@options[:target_prefix]}/, @options[:local_prefix])
+      Forwarder::LocationConverter.new(
+        URI(location),
+        @options.slice(:local_prefix, :target_prefix).merge(
+          request_uri:  URI(@original_request.url),
+          response_uri: @original_response.env.url # already a URI
+        )
+      ).call
     end
 
     def body

data/lib/api_valve/forwarder.rb

@@ -4,8 +4,9 @@ module ApiValve
   # options, and called from the router.
 
   class Forwarder
-    autoload :Request,  'api_valve/forwarder/request'
-    autoload :Response, 'api_valve/forwarder/response'
+    autoload :LocationConverter,  'api_valve/forwarder/location_converter'
+    autoload :Request,            'api_valve/forwarder/request'
+    autoload :Response,           'api_valve/forwarder/response'
 
     include Benchmarking
 

data/lib/api_valve/middleware/error_handling.rb

@@ -8,7 +8,7 @@ class ApiValve::Middleware
       @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 @@ class ApiValve::Middleware
       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

data/lib/api_valve/proxy.rb

@@ -24,9 +24,9 @@ module ApiValve
     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

data/lib/api_valve.rb

@@ -10,8 +10,9 @@ require 'active_support/notifications'
 require 'active_support/rescuable'
 require 'benchmark'
 require 'faraday'
-require 'multi_json'
+require 'json'
 require 'logger'
+require 'rack'
 
 module ApiValve
   autoload :Benchmarking,      'api_valve/benchmarking'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_valve
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - mkon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -37,9 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,37 +47,43 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +104,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,28 +146,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.1
+        version: 1.37.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.1
+        version: 1.37.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.13.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +224,7 @@ files:
 - lib/api_valve/error.rb
 - lib/api_valve/error_responder.rb
 - lib/api_valve/forwarder.rb
+- lib/api_valve/forwarder/location_converter.rb
 - lib/api_valve/forwarder/request.rb
 - lib/api_valve/forwarder/response.rb
 - lib/api_valve/logger.rb