Correct handling of minimum and maximum of schema

This fixes an error in OpenAPI 3.0 schema handling where minimum and
maximum were flagged as integers when actually they are numeric.

It then corrects the configuration of exclusiveMaximum and
exclusiveMinimum for OpenAPI 3.1 where JSON Schema 2021 [1] defines
these as numeric values compared to the boolean values they held in
OpenAPI 3.0 (via JSON Schema 2017 [2]).

[1]: https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-validation-00#section-6.2.3
[2]: https://datatracker.ietf.org/doc/html/draft-wright-json-schema-validation-00#section-5.3

Author: kevindew

json-schema-for-3.1.md

@@ -44,9 +44,9 @@ enum: array - in 3.0
 const: any type - done
 multipleOf: number - in 3.0
 maximum: number - in 3.0
-exclusiveMaximum: number - in 3.0
+exclusiveMaximum: number - done
 minimum: number - in 3.0
-exclusiveMinimum: number - in 3.0
+exclusiveMinimum: number - done
 maxLength: integer >= 0 - in 3.0 (missing >= val)
 minLength: integer >= 0 - in 3.0
 pattern: string - in 3.0

lib/openapi3_parser/node/schema.rb

@@ -50,26 +50,16 @@ def multiple_of
         self["multipleOf"]
       end
 
-      # @return [Integer, nil]
+      # @return [Numeric, nil]
       def maximum
         self["maximum"]
       end
 
-      # @return [Boolean]
-      def exclusive_maximum?
-        self["exclusiveMaximum"]
-      end
-
-      # @return [Integer, nil]
+      # @return [Numeric, nil]
       def minimum
         self["minimum"]
       end
 
-      # @return [Boolean]
-      def exclusive_minimum?
-        self["exclusiveMinimum"]
-      end
-
       # @return [Integer, nil]
       def max_length
         self["maxLength"]

lib/openapi3_parser/node/schema/v3_0.rb

@@ -11,6 +11,16 @@ class V3_0 < Schema # rubocop:disable Naming/ClassAndModuleCamelCase
         def type
           self["type"]
         end
+
+        # @return [Boolean]
+        def exclusive_maximum?
+          self["exclusiveMaximum"]
+        end
+
+        # @return [Boolean]
+        def exclusive_minimum?
+          self["exclusiveMinimum"]
+        end
       end
     end
   end

lib/openapi3_parser/node/schema/v3_1.rb

@@ -25,6 +25,16 @@ def const
           self["const"]
         end
 
+        # @return [Numeric]
+        def exclusive_maximum
+          self["exclusiveMaximum"]
+        end
+
+        # @return [Numeric]
+        def exclusive_minimum
+          self["exclusiveMinimum"]
+        end
+
         # @return [Integer, nil]
         def max_contains
           self["maxContains"]

lib/openapi3_parser/node_factory/schema/common.rb

@@ -14,10 +14,8 @@ def self.included(base)
           base.field "title", input_type: String
 
           base.field "multipleOf", input_type: Numeric
-          base.field "maximum", input_type: Integer
-          base.field "exclusiveMaximum", input_type: :boolean, default: false
-          base.field "minimum", input_type: Integer
-          base.field "exclusiveMinimum", input_type: :boolean, default: false
+          base.field "maximum", input_type: Numeric
+          base.field "minimum", input_type: Numeric
           base.field "maxLength", input_type: Integer
           base.field "minLength", input_type: Integer, default: 0
           base.field "pattern", input_type: String

lib/openapi3_parser/node_factory/schema/v3_0.rb

@@ -12,6 +12,11 @@ class V3_0 < NodeFactory::Object # rubocop:disable Naming/ClassAndModuleCamelCas
         # OpenAPI 3.0 requires a type of String, whereas >= 3.1 is String or Array
         field "type", input_type: String
 
+        # JSON Schema 2016 has these exclusive fields as booleans whereas
+        # in JSON Schema 2021 (OpenAPI 3.1) these are numbers
+        field "exclusiveMaximum", input_type: :boolean, default: false
+        field "exclusiveMinimum", input_type: :boolean, default: false
+
         validate :items_for_array
 
         def build_node(data, node_context)

lib/openapi3_parser/node_factory/schema/v3_1.rb

@@ -20,6 +20,8 @@ class V3_1 < NodeFactory::Object # rubocop:disable Naming/ClassAndModuleCamelCas
         field "$ref", input_type: String, factory: :ref_factory
         field "type", factory: :type_factory, validate: :validate_type
         field "const"
+        field "exclusiveMaximum", input_type: Numeric
+        field "exclusiveMinimum", input_type: Numeric
         field "maxContains", input_type: Integer
         field "minContains", input_type: Integer, default: 1
         # dependentRequired - map with basic validation rules

spec/support/examples/v3.1/changes.yaml

@@ -79,13 +79,13 @@ components:
                 type: string
               exp:
                 type: string
-    # Number:
-    #   type: integer
-    #   multipleOf: 5
-    #   maximum: 110
-    #   exclusiveMaximum: 111
-    #   minimum: 10
-    #   exclusiveMinimum: 9
+    Number:
+      type: integer
+      multipleOf: 5
+      maximum: 110
+      exclusiveMaximum: 111
+      minimum: 10
+      exclusiveMinimum: 9
     String:
       type: string
       maxLength: 10