openapi_parser 0.12.1 → 0.15.0

data/lib/openapi_parser/concerns/findable.rb

@@ -5,25 +5,26 @@ module OpenAPIParser::Findable
   # @param [String] reference
   # @return [OpenAPIParser::Findable]
   def find_object(reference)
-    reference = CGI.unescape(reference)
     return self if object_reference == reference
     remote_reference = !reference.start_with?('#')
     return find_remote_object(reference) if remote_reference
     return nil unless reference.start_with?(object_reference)
 
+    unescaped_reference = CGI.unescape(reference)
+
     @find_object_cache = {} unless defined? @find_object_cache
-    if (obj = @find_object_cache[reference])
+    if (obj = @find_object_cache[unescaped_reference])
       return obj
     end
 
-    if (child = _openapi_all_child_objects[reference])
-      @find_object_cache[reference] = child
+    if (child = _openapi_all_child_objects[unescaped_reference])
+      @find_object_cache[unescaped_reference] = child
       return child
     end
 
     _openapi_all_child_objects.values.each do |c|
-      if (obj = c.find_object(reference))
-        @find_object_cache[reference] = obj
+      if (obj = c.find_object(unescaped_reference))
+        @find_object_cache[unescaped_reference] = obj
         return obj
       end
     end
@@ -45,8 +46,8 @@ module OpenAPIParser::Findable
   private
 
     def find_remote_object(reference)
-      reference_uri = URI(reference)
-      fragment = reference_uri.fragment
+      uri, fragment = reference.split("#", 2)
+      reference_uri = URI(uri)
       reference_uri.fragment = nil
       root.load_another_schema(reference_uri)&.find_object("##{fragment}")
     end

data/lib/openapi_parser/concerns/parameter_validatable.rb

@@ -13,6 +13,12 @@ module OpenAPIParser::ParameterValidatable
     validate_query_parameter(params, object_reference, options)
   end
 
+  # @param [PathItem] path_item parent
+  def set_parent_path_item(path_item)
+    @merged_parameter = (parameters || []) + (path_item.parameters || [])
+    nil
+  end
+
   private
 
     # @param [Hash] params query parameter hash
@@ -44,7 +50,7 @@ module OpenAPIParser::ParameterValidatable
     # @return [Hash{String => Hash{String => Parameter}}] hash[in][name] => Parameter
     def divided_parameter_hash
       @divided_parameter_hash ||=
-        (parameters || []).
+        (@merged_parameter || []).
           group_by(&:in).
           map { |in_type, params| # rubocop:disable Style/BlockDelimiters
           [

data/lib/openapi_parser/errors.rb

@@ -13,7 +13,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} expected #{@type}, but received #{@data.class}: #{@data}"
+      "#{@reference} expected #{@type}, but received #{@data.class}: #{@data.inspect}"
     end
 
     class << self
@@ -73,7 +73,7 @@ module OpenAPIParser
     end
 
     def message
-      "discriminator propertyName #{@key} does not exist in value #{@value} in #{@reference}"
+      "discriminator propertyName #{@key} does not exist in value #{@value.inspect} in #{@reference}"
     end
   end
 
@@ -84,7 +84,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@value} isn't one of in #{@reference}"
+      "#{@value.inspect} isn't one of in #{@reference}"
     end
   end
 
@@ -95,7 +95,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@value} isn't any of in #{@reference}"
+      "#{@value.inspect} isn't any of in #{@reference}"
     end
   end
 
@@ -106,7 +106,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@value} isn't include enum in #{@reference}"
+      "#{@value.inspect} isn't part of the enum in #{@reference}"
     end
   end
 
@@ -117,7 +117,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} is less than minimum value"
+      "#{@reference} #{@value.inspect} is less than minimum value"
     end
   end
 
@@ -128,7 +128,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} cannot be less than or equal to exclusive minimum value"
+      "#{@reference} #{@value.inspect} cannot be less than or equal to exclusive minimum value"
     end
   end
 
@@ -139,7 +139,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} is more than maximum value"
+      "#{@reference} #{@value.inspect} is more than maximum value"
     end
   end
 
