openapi_first 0.12.0 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03752095ad50ff4a6142b3f716f00aba532191a12f700227eca0d2d3c9c7a6b1'
-  data.tar.gz: 7c0271d081181b18999ce75dc72ee9fa4677eb18fc0ee02ed1a40505da9aa072
+  metadata.gz: e8692df035f2c27738cc74a8265ad45f6235397c0ce35059fdeef29ef54402ba
+  data.tar.gz: 156a0c22674e9eed4b2a7ffdfff1cde726b721bf63e8cede6c0d006442c72890
 SHA512:
-  metadata.gz: f7a2454ed16c69e7d0b32f610ed985640735bba36a1e28798319b501f3f1eb80bb14b8329c8794f0dd87e3d38db037210319e3e25f82b1b5e0110f63c24ea4d3
-  data.tar.gz: 479eedd62e341f834ed258504d2699a94cfa924301ae85a016d075c56df870041e3b0504829bbce456694e138f7598129c20684731257ff6be23d5dba4b9b2f8
+  metadata.gz: 7f4bedb9b730bb1c27a29d04fe7b915f2e61b0ac6305d6faccb52fd7baa962356704ce0ec85c192f36b9bb5ba9323d29cefa014d287c564fc48dcdaa8bd953a1
+  data.tar.gz: 9341ba6927183ad541b0b5d3dbc4096112a74204ce14abd1b2c72bfa339c757853f93041f80df85aa51d83377380d9ba034ce260885a5ddbbc64cb769e177d16

data/.rubocop.yml

@@ -14,6 +14,8 @@ Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true
+Lint/DuplicateElsifCondition:
+  Enabled: true
 Lint/RaiseException:
   Enabled: true
 Lint/MixedRegexpCaptureTypes:
@@ -28,7 +30,25 @@ Lint/StructNewOverride:
   Enabled: true
 Style/HashEachMethods:
   Enabled: false
+Style/AccessorGrouping:
+  Enabled: true
+Style/ArrayCoercion:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
+Style/CaseLikeIf:
+  Enabled: true
+Style/HashAsLastArrayItem:
+  Enabled: true
+Style/HashLikeCase:
+  Enabled: true
 Style/HashTransformKeys:
   Enabled: true
 Style/HashTransformValues:
   Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantFileExtensionInRequire:
+  Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.12.5
+- Add `not_found: :continue` option to Router to make it do nothing if request is unknown
+
+## 0.12.4
+- content-type is found while ignoring additional content-type parameters (`application/json` is found when request/response content-type is `application/json; charset=UTF8`)
+- Support wildcard mime-types when finding the content-type
+
+## 0.12.3
+- Add `response_validation:`, `router_raise_error` options to standalone mode.
+
+## 0.12.2
+- Allow response to have no media type object specified
+
+## 0.12.1
+- Fix response when handler returns 404 or 405
+- Don't validate the response content if status is 205 (no content)
+
 ## 0.12.0
 - Change `ResponseValidator` to raise an exception if it found a problem
 - Params have symbolized keys now

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openapi_first (0.12.0)
+    openapi_first (0.12.5)
       deep_merge (>= 1.2.1)
       hanami-router (~> 2.0.alpha3)
       hanami-utils (~> 2.0.alpha1)
@@ -13,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -24,9 +24,9 @@ GEM
     ast (2.4.1)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     deep_merge (1.2.1)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     ecma-re-validator (0.2.1)
       regexp_parser (~> 1.2)
     hana (1.3.6)
@@ -39,9 +39,9 @@ GEM
       transproc (~> 1.0)
     hansi (0.2.0)
     hash-deep-merge (0.1.1)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json_schemer (0.2.11)
+    json_schemer (0.2.13)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -49,13 +49,13 @@ GEM
     method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
-    multi_json (1.14.1)
+    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.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     oas_parser (0.25.1)
       activesupport (>= 4.0.0)
