openapi_first 3.4.1 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a078c6bc5ab1617e9dd79545146b3ef7a0f28dbf5d9550819907e8e36c5b1b
-  data.tar.gz: 4478e189440cf7915416eb10b61b8a62e7a7465ffd62d64bf9663b2fab1fafde
+  metadata.gz: aa35ee9098e786a73c8d0de102d691cb0f5cec972e60e9a8d96d439f63eef872
+  data.tar.gz: b6f8461c433753a49563055b4fd3156cbbacf0c89d5f7e2f2a7f1366c2c3b32c
 SHA512:
-  metadata.gz: ebee301cf2048cabd799f604073b34691434a55ee2f0787428588c33c4bc9ee49d551e7eee761641bfc61ac724e68f4e7774e6c25eb073aab6bdbcbf2ddd4f10
-  data.tar.gz: 53b1e8f5776ba5dfd41be46f9651e76e64a54ae849984a1b93980c7ab9da3353140fefb8ed4399679098f14d631d17ff30ab66cb7f4f9c7315308018aa727533
+  metadata.gz: 2146d351211ebc10237dd8f6d30381d15d99ac15bf0cfa05a9095b6f493738b48c4e406b0d359fcc6f11c9910702b0e3ad4003b6513d32cd2390c81a356fd21b
+  data.tar.gz: 2235965c286c2d182a77b491422c18a25010f69c0e91e87e50731334aa5515fdbe3cd06d03a4a509c3f07b07f1405a928b50a6b037ed022fc0dd3b60e8bf1be9

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 3.4.3
+
+Fixed: Loading a document no longer raises `NoMethodError: undefined method 'schema' for nil` when a Media Type Object has no `schema` (e.g. it only declares an `example`). `schema` is optional in a Media Type Object; such media types now impose no body-schema constraint.
+
+## 3.4.2
+
+Fixed: Parsing of JSON-formatted query params [issue #476](https://github.com/ahx/openapi_first/issues/476) (thanks @Drowze)
+
 ## 3.4.1
 
 Fixed: Added missing ERB and css file to the gem

data/lib/openapi_first/builder.rb

@@ -110,7 +110,8 @@ module OpenapiFirst
     def resolve_parameters(parameters)
       parameters&.map do |parameter|
         result = parameter.resolved
-        result['schema'] = parameter['schema'].resolved
+        _media_type, media_type_object = parameter['content']&.first
+        result['schema'] = (media_type_object || parameter)['schema'].resolved
         result
       end.to_a
     end
@@ -139,7 +140,7 @@ module OpenapiFirst
       end
       required_body = operation_object['requestBody']&.resolved&.fetch('required', false) == true
       content_objects.map do |content_type, content_object|
-        content_schema = content_object['schema'].schema(
+        content_schema = content_object['schema']&.schema(
           configuration: schemer_configuration,
           after_property_validation: config.after_request_body_property_validation
         )
@@ -170,7 +171,7 @@ module OpenapiFirst
       responses.flat_map do |status, response_object|
         headers = build_response_headers(response_object['headers'])
         response_object['content']&.map do |content_type, content_object|
-          content_schema = content_object['schema'].schema(
+          content_schema = content_object['schema']&.schema(
             configuration: schemer_configuration,
             after_property_validation: config.after_response_body_property_validation
           )

data/lib/openapi_first/request.rb

@@ -54,9 +54,6 @@ module OpenapiFirst
       @operation['operationId']
     end
 
-    MULTIPART_CONTENT_TYPE = %r{\Amultipart/form-data\b}i
-    private_constant :MULTIPART_CONTENT_TYPE
-
     private
 
     def parse_request(request, route_params:)
@@ -82,11 +79,7 @@ module OpenapiFirst
     end
 
     def build_body_parser(content_type, encoding)
-      if content_type.match?(MULTIPART_CONTENT_TYPE)
-        RequestBodyParsers::MultipartBodyParser.new(encoding: encoding || {})
-      else
-        RequestBodyParsers[content_type]
-      end
+      RequestBodyParsers[content_type, { encoding: encoding || {} }]
     end
   end
 end

data/lib/openapi_first/request_body_parsers.rb

@@ -14,9 +14,12 @@ module OpenapiFirst
         parsers[pattern] = parser
       end
 
-      def [](content_type)
+      def [](content_type, options = {})
         key = parsers.keys.find { content_type.match?(_1) }
-        parsers.fetch(key) { DEFAULT }
+        parser = parsers.fetch(key) { DEFAULT }
+        return parser.new(options) if parser.is_a?(Class)
+
+        parser
       end
     end
 
@@ -44,12 +47,8 @@ module OpenapiFirst
     # `contentType: application/json` (or any */json), the field's raw value
     # is JSON-parsed before schema validation.
     class MultipartBodyParser
-      def initialize(encoding: {})
-        @encoding = encoding || {}
-      end
-
-      def self.call(request)
-        new.call(request)
+      def initialize(options)
+        @encoding = options[:encoding] || {}
       end
 
       def call(request)
@@ -89,7 +88,7 @@ module OpenapiFirst
       end
     end
 
-    register('multipart/form-data', MultipartBodyParser)
+    register(%r{\Amultipart/form-data\b}i, MultipartBodyParser)
 
     register('application/x-www-form-urlencoded', lambda(&:POST))
   end

data/lib/openapi_first/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.3
 platform: ruby
 authors:
 - Andreas Haller