api_valve 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca1446c98734c8db7a8a802108b6f76e76792efe515bb17a9c84d5679a14645f
-  data.tar.gz: 43c13f7b3186fe752639e46bfacf73943fa5bd1b624ebc49e70d14c40cf0b132
+  metadata.gz: 0aa5a1818ae2804c3c185af5bec56e8b819672ac69b611097ec0da8f1c2b1289
+  data.tar.gz: '09f0b5d1c206aba0f00c74e6ed85e1c7498e3442af769f61de975858f2dbc94c'
 SHA512:
-  metadata.gz: bc2a55f91363b04866c0db5589ee6536965ad1c28e8dbe2584e83bd3ac306116de2f78ec85ccf96ac342c75490f5fbe01c111012ba1c2b826a3bae9543c45873
-  data.tar.gz: 84b94d9afd865a79aacf15f1cf2fbf0cb019a5c9406299b8c56701b97902443e3b40d10cdaa761d33fb4e6f1f12fbd1d02de38ddfef15da0b464f7a0280c51a0
+  metadata.gz: ffa06feb6c79ae0e49bd741a542a194fc2a0707d0b053319eb205a316e6a02476b5d0998b9757ec0acab3d57fd48502204a2ec81ae04f08a7df2ced1016e98a6
+  data.tar.gz: 7bcd5a6528e21a31b3afe4d873615721301661c781690d3eb60a68df1e1e1c295efc94000ccb05dc32f85a3583b9cecde24e78194c5eadce2beb09eabb4bc862

data/README.md

@@ -1,7 +1,8 @@
 # ApiValve
 
-[![Gem Version](https://badge.fury.io/rb/fidor_api.svg)](https://badge.fury.io/rb/fidor_api)
+[![Gem Version](https://badge.fury.io/rb/api_valve.svg)](https://badge.fury.io/rb/api_valve)
 [![Build Status](https://travis-ci.org/mkon/api_valve.svg?branch=master)](https://travis-ci.org/mkon/api_valve)
+[![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/forwarder/request.rb

@@ -37,8 +37,8 @@ module ApiValve
     # URL path to use when forwarding
     def path
       path = options['endpoint'] || ''
-      if pattern = options['path']
-        path += pattern % options.dig('match_data').named_captures.symbolize_keys
+      if (override = override_path(options))
+        path += override
       else
         path += original_request.path_info
       end
@@ -83,6 +83,13 @@ module ApiValve
       }
     end
 
+    def override_path(options)
+      return unless (path = options['path'])
+      return path unless options.dig('match_data')
+
+      path % options.dig('match_data').named_captures.symbolize_keys
+    end
+
     def x_forwarded_for
       (
         header('X-Forwarded-For').to_s.split(', ') << original_request.env['REMOTE_ADDR']

data/lib/api_valve/router.rb

@@ -20,53 +20,61 @@ module ApiValve
       match request
     end
 
-    def delete(path = nil, callee = nil)
-      add_route :delete, path, callee || Proc.new
+    def delete(path = nil, prok = nil)
+      append :delete, path, prok || Proc.new
     end
 
-    def get(path = nil, callee = nil)
-      add_route :get, path, callee || Proc.new
+    def get(path = nil, prok = nil)
+      append :get, path, prok || Proc.new
     end
 
-    def head(path = nil, callee = nil)
-      add_route :head, path, callee || Proc.new
+    def head(path = nil, prok = nil)
+      append :head, path, prok || Proc.new
     end
 
-    def patch(path = nil, callee = nil)
-      add_route :patch, path, callee || Proc.new
+    def patch(path = nil, prok = nil)
+      append :patch, path, prok || Proc.new
     end
 
-    def post(path = nil, callee = nil)
-      add_route :post, path, callee || Proc.new
+    def post(path = nil, prok = nil)
+      append :post, path, prok || Proc.new
     end
 
-    def put(path = nil, callee = nil)
-      add_route :put, path, callee || Proc.new
+    def put(path = nil, prok = nil)
+      append :put, path, prok || Proc.new
     end
 
-    def any(path = nil, callee = nil)
-      add_route METHODS, path, callee || Proc.new
+    def any(path = nil, prok = nil)
+      append METHODS, path, prok || Proc.new
     end
 
-    def reset_routes
-      @routes = Hash[METHODS.map { |v| [v, []] }].freeze
+    def append(methods, regexp, prok = nil)
+      prok ||= Proc.new
+      Array.wrap(methods).each do |method|
+        @routes[method] << Route.new(regexp, prok)
+      end
     end
 
-    private
-
-    def add_route(methods, regexp, callee)
+    def unshift(methods, regexp = nil, prok = nil)
+      prok ||= Proc.new
       Array.wrap(methods).each do |method|
-        @routes[method] << Route.new(regexp, callee)
+        @routes[method].unshift Route.new(regexp, prok)
       end
     end
 
+    def reset_routes
+      @routes = Hash[METHODS.map { |v| [v, []] }].freeze
+    end
+
+    private
+
     def match(request)
       # For security reasons do not allow URLs that could break out of the proxy namespace on the
       # server. Preferably an nxing/apache rewrite will kill these URLs before they hit us
       raise 'URL not supported' if request.path_info.include?('/../')
 
       @routes && @routes[request.request_method.downcase.to_sym].each do |route|
-        if match_data = route.match(request.path_info)
+        if (match_data = route.match(request.path_info))
           return route.call request, match_data
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_valve
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - mkon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,98 +92,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.1
+        version: 0.59.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.1
+        version: 0.59.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.30.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.4'
 description: 
 email:
 - konstantin@munteanu.de