openapi_parser 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 356ab2602b24fbfed684e6b190a057e504905f9f3d988d37bf4451aa660b5b60
-  data.tar.gz: 8aa7530f3bdbcb15de4d705af5eb8e8152e3f15425ae3c17bacaed1faa5654f0
+  metadata.gz: c0a5e0fc6c25502d4dab97d5fff4956daa05f5e543302328c394655f34a575ba
+  data.tar.gz: 7497efbb3bfe8921c34570614b653930c2e122e24f9ecbc57d86b4e766b29a2b
 SHA512:
-  metadata.gz: dfab290ea662aa9a4384252f8529ac7d0e0d205aa681cc4112f9bbf9223a0c49806f555080a8b6db8acd1bcdf2eb7ef24b50e931ed4a5dd4261d8de3ac81aecc
-  data.tar.gz: fa80f1e7a495b13199e860c7869fe0507174097e10ab3eaa3710d39e8d38724ae5e397b395bed63a16ef0031594fc0d5439e455526d5b62eda480ba44a3c8a30
+  metadata.gz: c97aa5cbdaade862ecb079cf8c89767c4cfadb0c81a591735892a4a2ba3f61955c1d41f10fddff8d1069f64e2d79eca5098267b64145f861e54ae979c4b58a5a
+  data.tar.gz: 06c3c526614c98ec489fa1d87237d44d428a9031bbd8fa405aa77d144226dcc2c6a03b44421a10edc94d049cde6e56fcb2cf8602a789f0a12bec3606f0c2776c

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Unreleased
 
+## 0.4.0 (2019-07-27)
+* Add minimum and maximum checks for `integer` and `number` data types (#43)
+
 ## 0.3.1 (2019-06-04)
 * Add additionalProperties default value (#40)
 

data/lib/openapi_parser/errors.rb

@@ -110,6 +110,50 @@ module OpenAPIParser
     end
   end
 
+  class LessThanMinimum < OpenAPIError
+    def initialize(value, reference)
+      super(reference)
+      @value = value
+    end
+
+    def message
+      "#{@value} cannot be less than minimum value in #{@reference}"
+    end
+  end
+
+  class LessThanExclusiveMinimum < OpenAPIError
+    def initialize(value, reference)
+      super(reference)
+      @value = value
+    end
+
+    def message
+      "#{@value} cannot be less than or equal to exclusive minimum value in #{@reference}"
+    end
+  end
+
+  class MoreThanMaximum < OpenAPIError
+    def initialize(value, reference)
+      super(reference)
+      @value = value
+    end
+
+    def message
+      "#{@value} cannot be more than maximum value in #{@reference}"
+    end
+  end
+
+  class MoreThanExclusiveMaximum < OpenAPIError
+    def initialize(value, reference)
+      super(reference)
+      @value = value
+    end
+
+    def message
+      "#{@value} cannot be more than or equal to exclusive maximum value in #{@reference}"
+    end
+  end
+
   class InvalidPattern < OpenAPIError
     def initialize(value, pattern, reference)
       super(reference)

data/lib/openapi_parser/schema_validator.rb

@@ -1,5 +1,6 @@
 require_relative 'schema_validators/options'
 require_relative 'schema_validators/enumable'
+require_relative 'schema_validators/minimum_maximum'
 require_relative 'schema_validators/base'
 require_relative 'schema_validators/string_validator'
 require_relative 'schema_validators/integer_validator'

data/lib/openapi_parser/schema_validators/float_validator.rb

@@ -1,6 +1,7 @@
 class OpenAPIParser::SchemaValidator
   class FloatValidator < Base
     include ::OpenAPIParser::SchemaValidator::Enumable
+    include ::OpenAPIParser::SchemaValidator::MinimumMaximum
 
     # validate float value by schema
     # @param [Object] value
@@ -18,7 +19,10 @@ class OpenAPIParser::SchemaValidator
       def coercer_and_validate_numeric(value, schema)
         return OpenAPIParser::ValidateError.build_error_result(value, schema) unless value.kind_of?(Numeric)
 
-        check_enum_include(value, schema)
+        value, err = check_enum_include(value, schema)
+        return [nil, err] if err
+        
+        check_minimum_maximum(value, schema)
       end
 
       def coerce(value)

data/lib/openapi_parser/schema_validators/integer_validator.rb

@@ -1,6 +1,7 @@
 class OpenAPIParser::SchemaValidator
   class IntegerValidator < Base
     include ::OpenAPIParser::SchemaValidator::Enumable
+    include ::OpenAPIParser::SchemaValidator::MinimumMaximum
 
     # validate integer value by schema
     # @param [Object] value
@@ -10,7 +11,10 @@ class OpenAPIParser::SchemaValidator
 
       return OpenAPIParser::ValidateError.build_error_result(value, schema) unless value.kind_of?(Integer)
 
-      check_enum_include(value, schema)
+      value, err = check_enum_include(value, schema)
+      return [nil, err] if err
+
+      check_minimum_maximum(value, schema)
     end
 
     private

data/lib/openapi_parser/schema_validators/minimum_maximum.rb

@@ -0,0 +1,38 @@
+class OpenAPIParser::SchemaValidator
+  module MinimumMaximum
+    # check minimum and maximum value by schema
+    # @param [Object] value
+    # @param [OpenAPIParser::Schemas::Schema] schema
+    def check_minimum_maximum(value, schema)
+      include_min_max = schema.minimum || schema.maximum
+      return [value, nil] unless include_min_max
+
+      validate(value, schema)
+      [value, nil]
+    rescue OpenAPIParser::OpenAPIError => e
+      return [nil, e]
+    end
+
+    private
+
+      def validate(value, schema)
+        reference = schema.object_reference
+
+        if schema.minimum
+          if schema.exclusiveMinimum && value <= schema.minimum
+            raise OpenAPIParser::LessThanExclusiveMinimum.new(value, reference)
+          elsif value < schema.minimum
+            raise OpenAPIParser::LessThanMinimum.new(value, reference)
+          end
+        end
+
+        if schema.maximum
+          if schema.exclusiveMaximum && value >= schema.maximum
+            raise OpenAPIParser::MoreThanExclusiveMaximum.new(value, reference)
+          elsif value > schema.maximum
+            raise OpenAPIParser::MoreThanMaximum.new(value, reference)
+          end
+        end
+      end
+  end
+end

data/lib/openapi_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenAPIParser
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - ota42y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,7 @@ files:
 - lib/openapi_parser/schema_validators/enumable.rb
 - lib/openapi_parser/schema_validators/float_validator.rb
 - lib/openapi_parser/schema_validators/integer_validator.rb
+- lib/openapi_parser/schema_validators/minimum_maximum.rb
 - lib/openapi_parser/schema_validators/nil_validator.rb
 - lib/openapi_parser/schema_validators/object_validator.rb
 - lib/openapi_parser/schema_validators/one_of_validator.rb