@@ -65,14 +65,14 @@ GEM
       hash-deep-merge
       mustermann-contrib (~> 1.1.1)
       nokogiri
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.5)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
@@ -92,16 +92,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.85.1)
+    rubocop (0.88.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
+    rubocop-ast (0.2.0)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
@@ -111,7 +111,7 @@ GEM
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
     uri_template (0.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -37,6 +37,7 @@ Options and their defaults:
 |:---|---|---|---|
 |`spec:`| | The spec loaded via `OpenapiFirst.load` ||
 | `raise_error:` |`false`, `true` | If set to true the middleware raises `OpenapiFirst::NotFoundError` when a path or method was not found in the API description. This is useful during testing to spot an incomplete API description. | `false` (don't raise an exception)
+| `not_found:` | `:continue`, `:halt`| If set to `:continue` the middleware will not return 404 (405, 415), but just pass handling the request to the next middleware or application in the Rack stack. If combined with `raise_error: true` `raise_error` gets preference and an exception is raised. | `:halt` (return 4xx response)
 
 ## OpenapiFirst::RequestValidation
 
@@ -150,7 +151,12 @@ end
 
 # In config.ru:
 require 'openapi_first'
-run OpenapiFirst.app('./openapi/openapi.yaml', namespace: Pets)
+run OpenapiFirst.app(
+  './openapi/openapi.yaml',
+  namespace: Pets,
+  response_validation: ENV['RACK_ENV'] == 'test',
+  router_raise_error:  ENV['RACK_ENV'] == 'test'
+)
 ```
 
 The above will use the mentioned Rack middlewares to:
@@ -159,6 +165,17 @@ 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:
+
+| Name | Possible values | Description | Default
+|:---|---|---|---|
+| `spec_path` || A filepath to an OpenAPI definition file. |
+| `namespace:` || A class or module where to find the handler methods.|
+| `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`
+
+
 Handler functions (`find_pet`) are called with two arguments:
 
 - `params` - Holds the parsed request body, filtered query params and path parameters

data/benchmarks/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    openapi_first (0.12.0)
+    openapi_first (0.12.5)
       deep_merge (>= 1.2.1)
       hanami-router (~> 2.0.alpha3)
       hanami-utils (~> 2.0.alpha1)
@@ -13,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -25,13 +25,13 @@ GEM
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
     builder (3.2.4)
-    committee (4.0.0)
+    committee (4.1.0)
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (>= 0.11.1)
       rack (>= 1.5)
     concurrent-ruby (1.1.6)
     deep_merge (1.2.1)
-    dry-configurable (0.11.5)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -55,7 +55,7 @@ GEM
       dry-logic (~> 1.0, >= 1.0.2)
     ecma-re-validator (0.2.1)
       regexp_parser (~> 1.2)
-    grape (1.3.3)
+    grape (1.4.0)
       activesupport
       builder
       dry-types (>= 1.1)
@@ -72,10 +72,10 @@ GEM
       transproc (~> 1.0)
     hansi (0.2.0)
     hash-deep-merge (0.1.1)
-    i18n (1.8.3)
+    i18n (1.8.4)
       concurrent-ruby (~> 1.0)
-    json_schema (0.20.8)
-    json_schemer (0.2.11)
+    json_schema (0.20.9)
+    json_schemer (0.2.13)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -83,7 +83,7 @@ GEM
     memory_profiler (0.9.14)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-contrib (1.1.1)
@@ -91,7 +91,7 @@ GEM
       mustermann (= 1.1.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     oas_parser (0.25.1)
       activesupport (>= 4.0.0)
@@ -103,7 +103,7 @@ GEM
       nokogiri
     openapi_parser (0.11.2)
     public_suffix (4.0.5)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-protection (2.0.8.1)
@@ -125,7 +125,7 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uri_template (0.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/examples/app.rb

@@ -17,5 +17,6 @@ oas_path = File.absolute_path('./openapi.yaml', __dir__)
 App = OpenapiFirst.app(
   oas_path,
   namespace: Web,
-  raise_error: OpenapiFirst.env == 'test'
+  router_raise_error: OpenapiFirst.env == 'test',
+  response_validation: OpenapiFirst.env == 'test'
 )

data/lib/openapi_first.rb

@@ -31,14 +31,39 @@ module OpenapiFirst
     Definition.new(parsed)
   end
 
-  def self.app(spec, namespace:, raise_error: false)
+  def self.app(
+    spec,
+    namespace:,
+    router_raise_error: false,
+    request_validation_raise_error: false,
+    response_validation: false
+  )
     spec = OpenapiFirst.load(spec) if spec.is_a?(String)
-    App.new(nil, spec, namespace: namespace, raise_error: raise_error)
+    App.new(
+      nil,
+      spec,
+      namespace: namespace,
+      router_raise_error: router_raise_error,
+      request_validation_raise_error: request_validation_raise_error,
+      response_validation: response_validation
+    )
   end
 
-  def self.middleware(spec, namespace:, raise_error: false)
+  def self.middleware(
+    spec,
+    namespace:,
+    router_raise_error: false,
+    request_validation_raise_error: false,
+    response_validation: false
+  )
     spec = OpenapiFirst.load(spec) if spec.is_a?(String)
-    AppWithOptions.new(spec, namespace: namespace, raise_error: raise_error)
+    AppWithOptions.new(
+      spec,
+      namespace: namespace,
+      router_raise_error: router_raise_error,
+      request_validation_raise_error: request_validation_raise_error,
+      response_validation: response_validation
+    )
   end
 
   class AppWithOptions

data/lib/openapi_first/app.rb

@@ -5,12 +5,19 @@ require 'logger'
 
 module OpenapiFirst
   class App
-    def initialize(parent_app, spec, namespace:, raise_error:)
+    def initialize( # rubocop:disable Metrics/ParameterLists
+      parent_app,
+      spec,
+      namespace:,
+      router_raise_error: false,
+      request_validation_raise_error: false,
+      response_validation: false
+    )
       @stack = Rack::Builder.app do
         freeze_app
-        use OpenapiFirst::Router, spec: spec, raise_error: raise_error, parent_app: parent_app
-        use OpenapiFirst::RequestValidation, raise_error: raise_error
-        use OpenapiFirst::ResponseValidation if raise_error
+        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

data/lib/openapi_first/operation.rb

@@ -39,7 +39,9 @@ module OpenapiFirst
       content = response_for(status)['content']
       return if content.nil? || content.empty?
 
-      media_type = content[content_type]
+      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
@@ -47,6 +49,12 @@ module OpenapiFirst
       media_type['schema']
     end
 
+    def request_body_schema_for(request_content_type)
+      content = @operation.request_body.content
+      media_type = find_content_for_content_type(content, request_content_type)
+      media_type&.fetch('schema', nil)
+    end
+
     def response_for(status)
       @operation.response_by_code(status.to_s, use_default: true).raw
     rescue OasParser::ResponseCodeNotFound
@@ -60,6 +68,13 @@ module OpenapiFirst
 
     private
 
+    def find_content_for_content_type(content, request_content_type)
+      content.fetch(request_content_type) do |_|
+        type = request_content_type.split(';')[0]
+        content[type] || content["#{type.split('/')[0]}/*"] || content['*/*']
+      end
+    end
+
     def build_parameters_json_schema
       return unless @operation.parameters&.any?
 

data/lib/openapi_first/request_validation.rb

@@ -98,7 +98,8 @@ module OpenapiFirst
     def request_body_schema(content_type, operation)
       return unless operation
 
-      schema = operation.request_body.content[content_type]&.fetch('schema')
+      schema = operation.request_body_schema_for(content_type)
+
       JSONSchemer.schema(schema) if schema
     end
 

data/lib/openapi_first/response_validation.rb

@@ -24,15 +24,19 @@ module OpenapiFirst
 
     def validate(response, operation)
       status, headers, body = response.to_a
-      content_type = headers[Rack::CONTENT_TYPE]
-      raise ResponseInvalid, "Response has no content-type for '#{operation.name}'" unless content_type
+      return validate_status_only(operation, status) if status == 204
 
+      content_type = headers[Rack::CONTENT_TYPE]
       response_schema = operation.response_schema_for(status, content_type)
       validate_response_body(response_schema, body) if response_schema
     end
 
     private
 
+    def validate_status_only(operation, status)
+      operation.response_for(status)
+    end
+
     def validate_response_body(schema, response)
       full_body = +''
       response.each { |chunk| full_body << chunk }

data/lib/openapi_first/router.rb

@@ -10,11 +10,13 @@ module OpenapiFirst
       app,
       spec:,
       raise_error: false,
+      not_found: :halt,
       parent_app: nil
     )
       @app = app
       @parent_app = parent_app
       @raise = raise_error
+      @not_found = not_found
       @filepath = spec.filepath
       @router = build_router(spec.operations)
     end
@@ -22,16 +24,16 @@ module OpenapiFirst
     def call(env)
       env[OPERATION] = nil
       response = call_router(env)
-      status = response[0]
-      if UNKNOWN_ROUTE_STATUS.include?(status)
-        return @parent_app.call(env) if @parent_app # This should only happen if used via OpenapiFirst.middlware
+      if env[OPERATION].nil?
+        return @parent_app.call(env) if @parent_app # This should only happen if used via OpenapiFirst.middleware
 
         raise_error(env) if @raise
+
+        return @app.call(env) if @not_found == :continue
       end
       response
     end
 
-    UNKNOWN_ROUTE_STATUS = [404, 405].freeze
     ORIGINAL_PATH = 'openapi_first.path_info'
 
     private

data/lib/openapi_first/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.5
 platform: ruby
 authors:
 - Andreas Haller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge