api_valve 0.8.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0077e2b67d1a99fcde84633c66f4bb2eb6cbd9b65e45b46a1bbc6f22f0a7bf47
-  data.tar.gz: e880e13b437165fa6678638fa7e8a632115a7587bf9024fdf86f81399c12ac75
+  metadata.gz: efc4ab150d52d51871f9f354981bc593ee5498ceb18a8360903dc852e7236ac1
+  data.tar.gz: 6e7a6baf1e21e480d37b9051d7af404bb597665571aa0904d5fad58e09c5852c
 SHA512:
-  metadata.gz: 5802ab4c218221aabbb6921337165090911137ca5d42e66551706e7ab99cd0e9fe69000246ecbdf733605ae8b1bbab3aa8bc5b812786e6ba2450adeeb327fb25
-  data.tar.gz: d7e2f3dbe1b9fb27e2db8a5444adf05abb044dd6e5947fa8ecb0f729091bd2e96f24daf154f810333c4286feee99424a45a2cedd76831174386e3bb922abd00d
+  metadata.gz: 141e76749cc7dc127434882786ab90f7574a9e5fe0c826b7932e3ac9b4949821c05d79080fc91a2643af5d0893e39c8694769f2516fd3fc16765c46e38db443b
+  data.tar.gz: 706c645a89c86349fdd91b7bd7ee74530636dd71df43fafe999e4a479575aee37f6217dc47a41b1c9c591806826886ecf82c1b16b6771f1c493a6c05f13765ec

data/README.md

@@ -1,7 +1,7 @@
 # ApiValve
 
 [![Gem Version](https://badge.fury.io/rb/api_valve.svg)](https://badge.fury.io/rb/api_valve)
-![](https://github.com/mkon/api_valve/workflows/Test/badge.svg?branch=master)
+![](https://github.com/mkon/api_valve/workflows/Test/badge.svg?branch=main)
 [![Depfu](https://badges.depfu.com/badges/1f5892cc85d02997050e0a4d077c7dc4/overview.svg)](https://depfu.com/github/mkon/api_valve?project_id=5958)
 
 Extensible rack application that serves as lightweight API reverse proxy.

data/lib/api_valve/error_responder.rb

@@ -16,7 +16,7 @@ module ApiValve
 
     def status
       status = @error.try(:http_status)
-      return status if status&.is_a?(Integer)
+      return status if status.is_a?(Integer)
 
       Rack::Utils::SYMBOL_TO_STATUS_CODE[status] || 500
     end

data/lib/api_valve/forwarder/request.rb

@@ -86,9 +86,9 @@ module ApiValve
 
     def override_path(options)
       return unless (path = options['path'])
-      return path unless options.dig('match_data')
+      return path unless options['match_data']
 
-      path % options.dig('match_data').named_captures.symbolize_keys
+      path % options['match_data'].named_captures.symbolize_keys
     end
 
     def x_forwarded_for

data/lib/api_valve/logger.rb

@@ -9,7 +9,7 @@ module ApiValve
       include ActiveSupport::TaggedLogging::Formatter
     end
 
-    def initialize(target = STDOUT)
+    def initialize(target = $stdout)
       super(target)
       self.formatter = Formatter.new
     end

data/lib/api_valve/proxy/builder.rb

@@ -1,10 +1,9 @@
 module ApiValve
   class Proxy
     module Builder
-      # Creates a n instance from a config hash and takes optional block
+      # Creates an instance from a config hash and takes optional block
       # which is executed in scope of the proxy
-      def build(config)
-        block = Proc.new if block_given? # capture the yield
+      def build(config, &block)
         from_hash(config).tap do |proxy|
           proxy.instance_eval(&block) if block
         end
@@ -16,12 +15,12 @@ module ApiValve
         raise "Config not found for #{name.underscore}(.yml|.yml.erb) in #{ApiValve.config_paths.inspect}" unless path
 
         yaml = File.read(path)
-        yaml = ERB.new(yaml, nil, '-').result if path.fnmatch? '*.erb'
+        yaml = ERB.new(yaml, trim_mode: '-').result if path.fnmatch? '*.erb'
         from_yaml yaml
       end
 
       def from_yaml(string)
-        from_hash YAML.load(string) # rubocop:disable Security/YAMLLoad
+        from_hash YAML.safe_load(string, permitted_classes: ApiValve.safe_load_classes)
       end
 
       def from_hash(config)

data/lib/api_valve/proxy.rb

@@ -34,9 +34,9 @@ module ApiValve
 
     def forward(methods, path_regexp = nil, options = {})
       options = options.with_indifferent_access
-      route_set.append(methods, path_regexp, options.except(:request), proc { |request, match_data|
+      route_set.append(methods, path_regexp, options.except(:request)) do |request, match_data|
         forwarder.call request, {'match_data' => match_data}.merge(options[:request] || {}).with_indifferent_access
-      })
+      end
     end
 
     def forward_all(options = {})
@@ -44,7 +44,7 @@ module ApiValve
     end
 
     def deny(methods, path_regexp = nil, with: 'Error::Forbidden')
-      route_set.append(methods, path_regexp, {}, ->(*_args) { raise ApiValve.const_get(with) })
+      route_set.append(methods, path_regexp, {}) { raise ApiValve.const_get(with) }
     end
 
     protected

data/lib/api_valve/route_set.rb

@@ -32,54 +32,54 @@ module ApiValve
       [route, match_data]
     end
 
-    def delete(path = nil, options = {}, prok = nil)
-      push :delete, path, options, prok || Proc.new
+    def delete(path = nil, options = {}, &block)
+      push :delete, path, options, &block
     end
 
-    def get(path = nil, options = {}, prok = nil)
-      push :get, path, options, prok || Proc.new
+    def get(path = nil, options = {}, &block)
+      push :get, path, options, &block
     end
 
-    def head(path = nil, options = {}, prok = nil)
-      push :head, path, options, prok || Proc.new
+    def head(path = nil, options = {}, &block)
+      push :head, path, options, &block
     end
 
-    def patch(path = nil, options = {}, prok = nil)
-      push :patch, path, options, prok || Proc.new
+    def patch(path = nil, options = {}, &block)
+      push :patch, path, options, &block
     end
 
-    def post(path = nil, options = {}, prok = nil)
-      push :post, path, options, prok || Proc.new
+    def post(path = nil, options = {}, &block)
+      push :post, path, options, &block
     end
 
-    def put(path = nil, options = {}, prok = nil)
-      push :put, path, options, prok || Proc.new
+    def put(path = nil, options = {}, &block)
+      push :put, path, options, &block
     end
 
-    def any(path = nil, options = {}, prok = nil)
-      append METHODS, path, options, prok || Proc.new
+    def any(path = nil, options = {}, &block)
+      append METHODS, path, options, &block
     end
 
-    def push(methods, regexp, options = {}, prok = nil)
-      add_route :push, methods, regexp, options, prok || Proc.new
+    def push(methods, regexp, options = {}, &block)
+      add_route :push, methods, regexp, options, &block
     end
 
     alias append push
 
-    def unshift(methods, regexp = nil, options = {}, prok = nil)
-      add_route :unshift, methods, regexp, options, prok || Proc.new
+    def unshift(methods, regexp = nil, options = {}, &block)
+      add_route :unshift, methods, regexp, options, &block
     end
 
     def reset_routes
-      @routes = Hash[METHODS.map { |v| [v, []] }].with_indifferent_access.freeze
+      @routes = METHODS.to_h { |v| [v, []] }.with_indifferent_access.freeze
     end
 
     private
 
-    def add_route(how, methods, regexp, options, prok)
+    def add_route(how, methods, regexp, options, &block)
       methods = METHODS if methods.to_s == 'any'
       Array.wrap(methods).each do |method|
-        @routes[method].public_send how, Route.new(regexp, options, prok)
+        @routes[method].public_send how, Route.new(regexp, options, block)
       end
     end
   end

data/lib/api_valve.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/callbacks'
 require 'active_support/configurable'
 require 'active_support/core_ext/class'
@@ -5,6 +6,7 @@ require 'active_support/core_ext/hash'
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/module'
 require 'active_support/json'
+require 'active_support/notifications'
 require 'active_support/rescuable'
 require 'benchmark'
 require 'faraday'
@@ -26,7 +28,7 @@ module ApiValve
   include ActiveSupport::Configurable
 
   config_accessor :logger do
-    Logger.new(STDOUT)
+    Logger.new($stdout)
   end
 
   config_accessor :error_responder do
@@ -41,6 +43,10 @@ module ApiValve
     []
   end
 
+  config_accessor :safe_load_classes do
+    [::Regexp]
+  end
+
   # :nocov:
   def self.configure
     yield config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_valve
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.1.0
 platform: ruby
 authors:
 - mkon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -126,28 +126,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 1.29.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 1.29.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 2.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: 
+description:
 email:
 - konstantin@munteanu.de
 executables: []
@@ -220,8 +220,9 @@ files:
 homepage: https://github.com/mkon/api_valve
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -229,15 +230,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Lightweight ruby/rack API reverse proxy or gateway
 test_files: []