api_valve 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32c722a7544d378d0498850719abd519713186f7b335f3f5e77690aff4aa2078
-  data.tar.gz: e223462c31f002963018477400cd3f18afde8b7227e09ba6f25a6308bd13795a
+  metadata.gz: 2fdf08e3fa15d2bb46dc6f85ee53c681b696d574585b6be1e11dc7fc6b6527b1
+  data.tar.gz: 3cf720502939fe562d385a7347e681927e79519446111410f6ba8c8f1ad7fb52
 SHA512:
-  metadata.gz: 8f3a6609523f43c7b79fb9cc4b56384634d115dbe3e2485b279a60bdabcce5e07cf89d31f6c3d6f71277522efbf5954c70bb84d896eb8455ca7a8a932738f3cb
-  data.tar.gz: 7ae7857ac71fddd6c36ffa7671cda4a2af5834e7f44a80d3a99460e8cd2464b86db187e5916f8d5de41774877998189d690e03ef1dbc51d383d134860b638808
+  metadata.gz: 7e635bcd48b26f59cb92cd46551eb2b4de46fc23765a80c826c7f65993f52dfd232dceb4538586026c73a7d538a591aec96ffd681362c4f5ce1a3d9fbcf944a9
+  data.tar.gz: 2543e426f0b25a9a3b0c1970f3e4dfc81e9d01ccc6147888438d28bff60dca3c9768f98b9e98c4aaf49b090206df93616632a1f559e0454511b8dd83e9953fe7

data/lib/api_valve/proxy.rb

@@ -9,12 +9,13 @@ module ApiValve
     self.request = Forwarder::Request
     self.response = Forwarder::Response
 
-    define_callbacks :call
-
     class << self
-      def build(config, &block)
+      # Creates a n 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
         from_hash(config).tap do |proxy|
-          proxy.instance_eval(&block)
+          proxy.instance_eval(&block) if block
         end
       end
 
@@ -35,7 +36,10 @@ module ApiValve
       def from_hash(config)
         config = config.with_indifferent_access
         forwarder = Forwarder.new(forwarder_config(config))
-        new(forwarder).tap { |proxy| proxy.build_routes_from_config config }
+        new(forwarder).tap do |proxy|
+          Array.wrap(config[:use]).each { |mw| proxy.use mw }
+          proxy.build_routes_from_config config[:routes]
+        end
       end
 
       private
@@ -65,19 +69,22 @@ module ApiValve
     def initialize(forwarder)
       @forwarder = forwarder
       @router = Router.new
+      @middlewares = []
     end
 
     def call(env)
-      @request = Rack::Request.new(env)
-      run_callbacks(:call) { @router.call(@request) }
+      stack = @middlewares.reverse.inject(@router) { |a, e| e.call a }
+      stack.call(env)
     rescue ApiValve::Error::Client, ApiValve::Error::Server => e
       render_error e
     end
 
     delegate :add_route, to: :router
 
-    def build_routes_from_config(config)
-      config['routes']&.each do |route_config|
+    def build_routes_from_config(routes_config)
+      return forward_all unless routes_config
+
+      routes_config.each do |route_config|
         method, path_regexp, request_override = *route_config.values_at('method', 'path', 'request')
         method ||= 'any' # no method defined means all methods
         if route_config['raise']
@@ -86,7 +93,6 @@ module ApiValve
           forward method, path_regexp, request_override
         end
       end
-      forward_all unless config['routes']
     end
 
     def forward(methods, path_regexp = nil, request_override = {})
@@ -109,6 +115,10 @@ module ApiValve
       end
     end
 
+    def use(middleware, *args, &block)
+      @middlewares << proc { |app| middleware.new(app, *args, &block) }
+    end
+
     protected
 
     def render_error(error)

data/lib/api_valve/router.rb

@@ -16,8 +16,8 @@ module ApiValve
       reset_routes
     end
 
-    def call(request)
-      match request
+    def call(env)
+      match Rack::Request.new(env)
     end
 
     def delete(path = nil, prok = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_valve
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - mkon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.61.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement