json_schemer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460e70448c0b37c65fd4e51f046036336b17121cc716c197fe80f2e2517f45e7
-  data.tar.gz: f06d11eab9bb88c45a018c8913d6a5d2e33162064c9f995e5772beb811e68ed6
+  metadata.gz: 57b910832ad52857f782a9e0c9d17247b3d298493e2876d4d87dcc7bd72c623e
+  data.tar.gz: 4f36b7e698c0de3b9cac3d5fc54572dfd2288f28e0e29c7475f162cf5e878c95
 SHA512:
-  metadata.gz: 83549b328ba3067ed206a8bdea448e34ba274c7c5a7857d38793d74f0691339f845b0e39fdbb0ff8c3869dfbaf0dcd13380c458c80397b100a848f96443bf691
-  data.tar.gz: 106314824f1805e7d2306c10c696d4503b54b4d9203321e37816242c30598c3870ec40ade53dc08692ec3b2a35f18360c96211f0b8af44fd4414931da4e5b1e5
+  metadata.gz: 6cb5d43a92de555b7fb72febcd305990b94ed7764bfb300a158ec3ee864e4d7c9944afa4ff4726ce30e57af0325a8bb9e295e281b4b981cc459f44ddd3e507da
+  data.tar.gz: f41eab50d37542486c230fcbe14a57c7dbb6564acac9815a3ff4b9977a7683a9703162d59650e34c3dc640693fa919c6b607403e575b233c77468fcc39f0703b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (1.0.1)
+    json_schemer (1.0.2)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)

data/lib/json_schemer/format.rb

@@ -66,7 +66,7 @@ module JSONSchemer
     def valid_date_time?(data)
       return false if HOUR_24_REGEX.match?(data)
       datetime = DateTime.rfc3339(data)
-      return false if LEAP_SECOND_REGEX.match?(data) && datetime.to_time.utc.strftime('%H:%M') != '23:59'
+      return false if LEAP_SECOND_REGEX.match?(data) && datetime.new_offset.strftime('%H:%M') != '23:59'
       DATE_TIME_OFFSET_REGEX.match?(data)
     rescue ArgumentError
       false

data/lib/json_schemer/schema/base.rb

@@ -330,10 +330,10 @@ module JSONSchemer
           child(resolve_ref(ref_uri), base_uri: ref_uri)
         end
 
-        ref_schema, ref_schema_pointer = ref_object.ids[ref_uri] || [ref_object.root, '']
+        ref_schema, ref_schema_pointer, ref_parent_base_uri = ref_object.ids[ref_uri] || [ref_object.root, '', ref_uri]
 
         ref_uri_pointer_parts = Hana::Pointer.parse(URI.decode_www_form_component(ref_uri_pointer))
-        schema, base_uri = ref_uri_pointer_parts.reduce([ref_schema, ref_uri]) do |(obj, uri), token|
+        schema, base_uri = ref_uri_pointer_parts.reduce([ref_schema, ref_parent_base_uri]) do |(obj, uri), token|
           if obj.is_a?(Array)
             [obj.fetch(token.to_i), uri]
           else
@@ -646,16 +646,18 @@ module JSONSchemer
         if schema.is_a?(Array)
           schema.each_with_index { |subschema, index| resolve_ids(subschema, ids, base_uri, "#{pointer}/#{index}") }
         elsif schema.is_a?(Hash)
-          uri = join_uri(base_uri, schema[id_keyword])
+          if schema.key?(id_keyword)
+            parent_base_uri = base_uri
+            base_uri = join_uri(base_uri, schema[id_keyword])
+            ids[base_uri] ||= [schema, pointer, parent_base_uri]
+          end
           schema.each do |key, value|
             case key
-            when id_keyword
-              ids[uri] ||= [schema, pointer]
             when 'items', 'allOf', 'anyOf', 'oneOf', 'additionalItems', 'contains', 'additionalProperties', 'propertyNames', 'if', 'then', 'else', 'not'
-              resolve_ids(value, ids, uri, "#{pointer}/#{key}")
+              resolve_ids(value, ids, base_uri, "#{pointer}/#{key}")
             when 'properties', 'patternProperties', 'definitions', 'dependencies'
               value.each do |subkey, subvalue|
-                resolve_ids(subvalue, ids, uri, "#{pointer}/#{key}/#{subkey}")
+                resolve_ids(subvalue, ids, base_uri, "#{pointer}/#{key}/#{subkey}")
               end
             end
           end

data/lib/json_schemer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - David Harsha
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler