openapi_first 0.10.1 → 0.12.0.alpha2

data/lib/openapi_first/response_validator.rb

@@ -3,30 +3,37 @@
 require 'json_schemer'
 require 'multi_json'
 require_relative 'validation'
+require_relative 'router'
 
 module OpenapiFirst
   class ResponseValidator
     def initialize(spec)
       @spec = spec
+      @router = Router.new(->(_env) {}, spec: spec, raise_error: true)
     end
 
     def validate(request, response)
       errors = validation_errors(request, response)
       Validation.new(errors || [])
-    rescue OasParser::ResponseCodeNotFound, OasParser::MethodNotFound => e
+    rescue OpenapiFirst::ResponseCodeNotFoundError, OpenapiFirst::NotFoundError => e
+      Validation.new([e.message])
+    end
+
+    def validate_operation(request, response)
+      errors = validation_errors(request, response)
+      Validation.new(errors || [])
+    rescue OpenapiFirst::ResponseCodeNotFoundError, OpenapiFirst::NotFoundError => e
       Validation.new([e.message])
     end
 
     private
 
     def validation_errors(request, response)
-      content = response_for(request, response)&.content
+      content = response_for(request, response)&.fetch('content', nil)
       return unless content
 
       content_type = content[response.content_type]
-      unless content_type
-        return ["Content type not found: '#{response.content_type}'"]
-      end
+      return ["Content type not found: '#{response.content_type}'"] unless content_type
 
       response_schema = content_type['schema']
       return unless response_schema
@@ -46,14 +53,14 @@ module OpenapiFirst
                       .merge!(
                         data_pointer: error['data_pointer'],
                         schema_pointer: error['schema_pointer']
-                      ).tap do |formatted|
-      end
+                      )
     end
 
     def response_for(request, response)
-      @spec
-        .find_operation!(request)
-        &.response_by_code(response.status.to_s, use_default: true)
+      env = request.env.dup
+      @router.call(env)
+      operation = env[OPERATION]
+      operation&.response_for(response.status)
     end
   end
 end

data/lib/openapi_first/router.rb

@@ -7,76 +7,65 @@ require_relative 'utils'
 module OpenapiFirst
   class Router
     NOT_FOUND = Rack::Response.new('', 404).finish.freeze
+    DEFAULT_NOT_FOUND_APP = ->(_env) { NOT_FOUND }
 
-    def initialize(app, options)
+    def initialize(
+      app,
+      spec:,
+      raise_error: false,
+      parent_app: nil,
+      not_found: nil
+    )
       @app = app
-      @namespace = options.fetch(:namespace, nil)
-      @parent_app = options.fetch(:parent_app, nil)
-      @router = build_router(options.fetch(:spec).operations)
+      @parent_app = parent_app
+      @raise = raise_error
+      @failure_app = find_failure_app(not_found)
+      if @failure_app.nil?
+        raise ArgumentError,
+              'not_found must be nil, :continue or must respond to call'
+      end
+      @filepath = spec.filepath
+      @router = build_router(spec.operations)
     end
 
     def call(env)
-      endpoint = find_endpoint(env)
-      return endpoint.call(env) if endpoint
+      env[OPERATION] = nil
+      route = find_route(env)
+      return route.call(env) if route.routable?
+
+      if @raise
+        req = Rack::Request.new(env)
+        msg = "Could not find definition for #{req.request_method} '#{req.path}' in API description #{@filepath}"
+        raise NotFoundError, msg
+      end
       return @parent_app.call(env) if @parent_app
 
-      NOT_FOUND
+      @failure_app.call(env)
     end
 
-    def find_handler(operation_id) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      name = operation_id.match(/:*(.*)/)&.to_a&.at(1)
-      return if name.nil?
-
-      if name.include?('.')
-        module_name, method_name = name.split('.')
-        klass = find_const(@namespace, module_name)
-        return klass&.method(Utils.underscore(method_name))
-      end
-      if name.include?('#')
-        module_name, klass_name = name.split('#')
-        const = find_const(@namespace, module_name)
-        klass = find_const(const, klass_name)
-        if klass.instance_method(:initialize).arity.zero?
-          return ->(params, res) { klass.new.call(params, res) }
-        end
+    private
 
-        return ->(params, res) { klass.new(params.env).call(params, res) }
-      end
-      method_name = Utils.underscore(name)
-      return unless @namespace.respond_to?(method_name)
+    def find_failure_app(option)
+      return DEFAULT_NOT_FOUND_APP if option.nil?
+      return @app if option == :continue
 
-      @namespace.method(method_name)
+      option if option.respond_to?(:call)
     end
 
-    private
-
-    def find_endpoint(env)
+    def find_route(env)
       original_path_info = env[Rack::PATH_INFO]
-      # Overwrite PATH_INFO temporarily, because hanami-router does not respect SCRIPT_NAME # rubocop:disable Layout/LineLength
       env[Rack::PATH_INFO] = Rack::Request.new(env).path
-      @router.recognize(env).endpoint
+      @router.recognize(env)
     ensure
       env[Rack::PATH_INFO] = original_path_info
     end
 
