json_schemer 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd2081bcd9677b1615f3076f9c83171bba0f4a9c7030b94f175ea0b350b75b7c
-  data.tar.gz: 920692383076ade224cb1b1f02f1579a824792c07333ebdee467596a0c3e3b6a
+  metadata.gz: 1981782f2342c7123beb0374680037bc11f3be72a8e4be0a213cfb7691643415
+  data.tar.gz: e8b6c605ba1ce2a2751ac90167f53c27fad975140ab9a0e8328c2b04ce8fe732
 SHA512:
-  metadata.gz: 84f674bd5560c44cbc752a18365cfbff341bb4e94a7cae43674d5591bb2229e0bd5d096346bca9e8ef54313c500496195ebabcb3d3100a39346e23be4d984f20
-  data.tar.gz: 77a8391db7a554ec8ff93b155c77f0945984a194a3f64178d3f184fdbfc21806736f18788295579812ddc138c6b5a1dde977a16e8aa3b8c7edf7545c15eae3fa
+  metadata.gz: 4d4c6e6c3660560a602b5610559efe37b5839f1142af6486e350bd207cad49e37a00f397d555878957b14951da95745092240bd14417e2ffd02826f053099952
+  data.tar.gz: 8dc561414463ceeacf7bbd0be95be9c441a50919cdb839ff8366fa0268d96d91e4947985bd7bab406f3c163e913bf7ca923a38e22d777d2549af3329f91c14f2

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## [2.1.0] - XXXX-XX-XX
+## [2.1.1] - 2023-11-28
+
+### Bug Fixes
+
+- Fix refs to/through keyword objects: https://github.com/davishmcclurg/json_schemer/pull/160
+- Temporary fix for incorrect `uri-reference` format in OpenAPI 3.x: https://github.com/davishmcclurg/json_schemer/pull/161
+
+[2.1.1]: https://github.com/davishmcclurg/json_schemer/releases/tag/v2.1.1
+
+## [2.1.0] - 2023-11-17
 
 ### Bug Fixes
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (2.1.0)
+    json_schemer (2.1.1)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
@@ -30,7 +30,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf (0.1.4-java)
-    unf_ext (0.0.9)
+    unf_ext (0.0.9.1)
 
 PLATFORMS
   java

data/lib/json_schemer/draft202012/vocab/core.rb

@@ -136,7 +136,7 @@ module JSONSchemer
             end
           end
 
-          def fetch_unknown!(token)
+          def fetch(token)
             if value.is_a?(Hash)
               parsed[token] ||= JSONSchemer::Schema::UNKNOWN_KEYWORD_CLASS.new(value.fetch(token), self, token, schema)
             elsif value.is_a?(Array)
@@ -146,8 +146,8 @@ module JSONSchemer
             end
           end
 
-          def unknown_schema!
-            @unknown_schema ||= subschema(value)
+          def parsed_schema
+            @parsed_schema ||= subschema(value)
           end
 
           def validate(instance, instance_location, keyword_location, _context)

data/lib/json_schemer/keyword.rb

@@ -30,6 +30,14 @@ module JSONSchemer
       keyword
     end
 
+    def fetch(key)
+      parsed.fetch(parsed.is_a?(Array) ? key.to_i : key)
+    end
+
+    def parsed_schema
+      parsed.is_a?(Schema) ? parsed : nil
+    end
+
   private
 
     def parse

data/lib/json_schemer/openapi30/document.rb

@@ -1584,8 +1584,7 @@ module JSONSchemer
                 'type' => 'string'
               },
               'operationRef' => {
-                'type' => 'string',
-                'format' => 'uri-reference'
+                'type' => 'string'
               },
               'parameters' => {
                 'type' => 'object',

data/lib/json_schemer/openapi31/document.rb

@@ -270,8 +270,7 @@ module JSONSchemer
             'type' => 'object',
             'properties' => {
               'url' => {
-                'type' => 'string',
-                'format' => 'uri-reference'
+                'type' => 'string'
               },
               'description' => {
                 'type' => 'string'
@@ -1054,8 +1053,7 @@ module JSONSchemer
             'type' => 'object',
             'properties' => {
               'operationRef' => {
-                'type' => 'string',
-                'format' => 'uri-reference'
+                'type' => 'string'
               },
               'operationId' => {
                 'type' => 'string'

data/lib/json_schemer/schema.rb

@@ -203,18 +203,13 @@ module JSONSchemer
       end
 
       schema = Hana::Pointer.parse(pointer).reduce(schema) do |obj, token|
-        if obj.is_a?(UNKNOWN_KEYWORD_CLASS)
-          obj.fetch_unknown!(token)
-        elsif obj.parsed.is_a?(Array)
-          obj.parsed.fetch(token.to_i)
-        else
-          obj.parsed.fetch(token)
-        end
+        obj.fetch(token)
       rescue IndexError
         raise InvalidRefPointer, pointer
       end
 
-      schema = schema.unknown_schema! unless schema.is_a?(Schema)
+      schema = schema.parsed_schema if schema.is_a?(Keyword)
+      raise InvalidRefPointer, pointer unless schema.is_a?(Schema)
 
       schema
     end
@@ -299,6 +294,10 @@ module JSONSchemer
       '^'
     end
 
+    def fetch(key)
+      parsed.fetch(key)
+    end
+
     def fetch_format(format, *args, &block)
       if meta_schema == self
         formats.fetch(format, *args, &block)

data/lib/json_schemer/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module JSONSchemer
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - David Harsha
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler