openapi_first 0.13.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94cbe97158c8482c40dd1521e1f83cef287ad2e7e32f82746f24adcf45f60c4e
-  data.tar.gz: 1aff02e97e51b67334c34bc6ee967559def9218c4e81dc6295204bb5447f6715
+  metadata.gz: 4f1e3ae677c078e5e4b64641c76c40a66994edb8599d9001e3673458eb83338d
+  data.tar.gz: 6e394c9017964515be4e8970899fe697480600753ca6e81db78d34faed7c982b
 SHA512:
-  metadata.gz: 4ca9c77f8b70024083b831a02d824c2fd0321ff3598234f085133b161ba46a2177e9279e80e22f2ca56da466b087c0c7ac3a62c6dec9a7f906bf03fd44f2eb47
-  data.tar.gz: bcffa9f70194081780a0348f17e695b05f879eb029e4932baa224c3ca1d03e7fb531931f111bfdbcf452f772c0729e725cd3101779aa363408f859e63fd989f8
+  metadata.gz: e41290229c5e5bc7d65179783b6b1ec0403ab987433c5b65535c10d3fee00a42440626f26f2a8ffd02d69a63b64684780165cc4398baf873842e20731570a076
+  data.tar.gz: b93594502a2dff93be5b0bff277f49431c40cae4a77a263acfac14370c855dbd424ac36156b832ec2f2ef1f892e44c0c7aaf84d6b567d772220da0ec991357a5

data/.rubocop.yml

@@ -1,13 +1,14 @@
 AllCops:
   TargetRubyVersion: 2.6
   NewCops: enable
+  SuggestExtensions: false
 Style/Documentation:
   Enabled: false
 Style/ExponentialNotation:
   Enabled: true
 Metrics/BlockLength:
   Exclude:
-  - 'spec/**/*.rb'
-  - '*.gemspec'
+    - "spec/**/*.rb"
+    - "*.gemspec"
 Metrics/MethodLength:
   Max: 20

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 # Changelog
 
+## 0.14.0
+- Handle custom x-handler field in the API description to find a handler method not based on operationId
+- Add `resolver` option to provide a custom resolver to find a handler method
+
 ## 0.13.3
 - Better error message if string does not match format
+- readOnly and writeOnly just works when used inside allOf
 
 ## 0.13.2
 - Return indicator (`source: { parameter: 'list/1' }`) in error response body when array item in query parameter is invalid

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openapi_first (0.13.3)
+    openapi_first (0.14.0)
       deep_merge (>= 1.2.1)
       hanami-router (~> 2.0.alpha3)
       hanami-utils (~> 2.0.alpha1)
@@ -13,51 +13,53 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     deep_merge (1.2.1)
     diff-lcs (1.4.4)
-    ecma-re-validator (0.2.1)
-      regexp_parser (~> 1.2)
-    hana (1.3.6)
-    hanami-router (2.0.0.alpha3)
+    dry-transformer (0.1.1)
+    ecma-re-validator (0.3.0)
+      regexp_parser (~> 2.0)
+    hana (1.3.7)
+    hanami-router (2.0.0.alpha5)
       mustermann (~> 1.0)
       mustermann-contrib (~> 1.0)
       rack (~> 2.0)
-    hanami-utils (2.0.0.alpha1)
+    hanami-utils (2.0.0.alpha2)
       concurrent-ruby (~> 1.0)
-      transproc (~> 1.0)
+      dry-transformer (~> 0.1)
     hansi (0.2.0)
     hash-deep-merge (0.1.1)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json_schemer (0.2.16)
-      ecma-re-validator (~> 0.2)
+    json_schemer (0.2.18)
+      ecma-re-validator (~> 0.3)
       hana (~> 1.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (~> 2.0)
       uri_template (~> 0.7)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-contrib (1.1.1)
       hansi (~> 0.2.0)
       mustermann (= 1.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oas_parser (0.25.1)
+    nokogiri (1.12.2)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    oas_parser (0.25.4)
       activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)
@@ -65,53 +67,52 @@ GEM
       hash-deep-merge
       mustermann-contrib (~> 1.1.1)
       nokogiri
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    parallel (1.20.1)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.93.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.18.4)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.8.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    thread_safe (0.3.6)
-    transproc (1.1.1)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.9.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
     uri_template (0.7.0)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -126,4 +127,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/README.md