-    def find_const(parent, name)
-      name = Utils.classify(name)
-      return unless parent.const_defined?(name, false)
-
-      parent.const_get(name, false)
-    end
-
     def build_router(operations) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       router = Hanami::Router.new {}
       operations.each do |operation|
         normalized_path = operation.path.gsub('{', ':').gsub('}', '')
         if operation.operation_id.nil?
-          warn "operationId is missing in '#{operation.method} #{operation.path}'. I am ignoring this operation." # rubocop:disable Layout/LineLength
-          next
-        end
-        handler = @namespace && find_handler(operation.operation_id)
-        if @namespace && handler.nil?
-          warn "#{self.class.name} cannot not find handler for '#{operation.operation_id}' (#{operation.method} #{operation.path}). This operation will be ignored." # rubocop:disable Layout/LineLength
+          warn "operationId is missing in '#{operation.method} #{operation.path}'. I am ignoring this operation."
           next
         end
         router.public_send(
@@ -85,7 +74,6 @@ module OpenapiFirst
           to: lambda do |env|
             env[OPERATION] = operation
             env[PARAMETERS] = Utils.deep_stringify(env['router.params'])
-            env[HANDLER] = handler
             @app.call(env)
           end
         )

data/lib/openapi_first/router_required.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module OpenapiFirst
+  module RouterRequired
+    def call(env)
+      unless env.key?(OPERATION)
+        raise 'OpenapiFirst::Router missing in middleware stack. Did you forget adding OpenapiFirst::Router?'
+      end
+
+      super
+    end
+  end
+end

data/lib/openapi_first/validation_format.rb

@@ -5,6 +5,7 @@ module OpenapiFirst
     SIMPLE_TYPES = %w[string integer].freeze
 
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def self.error_details(error)
       if error['type'] == 'pattern'
         {
@@ -23,9 +24,10 @@ module OpenapiFirst
       elsif error['schema'] == false
         { title: 'unknown fields are not allowed' }
       else
-        { title: 'is not valid' }
+        { title: "is not valid: #{error['data'].inspect}" }
       end
     end
     # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/openapi_first/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiFirst
-  VERSION = '0.10.1'
+  VERSION = '0.12.0.alpha2'
 end

data/openapi_first.gemspec

@@ -32,13 +32,13 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'deep_merge', '>= 1.2.1'
-  spec.add_dependency 'hanami-router', '~> 2.0.alpha2'
-  spec.add_dependency 'hanami-utils', '~> 2.0.alpha1'
-  spec.add_dependency 'json_schemer', '~> 0.2'
-  spec.add_dependency 'multi_json', '~> 1.14'
-  spec.add_dependency 'oas_parser', '~> 0.25.1'
-  spec.add_dependency 'rack', '~> 2.2'
+  spec.add_runtime_dependency 'deep_merge', '>= 1.2.1'
+  spec.add_runtime_dependency 'hanami-router', '~> 2.0.alpha3'
+  spec.add_runtime_dependency 'hanami-utils', '~> 2.0.alpha1'
+  spec.add_runtime_dependency 'json_schemer', '~> 0.2'
+  spec.add_runtime_dependency 'multi_json', '~> 1.14'
+  spec.add_runtime_dependency 'oas_parser', '~> 0.25.1'
+  spec.add_runtime_dependency 'rack', '~> 2.2'
 
   spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rack-test', '~> 1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.12.0.alpha2
 platform: ruby
 authors:
 - Andreas Haller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha2
+        version: 2.0.alpha3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha2
+        version: 2.0.alpha3
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
@@ -203,12 +203,16 @@ files:
 - lib/openapi_first/app.rb
 - lib/openapi_first/coverage.rb
 - lib/openapi_first/definition.rb
+- lib/openapi_first/find_handler.rb
 - lib/openapi_first/inbox.rb
 - lib/openapi_first/operation.rb
-- lib/openapi_first/operation_resolver.rb
 - lib/openapi_first/request_validation.rb
+- lib/openapi_first/responder.rb
+- lib/openapi_first/response_object.rb
+- lib/openapi_first/response_validation.rb
 - lib/openapi_first/response_validator.rb
 - lib/openapi_first/router.rb
+- lib/openapi_first/router_required.rb
 - lib/openapi_first/utils.rb
 - lib/openapi_first/validation.rb
 - lib/openapi_first/validation_format.rb
@@ -232,9 +236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 

data/lib/openapi_first/operation_resolver.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'rack'
-require_relative 'inbox'
-
-module OpenapiFirst
-  class OperationResolver
-    def call(env)
-      operation = env[OpenapiFirst::OPERATION]
-      res = Rack::Response.new
-      inbox = env[INBOX]
-      handler = env[HANDLER]
-      result = handler.call(inbox, res)
-      res.write serialize(result) if result && res.body.empty?
-      res[Rack::CONTENT_TYPE] ||= operation.content_type_for(res.status)
-      res.finish
-    end
-
-    private
-
-    def serialize(result)
-      return result if result.is_a?(String)
-
-      MultiJson.dump(result)
-    end
-  end
-end