@@ -150,7 +150,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} cannot be more than or equal to exclusive maximum value"
+      "#{@reference} #{@value.inspect} cannot be more than or equal to exclusive maximum value"
     end
   end
 
@@ -163,7 +163,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} pattern #{@pattern} does not match value: #{@value}#{@example ? ", example: #{@example}" : ""}"
+      "#{@reference} pattern #{@pattern} does not match value: #{@value.inspect}#{@example ? ", example: #{@example}" : ""}"
     end
   end
 
@@ -174,7 +174,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} email address format does not match value: #{@value}"
+      "#{@reference} email address format does not match value: #{@value.inspect}"
     end
   end
 
@@ -185,7 +185,18 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} Value: #{@value} is not conformant with UUID format"
+      "#{@reference} Value: #{@value.inspect} is not conformant with UUID format"
+    end
+  end
+
+  class InvalidDateFormat < OpenAPIError
+    def initialize(value, reference)
+      super(reference)
+      @value = value
+    end
+
+    def message
+      "#{@reference} Value: #{@value.inspect} is not conformant with date format"
     end
   end
 
@@ -208,7 +219,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} is longer than max length"
+      "#{@reference} #{@value.inspect} is longer than max length"
     end
   end
 
@@ -219,7 +230,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} is shorter than min length"
+      "#{@reference} #{@value.inspect} is shorter than min length"
     end
   end
 
@@ -230,7 +241,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} contains more than max items"
+      "#{@reference} #{@value.inspect} contains more than max items"
     end
   end
 
@@ -241,7 +252,7 @@ module OpenAPIParser
     end
 
     def message
-      "#{@reference} #{@value} contains fewer than min items"
+      "#{@reference} #{@value.inspect} contains fewer than min items"
     end
   end
 end

data/lib/openapi_parser/path_item_finder.rb

@@ -136,7 +136,7 @@ class OpenAPIParser::PathItemFinder
       end
     end
 
-    # find mathing path and extract params
+    # find matching path and extract params
     # EXAMPLE: find_path_and_params('get', '/user/1') => ['/user/{id}', { 'id' => 1 }]
     def find_path_and_params(http_method, request_path)
       return [request_path, {}] if matches_directly?(request_path, http_method)

data/lib/openapi_parser/request_operation.rb

@@ -65,7 +65,6 @@ class OpenAPIParser::RequestOperation
   # @param [OpenAPIParser::SchemaValidator::Options] options request validator options
   def validate_request_parameter(params, headers, options = nil)
     options ||= config.request_validator_options
-    path_item&.validate_request_parameter(params, headers, options)
     operation_object&.validate_request_parameter(params, headers, options)
   end
 

data/lib/openapi_parser/schema_validator.rb

@@ -12,6 +12,7 @@ require_relative 'schema_validators/any_of_validator'
 require_relative 'schema_validators/all_of_validator'
 require_relative 'schema_validators/one_of_validator'
 require_relative 'schema_validators/nil_validator'
+require_relative 'schema_validators/unspecified_type_validator'
 
 class OpenAPIParser::SchemaValidator
   # validate value by schema
@@ -113,7 +114,7 @@ class OpenAPIParser::SchemaValidator
       when 'array'
         array_validator
       else
-        nil
+        unspecified_type_validator
       end
     end
 
@@ -156,4 +157,8 @@ class OpenAPIParser::SchemaValidator
     def nil_validator
       @nil_validator ||= OpenAPIParser::SchemaValidator::NilValidator.new(self, @coerce_value)
     end
+
+    def unspecified_type_validator
+      @unspecified_type_validator ||= OpenAPIParser::SchemaValidator::UnspecifiedTypeValidator.new(self, @coerce_value)
+    end
 end

data/lib/openapi_parser/schema_validators/all_of_validator.rb

@@ -4,13 +4,18 @@ class OpenAPIParser::SchemaValidator
     # coerce and validate value
     # @param [Object] value
     # @param [OpenAPIParser::Schemas::Schema] schema
-    def coerce_and_validate(value, schema, **_keyword_args)
+    def coerce_and_validate(value, schema, **keyword_args)
       # if any schema return error, it's not valida all of value
       remaining_keys               = value.kind_of?(Hash) ? value.keys : []
       nested_additional_properties = false
       schema.all_of.each do |s|
         # We need to store the reference to all of, so we can perform strict check on allowed properties
