Merge pull request #189 from kjeldahl/main

Changes dynamic and lexical schemas to be stored internally by the URI as a string
davishmcclurg · Aug 24, 2024 · 2ecf188 · 2ecf188
2 parents 1878fe8 + 2ca36fd
commit 2ecf188
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 14 deletions.
diff --git a/lib/json_schemer.rb b/lib/json_schemer.rb
@@ -59,6 +59,7 @@
 require 'json_schemer/openapi30/vocab'
 require 'json_schemer/openapi'
 require 'json_schemer/configuration'
+require 'json_schemer/resources'
 require 'json_schemer/schema'
 
 module JSONSchemer

diff --git a/lib/json_schemer/draft201909/vocab/core.rb b/lib/json_schemer/draft201909/vocab/core.rb
@@ -5,7 +5,7 @@ module Vocab
       module Core
         class RecursiveAnchor < Keyword
           def parse
-            root.resources[:dynamic][schema.base_uri] = schema if value == true
+            root.resources.register(:dynamic, schema.base_uri, schema) if value == true
             value
           end
         end
@@ -29,8 +29,8 @@ def validate(instance, instance_location, keyword_location, context)
 
             if recursive_anchor
               context.dynamic_scope.each do |ancestor|
-                if ancestor.root.resources.fetch(:dynamic).key?(ancestor.base_uri)
-                  schema = ancestor.root.resources.fetch(:dynamic).fetch(ancestor.base_uri)
+                if ancestor.root.resources.dynamic?(ancestor.base_uri)
+                  schema = ancestor.root.resources.dynamic!(ancestor.base_uri)
                   break
                 end
               end

diff --git a/lib/json_schemer/draft202012/vocab/core.rb b/lib/json_schemer/draft202012/vocab/core.rb
@@ -37,15 +37,15 @@ class Id < Keyword
           def parse
             URI.join(schema.base_uri, value).tap do |uri|
               schema.base_uri = uri
-              root.resources[:lexical][uri] = schema
+              root.resources.register(:lexical, uri, schema)
             end
           end
         end
 
         class Anchor < Keyword
           def parse
             URI.join(schema.base_uri, "##{value}").tap do |uri|
-              root.resources[:lexical][uri] = schema
+              root.resources.register(:lexical, uri, schema)
             end
           end
         end
@@ -71,8 +71,8 @@ def validate(instance, instance_location, keyword_location, context)
         class DynamicAnchor < Keyword
           def parse
             URI.join(schema.base_uri, "##{value}").tap do |uri|
-              root.resources[:lexical][uri] = schema
-              root.resources[:dynamic][uri] = schema
+              root.resources.register(:lexical, uri, schema)
+              root.resources.register(:dynamic, uri, schema)
             end
           end
         end
@@ -98,8 +98,8 @@ def validate(instance, instance_location, keyword_location, context)
             if dynamic_anchor
               context.dynamic_scope.each do |ancestor|
                 dynamic_uri = URI.join(ancestor.base_uri, "##{dynamic_anchor}")
-                if ancestor.root.resources.fetch(:dynamic).key?(dynamic_uri)
-                  schema = ancestor.root.resources.fetch(:dynamic).fetch(dynamic_uri)
+                if ancestor.root.resources.dynamic?(dynamic_uri)
+                  schema = ancestor.root.resources.dynamic!(dynamic_uri)
                   break
                 end
               end

diff --git a/lib/json_schemer/resources.rb b/lib/json_schemer/resources.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module JSONSchemer
+  class Resources
+
+    def initialize
+      @resources ||= { :lexical => {}, :dynamic => {} }
+    end
+
+    def register(type, namespace_uri, schema)
+      @resources[type][namespace_uri.to_s] = schema
+    end
+
+    def lexical!(namespace_uri)
+      @resources[:lexical].fetch(namespace_uri.to_s)
+    end
+
+    def lexical(namespace_uri)
+      @resources[:lexical][namespace_uri.to_s]
+    end
+
+    def dynamic!(namespace_uri)
+      @resources[:dynamic].fetch(namespace_uri.to_s)
+    end
+
+    def dynamic?(namespace_uri)
+      @resources[:dynamic].key?(namespace_uri.to_s)
+    end
+  end
+end
diff --git a/lib/json_schemer/schema.rb b/lib/json_schemer/schema.rb
@@ -174,13 +174,12 @@ def resolve_ref(uri)
         uri.fragment = nil
       end
 
-      lexical_resources = resources.fetch(:lexical)
-      schema = lexical_resources[uri]
+      schema = resources.lexical(uri)
 
       if !schema && uri.fragment.nil?
         empty_fragment_uri = uri.dup
         empty_fragment_uri.fragment = ''
-        schema = lexical_resources[empty_fragment_uri]
+        schema = resources.lexical(empty_fragment_uri)
       end
 
       unless schema
@@ -196,7 +195,7 @@ def resolve_ref(uri)
         )
         remote_uri = remote_schema.base_uri.dup
         remote_uri.fragment = location_independent_identifier if location_independent_identifier
-        schema = remote_schema.resources.fetch(:lexical).fetch(remote_uri)
+        schema = remote_schema.resources.lexical!(remote_uri)
       end
 
       schema = Hana::Pointer.parse(pointer).reduce(schema) do |obj, token|
@@ -328,7 +327,7 @@ def defs_keyword
     end
 
     def resources
-      @resources ||= { :lexical => {}, :dynamic => {} }
+      @resources ||= Resources.new
     end
 
     def error(formatted_instance_location:, **options)