openapi_parser 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46f9ea4e608b98aadd42d6da1ad0f3ab83f8b87c14fee89d287bf7d92d40a38a
-  data.tar.gz: 84aadee40dbb76d7332fa222d05e447a3070c57311dc6d872267b36b68183e39
+  metadata.gz: 1e38224603546bc8818028b725452113a5c3b62811675e1bc7390aeb9b408a2a
+  data.tar.gz: 6e6b0352a64a35d2a71a001931910d7e15ea4aa3a36a5aebee68f2aa6e6b367e
 SHA512:
-  metadata.gz: dea21c51e1744e593cd110b4b697c212e31d8834e12f148b73ff53e9777cabe83250db73b00102d3cab6f865b30b682f427adc39f7f22c71698965af76fb1cee
-  data.tar.gz: 98e5c2e15c264918477a36c94788c9ae6c3054c0c86bc2b2b98e1eb5effec77698c00e412682065f2fc0f8538588fde298f54a4083843673de574947dc7e917f
+  metadata.gz: 5bc8816e1059379a014e2bfc702068edcc31b6adeddb2f3747094314c01df680cf431774d1fb1bb407497501e454ff4b7571e969f83eec19b6276b3de21d302d
+  data.tar.gz: e0819dbee935685d25793da062afb1dd850adeac72ba25efe917a86e46e46fb23e969f02d0402ab39a5111d765e4501ebdb93d679dc36322ddb69cae3bf6dcb8

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yaml

@@ -13,10 +13,11 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
           - ruby-head
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,14 +1,32 @@
 ## Unreleased
 
+## 2.2.0 (2024-10-23)
+### Fixed
+* support schemas validation in additionalProperties and remove additionalProperties logic from allof
+* suppress method redefined warning
+* add base64 dev dependency for ruby-head compatibility
+* remove no longer needed activesupport dev dep thanks to a fix upstream
+* add dependabot config
+* remove no longer used code for old rubies
+* bump actions/checkout
+* add ruby 3.3 to test matrix
+* fix uuid validation logic (make it more strict)
+
 ## 2.1.0 (2024-04-03)
 ### Fixed
 * Add full-date compliant date format validation #164
 
-## 1.1.0 (2023-10-15)
+## 2.0.0 (2023-10-15)
+
 ### Added
+
 * Support for uniqueItems in array #154
 * Fix nullable field does not work with allOf, anyOf and oneOf keyword #128
 
+### Other
+
+* Drop Ruby 2.6 Support #158
+
 ## 1.0.0 (2021-02-03)
 ### Added
 * Add date-time format validation #126

data/lib/openapi_parser/schema_validator/all_of_validator.rb

@@ -10,8 +10,6 @@ class OpenAPIParser::SchemaValidator
       end
 
       # 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(
@@ -20,24 +18,9 @@ class OpenAPIParser::SchemaValidator
           :parent_all_of => true,
           parent_discriminator_schemas: keyword_args[:parent_discriminator_schemas]
         )
-
-        if s.type == "object"
-          remaining_keys               -= (s.properties || {}).keys
-          nested_additional_properties = true if s.additional_properties
-        else
-          # If this is not allOf having array of objects inside, but e.g. having another anyOf/oneOf nested
-          remaining_keys.clear
-        end
-
         return [nil, err] if err
       end
 
-      # If there are nested additionalProperites, we allow not defined extra properties and lean on the specific
-      # additionalProperties validation
-      if !nested_additional_properties && !remaining_keys.empty?
-        return [nil, OpenAPIParser::NotExistPropertyDefinition.new(remaining_keys, schema.object_reference)]
-      end
-
       [value, nil]
     end
   end

data/lib/openapi_parser/schema_validator/object_validator.rb

@@ -27,9 +27,9 @@ class OpenAPIParser::SchemaValidator
         coerced, err = if s
                          remaining_keys.delete(name)
                          validatable.validate_schema(v, s)
