api_proxy 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f3102a142d918c17fee6b1c1de26b5ce09f78f31422839d27283839b011371
-  data.tar.gz: '06889bbc07a32f23482e1b44f038d84f938200919b98865e3eec816b6f8447e6'
+  metadata.gz: d61c5cf36f1ea1bd4f85ccc4dae8a44c5cbfbbd5ed90a46c271b3dd5b1e6488e
+  data.tar.gz: a79c2e0eec2d448f0e7f8d74aca1f2e6387d3a2fd2c009dc41c6f3e364c67bb4
 SHA512:
-  metadata.gz: 5f6e2852947eb89a50076c9fc99528639e9021b2c9b79d80e71eaf693845dab8ef295b8c18d830255cf42c1c710ff0c8f2a8d435c0fd00912d2bb4a806c162a9
-  data.tar.gz: fd5715b1d1322458fdc69bac3f380138ea9ff60dd458dc98e3ddf700f10fc6aae9daea93fec3d7ed883e357ef5ece2268e1bbe6118c96b77646b931525d1a4a1
+  metadata.gz: 913b636988ecb6e592a8e331a6531d01fae795513730d93e0eac22951a84e431996e230609e41b9e61be94313b6ca0f2b23e9da1f6831a5913e2420a87a70443
+  data.tar.gz: edef8ee9c18aaa5024e7479a8a33996b5c088e7d3506a4db27dc31fb77aa2ff429d88c3c3778a5115a0f282037e9032a8a81506f18713ad88aaefd801de3765e

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.7.6
+  TargetRubyVersion: 3.2.2
 
   Exclude:
     - "Guardfile"

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_proxy (0.2.7)
+    api_proxy (0.2.9)
       activesupport (>= 4.0)
       api_signature (~> 0.1.2)
       httparty (>= 0.15)
@@ -9,29 +9,66 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     api_signature (0.1.5)
       activesupport (>= 4.0)
       rack (>= 1.6)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    childprocess (4.1.0)
+    childprocess (5.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    crack (0.4.5)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
-    ffi (1.15.5)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.3)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    ffi (1.16.3)
     formatador (1.1.0)
-    guard (2.18.0)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -45,102 +82,106 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (1.0.1)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    hashdiff (1.1.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
-    json (2.6.3)
-    kwalify (0.7.2)
-    listen (3.7.1)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
+    lumberjack (1.2.10)
     method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.16.3)
+    mini_mime (1.1.5)
+    minitest (5.22.3)
     multi_xml (0.6.0)
+    mutex_m (0.2.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    overcommit (0.59.1)
-      childprocess (>= 0.6.3, < 5)
+    overcommit (0.63.0)
+      childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.1)
-    rack (3.0.2)
+    public_suffix (5.0.5)
+    racc (1.7.3)
+    rack (3.0.10)
     rainbow (3.1.1)