@@ -29,9 +29,9 @@ You always have to add this middleware first in order to make the other middlewa
 use OpenapiFirst::Router, spec: OpenapiFirst.load('./openapi/openapi.yaml')
 ```
 
-This middleware adds `env[OpenapiFirst::OPERATION]` which holds an Operation object that responds to `operation_id` and `path`.
+This middleware adds `env[OpenapiFirst::OPERATION]` which holds an Operation object that responds to `#operation_id`, `#path` (and `#[]` to access raw fields).
 
-Options and their defaults:
+### Options and defaults
 
 | Name | Possible values | Description | Default
 |:---|---|---|---|
@@ -48,7 +48,7 @@ use OpenapiFirst::RequestValidation
 ```
 
 
-Options and their defaults:
+### Options and defaults
 
 | Name | Possible values | Description | Default
 |:---|---|---|---|
@@ -109,16 +109,19 @@ Response validation fails if response body includes a property with `writeOnly:
 
 This Rack endpoint maps the HTTP request to a method call based on the [operationId](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#operation-object) in your API description and calls it. Responder also adds a content-type to the response.
 
-Currently there are no customization options for this part. Please [share your ideas](#contributing) on how to best meet your needs and preferred style.
-
 ```ruby
 run OpenapiFirst::Responder, spec: OpenapiFirst.load('./openapi/openapi.yaml')
 ```
 
+### Options
 | Name | Description
 |:---|---|
-|`spec:`| The spec loaded via `OpenapiFirst.load` |
-| `namespace:` | A class or module where to find the handler method. |
+| `namespace:` | Optional. A class or module where to find the handler method. |
+| `resolver:` | Optional. An object that responds to `#call(operation)` and returns a (handler)[#handler]. By default this is an instance of [DefaultOperationResolver](#OpenapiFirst::DefaultOperationResolver) |
+
+
+### OpenapiFirst::DefaultOperationResolver
+This is the default way to look up a handler method for an operation. Handlers are always looked up in a namespace module that needs to be specified.
 
 It works like this:
 
@@ -176,7 +179,7 @@ The above will use the mentioned Rack middlewares to:
 - Map the request to a method call `Pets.find_pet` based on the `operationId` in the API description
 - Set the response content type according to your spec (here with the default status code `200`)
 
-### Options and their defaults:
+### Options and defaults
 
 | Name | Possible values | Description | Default
 |:---|---|---|---|
@@ -185,6 +188,7 @@ The above will use the mentioned Rack middlewares to:
 | `response_validation:` | `true`, `false` | If set to true it raises an exception if the response is invalid. This is useful during testing. | `false`
 | `router_raise_error:` | `true`, `false` | If set to true it raises an exception (subclass of `OpenapiFirst::Error` when a request path/method is not specified. This is useful during testing. | `false`
 | `request_validation_raise_error:` | `true`, `false` | If set to true it raises an exception (subclass of `OpenapiFirst::Error` when a request is not valid. | `false`
+| `resolver:` | | Option to customize finding the [handler](#handler) method for an operation. See [OpenapiFirst::Responder](#OpenapiFirst::Responder) for details.
 
 
 Handler functions (`find_pet`) are called with two arguments:

data/benchmarks/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    openapi_first (0.13.3)
+    openapi_first (0.14.0)
       deep_merge (>= 1.2.1)
       hanami-router (~> 2.0.alpha3)
       hanami-utils (~> 2.0.alpha1)
@@ -13,78 +13,75 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    benchmark-ips (2.8.3)
+    benchmark-ips (2.9.1)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
     builder (3.2.4)
-    committee (4.2.0)
+    committee (4.4.0)
       json_schema (~> 0.14, >= 0.14.3)
-      openapi_parser (>= 0.11.1)
+      openapi_parser (>= 0.11.1, < 1.0)
       rack (>= 1.5)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     deep_merge (1.2.1)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-container (0.7.2)
+      dry-core (~> 0.5, >= 0.5.0)
+    dry-container (0.8.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.0.8)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-transformer (0.1.1)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    ecma-re-validator (0.2.1)
-      regexp_parser (~> 1.2)
-    grape (1.5.0)
+    ecma-re-validator (0.3.0)
+      regexp_parser (~> 2.0)
+    grape (1.5.3)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    hana (1.3.6)
-    hanami-api (0.1.1)
+    hana (1.3.7)
+    hanami-api (0.2.0)
       hanami-router (~> 2.0.alpha)
-    hanami-router (2.0.0.alpha3)
+    hanami-router (2.0.0.alpha5)
       mustermann (~> 1.0)
       mustermann-contrib (~> 1.0)
       rack (~> 2.0)
-    hanami-utils (2.0.0.alpha1)
+    hanami-utils (2.0.0.alpha2)
       concurrent-ruby (~> 1.0)
-      transproc (~> 1.0)
+      dry-transformer (~> 0.1)
     hansi (0.2.0)
     hash-deep-merge (0.1.1)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json_schema (0.20.9)
-    json_schemer (0.2.16)
-      ecma-re-validator (~> 0.2)
+    json_schema (0.21.0)
+    json_schemer (0.2.18)
+      ecma-re-validator (~> 0.3)
       hana (~> 1.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (~> 2.0)
       uri_template (~> 0.7)
     memory_profiler (0.9.14)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -93,9 +90,10 @@ GEM
       mustermann (= 1.1.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oas_parser (0.25.2)
+    nokogiri (1.12.2)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    oas_parser (0.25.4)
       activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)
@@ -103,31 +101,30 @@ GEM
       hash-deep-merge
       mustermann-contrib (~> 1.1.1)
       nokogiri
-    openapi_parser (0.12.1)
+    openapi_parser (0.14.1)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-protection (2.1.0)
       rack
-    regexp_parser (1.8.2)
-    ruby2_keywords (0.0.2)
+    regexp_parser (2.1.1)
+    ruby2_keywords (0.0.5)
     seg (1.2.0)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    syro (3.2.0)
+    syro (3.2.1)
       rack (>= 1.6.0)
       seg
-    thread_safe (0.3.6)
     tilt (2.0.10)
-    transproc (1.1.1)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uri_template (0.7.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -145,4 +142,4 @@ DEPENDENCIES
   syro
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/benchmarks/apps/committee.ru

@@ -19,6 +19,8 @@ app = Class.new(Hanami::API) do
   end
 end.new
 
-use Committee::Middleware::RequestValidation, schema_path: './apps/openapi.yaml'
+use Committee::Middleware::RequestValidation,
+    schema_path: './apps/openapi.yaml',
+    parse_response_by_content_type: true
 
 run app

data/benchmarks/benchmarks.rb

@@ -19,28 +19,25 @@ apps = Dir['./apps/*.ru'].each_with_object({}) do |config, hash|
 end
 apps.freeze
 
+bench = lambda do |app|
+  examples.each do |example|
+    env, expected_status = example
+    100.times { app.call(env) }
+    response = app.call(env)
+    raise unless response[0] == expected_status
+  end
+end
+
 Benchmark.ips do |x|
   apps.each do |config, app|
-    x.report(config) do
-      examples.each do |example|
-        env, expected_status = example
-        response = app.call(env)
-        raise unless response[0] == expected_status
-      end
-    end
+    x.report(config) { bench.call(app) }
   end
   x.compare!
 end
 
 Benchmark.memory do |x|
   apps.each do |config, app|
-    x.report(config) do
-      examples.each do |example|
-        env, expected_status = example
-        response = app.call(env)
-        raise unless response[0] == expected_status
-      end
-    end
+    x.report(config) { bench.call(app) }
   end
   x.compare!
 end

data/lib/openapi_first.rb

@@ -25,10 +25,9 @@ module OpenapiFirst
 
   def self.load(spec_path, only: nil)
     content = YAML.load_file(spec_path)
-    raw = OasParser::Parser.new(spec_path, content).resolve
-    raw['paths'].filter!(&->(key, _) { only.call(key) }) if only
-    parsed = OasParser::Definition.new(raw, spec_path)
-    Definition.new(parsed)
+    resolved = OasParser::Parser.new(spec_path, content).resolve
+    resolved['paths'].filter!(&->(key, _) { only.call(key) }) if only
+    Definition.new(resolved, spec_path)
   end
 
   def self.app(
@@ -78,11 +77,17 @@ module OpenapiFirst
   end
 
   class Error < StandardError; end
+
   class NotFoundError < Error; end
+
   class NotImplementedError < RuntimeError; end
+
   class ResponseInvalid < Error; end
+
   class ResponseCodeNotFoundError < ResponseInvalid; end
+
   class ResponseContentTypeNotFoundError < ResponseInvalid; end
+
   class ResponseBodyInvalidError < ResponseInvalid; end
 
   class RequestInvalidError < Error

data/lib/openapi_first/app.rb

@@ -11,17 +11,15 @@ module OpenapiFirst
       namespace:,
       router_raise_error: false,
       request_validation_raise_error: false,
-      response_validation: false
+      response_validation: false,
+      resolver: nil
     )
       @stack = Rack::Builder.app do
         freeze_app
         use OpenapiFirst::Router, spec: spec, raise_error: router_raise_error, parent_app: parent_app
         use OpenapiFirst::RequestValidation, raise_error: request_validation_raise_error
         use OpenapiFirst::ResponseValidation if response_validation
-        run OpenapiFirst::Responder.new(
-          spec: spec,
-          namespace: namespace
-        )
+        run OpenapiFirst::Responder.new(namespace: namespace, resolver: resolver)
       end
     end
 

data/lib/openapi_first/{find_handler.rb → default_operation_resolver.rb}

@@ -3,20 +3,14 @@
 require_relative 'utils'
 
 module OpenapiFirst
-  class FindHandler
-    def initialize(spec, namespace)
+  class DefaultOperationResolver
+    def initialize(namespace)
       @namespace = namespace
-      @handlers = spec.operations.each_with_object({}) do |operation, hash|
-        operation_id = operation.operation_id
-        handler = find_handler(operation_id)
-        next if handler.nil?
-
-        hash[operation_id] = handler
-      end
+      @handlers = {}
     end
 
-    def [](operation_id)
-      @handlers[operation_id]
+    def call(operation)
+      @handlers[operation.name] ||= find_handler(operation['x-handler'] || operation['operationId'])
     end
 
     def find_handler(operation_id)

data/lib/openapi_first/definition.rb

@@ -6,9 +6,14 @@ module OpenapiFirst
   class Definition
     attr_reader :filepath, :operations
 
-    def initialize(parsed)
-      @filepath = parsed.path
-      @operations = parsed.endpoints.map { |e| Operation.new(e) }
+    def initialize(resolved, filepath)
+      @filepath = filepath
+      methods = %w[get head post put patch delete trace options]
+      @operations = resolved['paths'].flat_map do |path, path_item|
+        path_item.slice(*methods).map do |request_method, _operation_object|
+          Operation.new(path, request_method, path_item)
+        end
+      end
     end
   end
 end

data/lib/openapi_first/operation.rb

@@ -7,23 +7,25 @@ require_relative 'utils'
 require_relative 'response_object'
 
 module OpenapiFirst
-  class Operation
+  class Operation # rubocop:disable Metrics/ClassLength
     extend Forwardable
-    def_delegators :@operation,
-                   :parameters,
-                   :method,
-                   :request_body,
-                   :operation_id
+    def_delegators :operation_object,
+                   :[],
+                   :dig
 
     WRITE_METHODS = Set.new(%w[post put patch delete]).freeze
     private_constant :WRITE_METHODS
 
-    def initialize(parsed)
-      @operation = parsed
+    attr_reader :path, :method
+
+    def initialize(path, request_method, path_item_object)
+      @path = path
+      @method = request_method
+      @path_item_object = path_item_object
     end
 
-    def path
-      @operation.path.path
+    def operation_id
+      operation_object['operationId']
     end
 
     def read?
@@ -34,6 +36,10 @@ module OpenapiFirst
       WRITE_METHODS.include?(method)
     end
 
+    def request_body
+      operation_object['requestBody']
+    end
+
     def parameters_schema
       @parameters_schema ||= begin
         parameters_json_schema = build_parameters_json_schema
@@ -53,6 +59,7 @@ module OpenapiFirst
       raise ResponseInvalid, "Response has no content-type for '#{name}'" unless content_type
 
       media_type = find_content_for_content_type(content, content_type)
+
       unless media_type
         message = "Response content type not found '#{content_type}' for '#{name}'"
         raise ResponseContentTypeNotFoundError, message
@@ -62,7 +69,7 @@ module OpenapiFirst
     end
 
     def request_body_schema(request_content_type)
-      content = @operation.request_body.content
+      content = operation_object.dig('requestBody', 'content')
       media_type = find_content_for_content_type(content, request_content_type)
       schema = media_type&.fetch('schema', nil)
       return unless schema
@@ -71,8 +78,9 @@ module OpenapiFirst
     end
 
     def response_for(status)
-      @operation.response_by_code(status.to_s, use_default: true).raw
-    rescue OasParser::ResponseCodeNotFound
+      response_content = response_by_code(status)
+      return response_content if response_content
+
       message = "Response status code or default not found: #{status} for '#{name}'"
       raise OpenapiFirst::ResponseCodeNotFoundError, message
     end
@@ -83,6 +91,15 @@ module OpenapiFirst
 
     private
 
+    def response_by_code(status)
+      operation_object.dig('responses', status.to_s) ||
+        operation_object.dig('responses', 'default')
+    end
+
+    def operation_object
+      @path_item_object[method]
+    end
+
     def find_content_for_content_type(content, request_content_type)
       content.fetch(request_content_type) do |_|
         type = request_content_type.split(';')[0]
@@ -91,24 +108,32 @@ module OpenapiFirst
     end
 
     def build_parameters_json_schema
-      return unless @operation.parameters&.any?
+      parameters = all_parameters
+      return unless parameters&.any?
 
-      @operation.parameters.each_with_object(new_node) do |parameter, schema|
-        params = Rack::Utils.parse_nested_query(parameter.name)
+      parameters.each_with_object(new_node) do |parameter, schema|
+        params = Rack::Utils.parse_nested_query(parameter['name'])
         generate_schema(schema, params, parameter)
       end
     end
 
+    def all_parameters
+      parameters = @path_item_object['parameters'] || []
+      parameters_on_operation = operation_object['parameters']
+      parameters.concat(parameters_on_operation) if parameters_on_operation
+      parameters
+    end
+
     def generate_schema(schema, params, parameter)
       required = Set.new(schema['required'])
       params.each do |key, value|
-        required << key if parameter.required
+        required << key if parameter['required']
         if value.is_a? Hash
           property_schema = new_node
           generate_schema(property_schema, value, parameter)
           Utils.deep_merge!(schema['properties'], { key => property_schema })
         else
-          schema['properties'][key] = parameter.schema
+          schema['properties'][key] = parameter['schema']
         end
       end
       schema['required'] = required.to_a

data/lib/openapi_first/request_validation.rb

@@ -63,13 +63,13 @@ module OpenapiFirst
     end
 
     def validate_request_content_type!(content_type, operation)
-      return if operation.request_body.content[content_type]
+      return if operation.request_body.dig('content', content_type)
 
       halt_with_error(415)
     end
 
     def validate_request_body_presence!(body, operation)
-      return unless operation.request_body.required && body.empty?
+      return unless operation.request_body['required'] && body.empty?
 
       halt_with_error(415, 'Request body is required')
     end

data/lib/openapi_first/responder.rb

@@ -2,12 +2,12 @@
 
 require 'rack'
 require_relative 'inbox'
-require_relative 'find_handler'
+require_relative 'default_operation_resolver'
 
 module OpenapiFirst
   class Responder
-    def initialize(spec:, namespace:, resolver: FindHandler.new(spec, namespace))
-      @resolver = resolver
+    def initialize(namespace: nil, resolver: nil)
+      @resolver = resolver || DefaultOperationResolver.new(namespace)
       @namespace = namespace
     end
 
@@ -24,7 +24,7 @@ module OpenapiFirst
     private
 
     def find_handler(operation)
-      handler = @resolver[operation.operation_id]
+      handler = @resolver.call(operation)
       raise NotImplementedError, "Could not find handler for #{operation.name}" unless handler
 
       handler

data/lib/openapi_first/router.rb

@@ -40,7 +40,10 @@ module OpenapiFirst
 
     def raise_error(env)
       req = Rack::Request.new(env)
-      msg = "Could not find definition for #{req.request_method} '#{req.path}' in API description #{@filepath}"
+      msg =
+        "Could not find definition for #{req.request_method} '#{
+          req.path
+        }' in API description #{@filepath}"
       raise NotFoundError, msg
     end
 
@@ -54,7 +57,7 @@ module OpenapiFirst
     end
 
     def build_router(operations) # rubocop:disable Metrics/AbcSize
-      router = Hanami::Router.new {}
+      router = Hanami::Router.new
       operations.each do |operation|
         normalized_path = operation.path.gsub('{', ':').gsub('}', '')
         if operation.operation_id.nil?

data/lib/openapi_first/validation_format.rb

@@ -19,6 +19,11 @@ module OpenapiFirst
           title: "has not a valid #{error.dig('schema', 'format')} format",
           detail: "#{error['data'].inspect} is not a valid #{error.dig('schema', 'format')} format"
         }
+      elsif error['type'] == 'enum'
+        {
+          title: "value #{error['data'].inspect} is not defined in enum",
+          detail: "value can be one of #{error.dig('schema', 'enum')&.join(', ')}"
+        }
       elsif error['type'] == 'required'
         missing_keys = error['details']['missing_keys']
         {

data/lib/openapi_first/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiFirst
-  VERSION = '0.13.3'
+  VERSION = '0.14.0'
 end

data/openapi_first.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
     spec.metadata['changelog_uri'] = 'https://github.com/ahx/openapi_first/blob/master/CHANGELOG.md'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - Andreas Haller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -203,8 +203,8 @@ files:
 - lib/openapi_first.rb
 - lib/openapi_first/app.rb
 - lib/openapi_first/coverage.rb
+- lib/openapi_first/default_operation_resolver.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/request_validation.rb
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Implement REST APIs based on OpenApi.