+                       elsif schema.additional_properties != true && schema.additional_properties != false
+                         validatable.validate_schema(v, schema.additional_properties)
                        else
-                         # TODO: we need to perform a validation based on schema.additional_properties here, if
-                         # additionalProperties are defined
                          [v, nil]
                        end
 
@@ -41,9 +41,7 @@ class OpenAPIParser::SchemaValidator
 
       remaining_keys.delete(discriminator_property_name) if discriminator_property_name
 
-      if !remaining_keys.empty? && !parent_all_of && !schema.additional_properties
-        # If object is nested in all of, the validation is already done in allOf validator. Or if
-        # additionalProperties are defined, we will validate using that
+      if !remaining_keys.empty? && !schema.additional_properties
         return [nil, OpenAPIParser::NotExistPropertyDefinition.new(remaining_keys, schema.object_reference)]
       end
       return [nil, OpenAPIParser::NotExistRequiredKey.new(required_set.to_a, schema.object_reference)] unless required_set.empty?

data/lib/openapi_parser/schema_validator/string_validator.rb

@@ -55,10 +55,7 @@ class OpenAPIParser::SchemaValidator
       def validate_email_format(value, schema)
         return [value, nil] unless schema.format == 'email'
 
-        # match? method is good performance.
-        # So when we drop ruby 2.3 support we use match? method because this method add ruby 2.4
-        #return [value, nil] if value.match?(URI::MailTo::EMAIL_REGEXP)
-        return [value, nil] if value.match(URI::MailTo::EMAIL_REGEXP)
+        return [value, nil] if value.match?(URI::MailTo::EMAIL_REGEXP)
 
         return [nil, OpenAPIParser::InvalidEmailFormat.new(value, schema.object_reference)]
       end
@@ -66,7 +63,7 @@ class OpenAPIParser::SchemaValidator
       def validate_uuid_format(value, schema)
         return [value, nil] unless schema.format == 'uuid'
 
-        return [value, nil] if value.match(/[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/)
+        return [value, nil] if value.match(/^[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}$/)
 
         return [nil, OpenAPIParser::InvalidUUIDFormat.new(value, schema.object_reference)]
       end

data/lib/openapi_parser/schemas/schema.rb

@@ -110,6 +110,7 @@ module OpenAPIParser::Schemas
     openapi_attr_object :additional_properties, Schema, reference: true, allow_data_type: true, schema_key: :additionalProperties
     # additional_properties have default value
     # we should add default value feature in openapi_attr_object method, but we need temporary fix so override attr_reader
+    remove_method :additional_properties
     def additional_properties
       @additional_properties.nil? ? true : @additional_properties
     end

data/lib/openapi_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenAPIParser
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/lib/openapi_parser.rb

@@ -81,14 +81,11 @@ module OpenAPIParser
       end
 
       def parse_yaml(content)
-        # FIXME: when drop ruby 2.5, we should use permitted_classes
-        (Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.6.0")) ? 
-          Psych.safe_load(content, [Date, Time]) : 
-          Psych.safe_load(content, permitted_classes: [Date, Time])
+        Psych.safe_load(content, permitted_classes: [Date, Time])
       end
 
       def parse_json(content)
-        raise "json content is nil" unless content 
+        raise "json content is nil" unless content
         JSON.parse(content)
       end
 

data/openapi_parser.gemspec

@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-parameterized'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency "steep"
-  # for steep 
-  # https://github.com/soutaro/steep/issues/466
-  spec.add_development_dependency "activesupport", '~> 6.0'
+  # for steep + ruby-head
+  spec.add_development_dependency 'base64', '~> 0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parser
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - ota42y
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.2.0
 description: parser for OpenAPI 3.0 or later
 email:
 - ota42y@gmail.com
@@ -157,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
@@ -250,7 +223,7 @@ homepage: https://github.com/ota42y/openapi_parser
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -265,8 +238,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.5.18
+signing_key:
 specification_version: 4
 summary: OpenAPI3 parser
 test_files: []