Fix using middlwares with registered OAD

Author: ahx

lib/openapi_first/middlewares/request_validation.rb

@@ -22,7 +22,7 @@ def initialize(app, spec = nil, options = {})
         @app = app
         if spec.is_a?(Hash)
           options = spec
-          spec = options.fetch(:spec)
+          spec = options[:spec]
         end
         @raise = options.fetch(:raise_error, OpenapiFirst.configuration.request_validation_raise_error)
         @error_response_class = error_response_option(options[:error_response])

lib/openapi_first/middlewares/response_validation.rb

@@ -17,7 +17,7 @@ def initialize(app, spec = nil, options = {})
         @app = app
         if spec.is_a?(Hash)
           options = spec
-          spec = options.fetch(:spec)
+          spec = options[:spec]
         end
         @raise = options.fetch(:raise_error, OpenapiFirst.configuration.response_validation_raise_error)
 

spec/middlewares/request_validation_spec.rb

@@ -141,6 +141,25 @@
     end
   end
 
+  context 'with option and registered OAD' do
+    before do
+      OpenapiFirst.register('./spec/data/request-body-validation.yaml')
+    end
+
+    let(:app) do
+      Rack::Builder.app do
+        use OpenapiFirst::Middlewares::RequestValidation, raise_error: true
+        run ->(_) {}
+      end
+    end
+
+    it 'returns 400' do
+      expect do
+        post '/pets'
+      end.to raise_error OpenapiFirst::RequestInvalidError
+    end
+  end
+
   context 'with error_response: MyCustomClass' do
     let(:app) do
       custom_class = Class.new do

spec/middlewares/response_validation_spec.rb

@@ -47,6 +47,26 @@
     end
   end
 
+  context 'without spec argument and option' do
+    let(:response_body) { '2' }
+
+    let(:app) do
+      res = response
+      definition = spec
+      Rack::Builder.app do
+        use Rack::Lint
+        use OpenapiFirst::Middlewares::ResponseValidation, spec: definition
+        run ->(_env) { res.finish }
+      end
+    end
+
+    it 'fails if request is inavlid' do
+      expect do
+        get '/pets'
+      end.to raise_error OpenapiFirst::ResponseInvalidError
+    end
+  end
+
   context 'without content-type header' do
     let(:headers) do
       { 'X-HEAD' => '/api/next-page' }
@@ -286,6 +306,27 @@
         expect(last_response.status).to eq 200
       end
     end
+
+    context 'with option and registered OAD' do
+      before do
+        OpenapiFirst.register('./spec/data/petstore.yaml')
+      end
+
+      let(:app) do
+        Rack::Builder.new.tap do |builder|
+          builder.use(described_class, raise_error: false)
+          builder.run lambda { |_env|
+            Rack::Response.new('{"foo": "bar"}', 200, { 'Content-Type' => 'application/json' }).finish
+          }
+        end.to_app
+      end
+
+      it 'does not raise an error' do
+        get '/pets'
+
+        expect(last_response.status).to eq 200
+      end
+    end
   end
 
   context 'when response is not valid JSON' do