-        _coerced, err = validatable.validate_schema(value, s, :parent_all_of => true)
+        _coerced, err = validatable.validate_schema(
+          value,
+          s,
+          :parent_all_of => true,
+          parent_discriminator_schemas: keyword_args[:parent_discriminator_schemas]
+        )
 
         if s.type == "object"
           remaining_keys               -= (s.properties || {}).keys

data/lib/openapi_parser/schema_validators/base.rb

@@ -18,7 +18,7 @@ class OpenAPIParser::SchemaValidator
       raise 'need implement'
     end
 
-    def validate_discriminator_schema(discriminator, value)
+    def validate_discriminator_schema(discriminator, value, parent_discriminator_schemas: [])
       unless value.key?(discriminator.property_name)
         return [nil, OpenAPIParser::NotExistDiscriminatorPropertyName.new(discriminator.property_name, value, discriminator.object_reference)]
       end
@@ -34,7 +34,11 @@ class OpenAPIParser::SchemaValidator
       unless resolved_schema
         return [nil, OpenAPIParser::NotExistDiscriminatorMappedSchema.new(mapping_target, discriminator.object_reference)]
       end
-      validatable.validate_schema(value, resolved_schema, **{discriminator_property_name: discriminator.property_name})
+      validatable.validate_schema(
+        value,
+        resolved_schema,
+        **{discriminator_property_name: discriminator.property_name, parent_discriminator_schemas: parent_discriminator_schemas}
+      )
     end
   end
 end

data/lib/openapi_parser/schema_validators/boolean_validator.rb

@@ -1,5 +1,7 @@
 class OpenAPIParser::SchemaValidator
   class BooleanValidator < Base
+    include ::OpenAPIParser::SchemaValidator::Enumable
+
     TRUE_VALUES = ['true', '1'].freeze
     FALSE_VALUES = ['false', '0'].freeze
 
@@ -8,6 +10,9 @@ class OpenAPIParser::SchemaValidator
 
       return OpenAPIParser::ValidateError.build_error_result(value, schema) unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
 
+      value, err = check_enum_include(value, schema)
+      return [nil, err] if err
+
       [value, nil]
     end
 

data/lib/openapi_parser/schema_validators/float_validator.rb

@@ -21,14 +21,14 @@ class OpenAPIParser::SchemaValidator
 
         value, err = check_enum_include(value, schema)
         return [nil, err] if err
-        
+
         check_minimum_maximum(value, schema)
       end
 
       def coerce(value)
         Float(value)
-      rescue ArgumentError => e
-        raise e unless e.message =~ /invalid value for Float/
+      rescue ArgumentError, TypeError
+        value
       end
   end
 end

data/lib/openapi_parser/schema_validators/integer_validator.rb

@@ -23,12 +23,10 @@ class OpenAPIParser::SchemaValidator
         return value if value.kind_of?(Integer)
 
         begin
-          return Integer(value)
-        rescue ArgumentError => e
-          raise e unless e.message =~ /invalid value for Integer/
+          Integer(value)
+        rescue ArgumentError, TypeError
+          value
         end
-
-        value
       end
   end
 end

data/lib/openapi_parser/schema_validators/object_validator.rb

@@ -4,7 +4,7 @@ class OpenAPIParser::SchemaValidator
     # @param [OpenAPIParser::Schemas::Schema] schema
     # @param [Boolean] parent_all_of true if component is nested under allOf
     # @param [String, nil] discriminator_property_name discriminator.property_name to ignore checking additional_properties
-    def coerce_and_validate(value, schema, parent_all_of: false, discriminator_property_name: nil)
+    def coerce_and_validate(value, schema, parent_all_of: false, parent_discriminator_schemas: [], discriminator_property_name: nil)
       return OpenAPIParser::ValidateError.build_error_result(value, schema) unless value.kind_of?(Hash)
 
       properties = schema.properties || {}
@@ -12,6 +12,16 @@ class OpenAPIParser::SchemaValidator
       required_set = schema.required ? schema.required.to_set : Set.new
       remaining_keys = value.keys
 