-    rake (10.5.0)
+    rake (13.2.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    reek (6.1.2)
-      kwalify (~> 0.7.0)
-      parser (~> 3.1.0)
+    reek (6.3.0)
+      dry-schema (~> 1.13.0)
+      parser (~> 3.3.0)
       rainbow (>= 2.0, < 4.0)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+      rexml (~> 3.1)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.39.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.62.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    ruby-progressbar (1.13.0)
     shellany (0.0.1)
-    thor (1.2.1)
-    tzinfo (2.0.5)
+    thor (1.3.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    webmock (3.18.1)
+    unicode-display_width (2.5.0)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.6.13)
 
 PLATFORMS
-  arm64-darwin-21
+  arm64-darwin-22
 
 DEPENDENCIES
   api_proxy!
   bundler
   bundler-audit
-  guard-rspec (~> 4.7, >= 4.7.3)
+  guard-rspec
   overcommit
-  rake (~> 10.0)
+  rake
   reek
-  rspec (~> 3.0)
+  rspec
   rubocop
   webmock (~> 3.4, >= 3.4.2)
 
 BUNDLED WITH
-   2.3.25
+   2.4.19

data/README.md

@@ -34,6 +34,8 @@ ApiProxy.configure(:my_namespace) do |config|
   config.api_url = 'http://localhost:3002/api/v1'
 
   config.request_starts_with = '/_some_key'
+
+  config.allowed_headers = %w[content-type content-length]
 end
 ```
 

data/api_proxy.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'bundler-audit'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7', '>= 4.7.3'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'overcommit'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'reek'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock', '~> 3.4', '>= 3.4.2'
 

data/lib/api_proxy/config.rb

@@ -8,7 +8,8 @@ module ApiProxy
                   :request_starts_with,
                   :request_allowed,
                   :custom_headers,
-                  :reject_params
+                  :reject_params,
+                  :allowed_headers
 
     def initialize
       load_defaults
@@ -28,6 +29,15 @@ module ApiProxy
       @custom_headers = ->(_env) { {} }
 
       @reject_params = %w[utf8 authenticity_token commit format controller action]
+
+      @allowed_headers = %w[
+        content-type
+        etag
+        cache-control
+        content-length
+        content-disposition
+        content-transfer-encoding
+      ]
     end
   end
 end

data/lib/api_proxy/headers_filter.rb

@@ -2,21 +2,13 @@
 
 module ApiProxy
   class HeadersFilter
-    ALLOWED_HEADERS = [
-      'content-type',
-      'etag',
-      'cache-control',
-      'content-length',
-      'content-disposition',
-      'content-transfer-encoding'
-    ].freeze
-
-    def initialize(headers)
+    def initialize(headers, allowed_headers = [])
       @headers = headers
+      @allowed_headers = allowed_headers
     end
 
     def filter
-      @headers.select { |key, _value| ALLOWED_HEADERS.include?(key) }
+      @headers.select { |key, value| @allowed_headers.include?(key) && value.present? }
               .transform_values { |value| Array(value)[0] }
     end
   end

data/lib/api_proxy/response_builder.rb

@@ -20,9 +20,9 @@ module ApiProxy
 
     def response
       Rack::Response.new(
-        result.to_s,
+        result.body.to_s,
         result.code,
-        ApiProxy::HeadersFilter.new(result.headers).filter
+        response_headers(result)
       )
     end
 
@@ -42,7 +42,7 @@ module ApiProxy
     end
 
     def options
-      { namespace: namespace, body: filtered_params, headers: headers }
+      { namespace: namespace, body: filtered_params, headers: request_headers }
     end
 
     def filtered_params
@@ -53,8 +53,15 @@ module ApiProxy
       @params ||= (env['action_dispatch.request.request_parameters'].presence || request.params)
     end
 
-    def headers
+    def request_headers
       config.custom_headers.call(env)
     end
+
+    def response_headers(response)
+      ApiProxy::HeadersFilter.new(
+        response.headers.merge('content-length' => response.body&.size),
+        @config.allowed_headers
+      ).filter
+    end
   end
 end

data/lib/api_proxy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApiProxy
-  VERSION = '0.2.7'
+  VERSION = '0.2.9'
 end

data/lib/api_proxy.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'api_proxy/version'
-require 'active_support/time'
-require 'active_support/time_with_zone'
-require 'active_support/core_ext/module'
+
+require 'active_support/all'
 
 module ApiProxy
+  extend ActiveSupport::Autoload
+
   autoload :Config, 'api_proxy/config'
   autoload :Middleware, 'api_proxy/middleware'
   autoload :HeadersFilter, 'api_proxy/headers_filter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Igor Malinovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,22 +42,16 @@ dependencies:
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +98,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +184,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
-description: 
+description:
 email:
 - igor.malinovskiy@netfixllc.org
 executables: []
@@ -225,7 +219,7 @@ homepage: https://github.com/psyipm/api_proxy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,8 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Proxy for tickets service
 test_files: []