openapi_contracts 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5891083b3cb25419145aab30a963c61f28973c40b8a4a74ea080b63bc970670b
-  data.tar.gz: 5febe1b938ba77edef2e6955e3b8cf8a161f40e5b5f828c6cc39f5105ed734d7
+  metadata.gz: 7fa5c81703e10335348cefdfdf14ada22c1a66a4017c71e0fd74e2499e95cd75
+  data.tar.gz: ef6ab8b10609f9e048f9ee61cdd017883a4a9c8b7a8f3166ac3891e5e6d51e52
 SHA512:
-  metadata.gz: 87441e69b4caa9ac627e82c27e3d0b0e15162da1587c3bdb7ed4f5c2102fdda02f583df01652676d056b60af24fa9c67dedf38e38b1dfed346211f439de640c2
-  data.tar.gz: a725d1696dc0e7a3ee19bc3c46c1248f0ada9185bb492f44ea5c571944d98dbb6eb0f69625f68169ed931717782438524bbdc337014ea83116ad60a2d565b545
+  metadata.gz: fb69135e230360714f93b9285efa0fa7cd1cc4b2ab524b5dac1a1bf925ef2cf98a92475b6c7d5528892f2208ba42ee0f71366280808914bb6976ec91db5d3df7
+  data.tar.gz: 71fc02b108dae2bdcf2bcbc40ef7faca01acee5c772a57ec155426ca4aec42b5317e89f828624b2126f658f276261762ccc8eb29b6be2c1cd6f5c9f90663996f

data/lib/openapi_contracts/doc/path.rb

@@ -25,10 +25,10 @@ module OpenapiContracts
 
     def path_regexp
       @path_regexp ||= begin
-        re = /\{(\S+)\}/
+        re = /\{([^\}]+)\}/
         @path.gsub(re) { |placeholder|
           placeholder.match(re) { |m| "(?<#{m[1]}>[^/]*)" }
-        }.then { |str| Regexp.new(str) }
+        }.then { |str| Regexp.new("^#{str}$") }
       end
     end
 

data/lib/openapi_contracts/doc.rb

@@ -35,20 +35,20 @@ module OpenapiContracts
     end
 
     # Returns an Enumerator over all Operations
-    def operations(&block)
+    def operations(&block) # rubocop:disable Naming/BlockForwarding
       return enum_for(:operations) unless block_given?
 
       paths.each do |path|
-        path.operations.each(&block)
+        path.operations.each(&block) # rubocop:disable Naming/BlockForwarding
       end
     end
 
     # Returns an Enumerator over all Responses
-    def responses(&block)
+    def responses(&block) # rubocop:disable Naming/BlockForwarding
       return enum_for(:responses) unless block_given?
 
       operations.each do |operation|
-        operation.responses.each(&block)
+        operation.responses.each(&block) # rubocop:disable Naming/BlockForwarding
       end
     end
 

data/lib/openapi_contracts/match.rb

@@ -36,7 +36,7 @@ module OpenapiContracts
     def matchers
       env = Env.new(
         options:   @options,
-        operation: operation,
+        operation:,
         request:   @request,
         response:  @response
       )

data/lib/openapi_contracts/parser/transformers/pointer.rb

@@ -1,13 +1,25 @@
 module OpenapiContracts::Parser::Transformers
   class Pointer < Base
     def call(object)
+      transform_discriminator(object)
+      transform_refs(object)
+    end
+
+    private
+
+    def transform_discriminator(object)
+      mappings = object.dig('discriminator', 'mapping')
+      return unless mappings.present?
+
+      mappings.transform_values! { |p| transform_pointer(p) }
+    end
+
+    def transform_refs(object)
       return unless object['$ref'].present?
 
       object['$ref'] = transform_pointer(object['$ref'])
     end
 
-    private
-
     def transform_pointer(target)
       if %r{^#/(?<pointer>.*)} =~ target
         # A JSON Pointer

data/lib/openapi_contracts/parser/transformers.rb

@@ -1,5 +1,4 @@
 module OpenapiContracts::Parser::Transformers
   autoload :Base,     'openapi_contracts/parser/transformers/base'
-  autoload :Nullable, 'openapi_contracts/parser/transformers/nullable'
   autoload :Pointer,  'openapi_contracts/parser/transformers/pointer'
 end

data/lib/openapi_contracts/validators/schema_validation.rb

@@ -29,6 +29,9 @@ module OpenapiContracts::Validators
       validation_schemer(schema).validate(data).map do |err|
         error_to_message(err)
       end
+    rescue JSONSchemer::UnknownRef => e
+      # This usually happens when discriminators encounter unknown types
+      ["Could not resolve pointer #{e.message.inspect}"]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_contracts
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - mkon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,16 +34,22 @@ dependencies:
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +98,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.56.1
+        version: 1.57.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.56.1
+        version: 1.57.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.23.2
+        version: 2.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.23.2
+        version: 2.25.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -180,17 +186,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Openapi schemas as API contracts