+      if schema.discriminator && !parent_discriminator_schemas.include?(schema)
+        return validate_discriminator_schema(
+          schema.discriminator,
+          value,
+          parent_discriminator_schemas: parent_discriminator_schemas + [schema]
+        )
+      else
+        remaining_keys.delete('discriminator')
+      end
+
       coerced_values = value.map do |name, v|
         s = properties[name]
         coerced, err = if s

data/lib/openapi_parser/schema_validators/string_validator.rb

@@ -30,6 +30,9 @@ class OpenAPIParser::SchemaValidator
       value, err = validate_uuid_format(value, schema)
       return [nil, err] if err
 
+      value, err = validate_date_format(value, schema)
+      return [nil, err] if err
+
       [value, nil]
     end
 
@@ -86,5 +89,17 @@ class OpenAPIParser::SchemaValidator
 
         return [nil, OpenAPIParser::InvalidUUIDFormat.new(value, schema.object_reference)]
       end
+
+      def validate_date_format(value, schema)
+        return [value, nil] unless schema.format == 'date'
+
+        begin
+          Date.strptime(value, "%Y-%m-%d")
+        rescue ArgumentError
+          return [nil, OpenAPIParser::InvalidDateFormat.new(value, schema.object_reference)]
+        end
+
+        return [value, nil]
+      end
   end
 end

data/lib/openapi_parser/schema_validators/unspecified_type_validator.rb

@@ -0,0 +1,8 @@
+class OpenAPIParser::SchemaValidator
+  class UnspecifiedTypeValidator < Base
+    # @param [Object] value
+    def coerce_and_validate(value, _schema, **_keyword_args)
+      value
+    end
+  end
+end

data/lib/openapi_parser/schemas/path_item.rb

@@ -3,8 +3,6 @@
 
 module OpenAPIParser::Schemas
   class PathItem < Base
-    include OpenAPIParser::ParameterValidatable
-
     openapi_attr_values :summary, :description
 
     openapi_attr_objects :get, :put, :post, :delete, :options, :head, :patch, :trace, Operation
@@ -16,5 +14,9 @@ module OpenAPIParser::Schemas
     rescue NoMethodError
       nil
     end
+
+    def set_path_item_to_operation
+      [:get, :put, :post, :delete, :options, :head, :patch, :trace].each{ |method| operation(method)&.set_parent_path_item(self)}
+    end
   end
 end

data/lib/openapi_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenAPIParser
-  VERSION = '0.12.1'.freeze
+  VERSION = '0.15.0'.freeze
 end

data/lib/openapi_parser.rb

@@ -93,6 +93,11 @@ module OpenAPIParser
 
         OpenAPIParser::ReferenceExpander.expand(root) if config.expand_reference
 
+        # TODO: use callbacks
+        root.paths&.path&.values&.each do | path_item |
+          path_item.set_path_item_to_operation
+        end
+
         root
       end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parser
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.15.0
 platform: ruby
 authors:
 - ota42y
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,17 +129,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_ignore.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- TAGS
 - bin/console
 - bin/setup
 - lib/openapi_parser.rb
@@ -184,6 +185,7 @@ files:
 - lib/openapi_parser/schema_validators/one_of_validator.rb
 - lib/openapi_parser/schema_validators/options.rb
 - lib/openapi_parser/schema_validators/string_validator.rb
+- lib/openapi_parser/schema_validators/unspecified_type_validator.rb
 - lib/openapi_parser/schemas.rb
 - lib/openapi_parser/schemas/base.rb
 - lib/openapi_parser/schemas/classes.rb
@@ -207,7 +209,7 @@ homepage: https://github.com/ota42y/openapi_parser
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: OpenAPI3 parser
 test_files: []

data/.travis.yml

@@ -1,37 +0,0 @@
-env:
-  global:
-    - CC_TEST_REPORTER_ID=b49a1717b8ff0aef9eced41d0f87d350a88b46d55083ba2e3df8b6f441ae3fb7
-
-language: ruby
-
-rvm:
-  - 2.3.8
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-  - ruby-head
-
-cache: bundler
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-script: bundle exec rspec
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-
-notifications:
-  email: false
-
-sudo: false
-
-git:
-  depth: 10
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head