json_skooma 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1be68fa71fa29965063cf60e9bab950139b697e0222371eb8ce1eec8fc5bf95
-  data.tar.gz: 83599b9f53a2d41483f2b700200971088db482d57bccf1ce9cee91d641dc27e6
+  metadata.gz: 9da78d5df937e93b851e37daf72770aeb62c61a09922232a2dc308533a4c5e36
+  data.tar.gz: 13759edb9c18994d8f315f740b37a5e32c4935415c0262292f77f6f52e648a30
 SHA512:
-  metadata.gz: '0691050d428ab71fa386697900c51d6322a7ebb7e2086a86c45079fbae4e2d61cf53d799e504dddde6041afae2668cd792f9d0acc195168ceb7cf7eb49643f16'
-  data.tar.gz: ecfe5c2115714a08df92dd5ebcd0ddd723a3636e0fdec668d76f4b0471aab0ef3f33bf0d3ab2a8896f0d479a7f10181024b52e004d70efe26575590a97544b9a
+  metadata.gz: b5b8b57d54a71b2c75f85c4f4964757cce15acedbbc49d967ebcea2447a17dfd0acbd36441aafb647f4e744ae91b78e84917ff0a7964b584a157602797210655
+  data.tar.gz: 8435cc06b0e079f1980797b0b2cbf3a7d635bb78bcbab8431f7c4408b54e871ee2dd79bd37bf948653f5d9c1f87626618135894e54fef24135e162aca046f7e3

data/CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.2.1] - 2023-12-03
+
+### Fixed
+
+- Make `unevaluated*` keyword respect reference keywords. ([@skryukov])
+- Fix `:basic` output. ([@skryukov])
+
+## [0.2.0] - 2023-10-23
+
+### Added
+
+- Add JSON Schema evaluation against a reference. ([@skryukov])
+
+### Changed
+
+- Optimized JSON Schema evaluation. ([@skryukov])
+
+### Fixed
+
+- Fix compatibility issues for Ruby < 3.1 and JRuby. ([@skryukov])
+- Fix Zeitwerk eager loading. ([@skryukov])
+
 ## [0.1.0] - 2023-09-27
 
 ### Added
@@ -15,7 +37,9 @@ and this project adheres to [Semantic Versioning].
 
 [@skryukov]: https://github.com/skryukov
 
-[Unreleased]: https://github.com/skryukov/json_skooma/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/skryukov/json_skooma/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/skryukov/json_skooma/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/skryukov/json_skooma/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/skryukov/json_skooma/commits/v0.1.0
 
 [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/

data/README.md

@@ -3,6 +3,8 @@
 [![Gem Version](https://badge.fury.io/rb/json_skooma.svg)](https://rubygems.org/gems/json_skooma)
 [![Ruby](https://github.com/skryukov/json_skooma/actions/workflows/main.yml/badge.svg)](https://github.com/skryukov/json_skooma/actions/workflows/main.yml)
 
+<img align="right" height="150" width="150" title="JSONSkooma logo" src="./assets/logo.svg">
+
 JSONSkooma is a Ruby library for validating JSONs against JSON Schemas.
 
 ### Features
@@ -78,6 +80,43 @@ result.output(:basic)
 #        "The instance value \"Human\" must be equal to one of the elements in the defined enumeration: [\"Nord\", \"Khajiit\", \"Argonian\", \"Breton\", \"Redguard\", \"Dunmer\", \"Altmer\", \"Bosmer\", \"Orc\", \"Imperial\"]"}]}
 ```
 
+### Evaluating against a reference
+
+```ruby
+require "json_skooma"
+
+# Create a registry to store schemas, vocabularies, dialects, etc.
+JSONSkooma.create_registry("2020-12", assert_formats: true)
+
+# Load a schema
+schema_hash = {
+  "$schema" => "https://json-schema.org/draft/2020-12/schema",
+  "$defs" => {
+    "Foo": {
+      "type" => "object",
+      "properties" => { 
+        "foo" => {"enum" => ["baz"]}
+      },
+    }
+  }
+}
+
+schema = JSONSkooma::JSONSchema.new(schema_hash)
+
+result = schema.evaluate({foo: "bar"}, ref: "#/$defs/Foo")
+
+result.valid? # => false
+
+result.output(:basic)
+# {"valid"=>false,
+#  "errors"=>
+#   [{"instanceLocation"=>"", "keywordLocation"=>"/properties", "absoluteKeywordLocation"=>"urn:uuid:cb8fb0a0-ce16-416f-b5ba-2a6531992be9#/$defs/Foo/properties", "error"=>"Properties [\"foo\"] are invalid"},
+#    {"instanceLocation"=>"/foo",
+#     "keywordLocation"=>"/properties/foo/enum",
+#     "absoluteKeywordLocation"=>"urn:uuid:cb8fb0a0-ce16-416f-b5ba-2a6531992be9#/$defs/Foo/properties/foo/enum",
+#     "error"=>"The instance value \"bar\" must be equal to one of the elements in the defined enumeration: [\"baz\"]"}]}
+```
+
 ## Alternatives
 
 - [json_schemer](https://github.com/davishmcclurg/json_schemer) – Draft 4, 6, 7, 2019-09 and 2020-12 compliant

data/data/draft-2019-09/meta/applicator.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/applicator",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/applicator": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Applicator vocabulary meta-schema",

data/data/draft-2019-09/meta/content.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/content",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/content": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Content vocabulary meta-schema",

data/data/draft-2019-09/meta/core.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/core",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/core": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Core vocabulary meta-schema",

data/data/draft-2019-09/meta/format.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/format",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/format": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Format vocabulary meta-schema",

data/data/draft-2019-09/meta/hyper-schema.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/hyper-schema",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/hyper-schema": true
-    },
     "$recursiveAnchor": true,
 
     "title": "JSON Hyper-Schema Vocabulary Schema",

data/data/draft-2019-09/meta/meta-data.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/meta-data",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/meta-data": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Meta-data vocabulary meta-schema",

data/data/draft-2019-09/meta/validation.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/validation",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/validation": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Validation vocabulary meta-schema",

data/data/draft-2020-12/meta/applicator.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/applicator",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/applicator": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Applicator vocabulary meta-schema",

data/data/draft-2020-12/meta/content.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/content",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/content": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Content vocabulary meta-schema",

data/data/draft-2020-12/meta/core.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/core",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/core": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Core vocabulary meta-schema",

data/data/draft-2020-12/meta/format-annotation.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/format-annotation",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/format-annotation": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Format vocabulary meta-schema for annotation results",

data/data/draft-2020-12/meta/format-assertion.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/format-assertion",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/format-assertion": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Format vocabulary meta-schema for assertion results",

data/data/draft-2020-12/meta/hyper-schema.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/hyper-schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/hyper-schema",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/hyper-schema": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "JSON Hyper-Schema Vocabulary Schema",

data/data/draft-2020-12/meta/meta-data.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/meta-data",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/meta-data": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Meta-data vocabulary meta-schema",

data/data/draft-2020-12/meta/unevaluated.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/unevaluated",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/unevaluated": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Unevaluated applicator vocabulary meta-schema",

data/data/draft-2020-12/meta/validation.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "$id": "https://json-schema.org/draft/2020-12/meta/validation",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2020-12/vocab/validation": true
-    },
     "$dynamicAnchor": "meta",
 
     "title": "Validation vocabulary meta-schema",

data/lib/json_skooma/dialects/draft201909.rb

@@ -36,11 +36,11 @@ module JSONSkooma
             Keywords::Draft201909::Items,
             Keywords::Draft201909::AdditionalItems,
             Keywords::Draft201909::UnevaluatedItems,
+            Keywords::Draft201909::UnevaluatedProperties,
             Keywords::Applicator::Contains,
             Keywords::Applicator::Properties,
             Keywords::Applicator::PatternProperties,
             Keywords::Applicator::AdditionalProperties,
-            Keywords::Unevaluated::UnevaluatedProperties,
             Keywords::Applicator::PropertyNames
           )
 

data/lib/json_skooma/formatters.rb

@@ -43,7 +43,7 @@ module JSONSkooma
           key = valid ? "annotation" : "error"
           result << node_data(node, key) if node.public_send(key)
 
-          node.children.each do |_, child|
+          node.each_children do |child|
             collect_nodes(child, valid, result)
           end
 
@@ -83,8 +83,9 @@ module JSONSkooma
           child_key = valid ? "annotations" : "errors"
           msg_key = valid ? "annotation" : "error"
 
-          child_data = node.children.filter_map do |_, child|
-            node_data(child, valid) if child.valid? == valid
+          child_data = []
+          node.each_children do |child|
+            child_data << node_data(child, valid) if child.valid? == valid
           end
 
           if first || child_data.length > 1
@@ -121,8 +122,9 @@ module JSONSkooma
           data[msg_key] = node.public_send(msg_key) if node.public_send(msg_key)
 
           child_key = valid ? "annotations" : "errors"
-          child_data = node.children.map do |_, child|
-            node_data(child)
+          child_data = []
+          node.each_children do |child|
+            child_data << node_data(child)
           end
           data[child_key] = child_data if child_data.length > 0
 

data/lib/json_skooma/inflector.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module JSONSkooma
-  class Inflector < Zeitwerk::Inflector
+  class Inflector < Zeitwerk::GemInflector
     def camelize(basename, _abspath)
       if basename.include?("json_")
         super.gsub("Json", "JSON")

data/lib/json_skooma/json_node.rb

@@ -4,14 +4,11 @@ require "delegate"
 
 module JSONSkooma
   class JSONNode < SimpleDelegator
-    extend Memoizable
-
-    attr_reader :parent, :root, :key, :type
+    attr_reader :parent, :key, :type
 
     def initialize(value, key: nil, parent: nil, item_class: JSONNode, **item_params)
       @key = key
       @parent = parent
-      @root = parent&.root || self
       @item_class = item_class
       @item_params = item_params
       @type, data = parse_value(value)
@@ -19,6 +16,10 @@ module JSONSkooma
       super(data)
     end
 
+    def root
+      @root ||= parent&.root || self
+    end
+
     def [](key)
       case type
       when "array"
@@ -31,23 +32,24 @@ module JSONSkooma
     end
 
     def value
-      case type
-      when "array"
-        map(&:value)
-      when "object"
-        transform_values(&:value)
-      else
-        __getobj__
-      end
+      return @value if instance_variable_defined?(:@value)
+
+      @value =
+        case type
+        when "array"
+          map(&:value)
+        when "object"
+          transform_values(&:value)
+        else
+          __getobj__
+        end
     end
-    memoize :value
 
     def path
-      result = []
-      each_parent { |node| result.unshift(node.key) }
-      JSONPointer.new(result)
+      return @path if instance_variable_defined?(:@path)
+
+      @path = @parent.nil? ? JSONPointer.new([]) : @parent.path.child(@key)
     end
-    memoize :path
 
     def ==(other)
       return super(other.__getobj__) if other.is_a?(self.class)
@@ -94,7 +96,9 @@ module JSONSkooma
     end
 
     def map_object_value(value)
-      value.map { |k, v| [k.to_s, @item_class.new(v, key: k.to_s, parent: self, **@item_params)] }.to_h
+      value.each_with_object({}) do |(k, v), h|
+        h[k.to_s] = @item_class.new(v, key: k.to_s, parent: self, **@item_params)
+      end
     end
   end
 end

data/lib/json_skooma/json_pointer.rb

@@ -5,7 +5,6 @@ require "cgi"
 
 module JSONSkooma
   class JSONPointer < Hana::Pointer
-    extend Memoizable
     ESC_REGEX = /[\/^~]/.freeze
     ESC2 = {"^" => "^^", "~" => "~0", "/" => "~1"}.freeze
     ESCAPE_REGEX = /([^ a-zA-Z0-9_.\-~\/!$&'()*+,;=]+)/.freeze
@@ -47,14 +46,19 @@ module JSONSkooma
     end
 
     def to_s
-      return "" if @path == []
-      return "/" if @path == [""]
-
-      "/" + @path.map(&method(:escape)).join("/")
+      return @to_s if instance_variable_defined?(:@to_s)
+
+      @to_s =
+        case @path
+        when []
+          ""
+        when [""]
+          "/"
+        else
+          "/" + @path.map(&method(:escape)).join("/")
+        end
     end
 
-    memoize :to_s
-
     def ==(other)
       return super unless other.is_a?(self.class)
       other.path == path

data/lib/json_skooma/json_schema.rb

@@ -2,10 +2,7 @@
 
 module JSONSkooma
   class JSONSchema < JSONNode
-    extend Memoizable
-
     attr_reader :uri, :cache_id, :registry
-
     attr_writer :metaschema_uri
 
     def initialize(value, registry: Registry::DEFAULT_NAME, cache_id: "default", uri: nil, metaschema_uri: nil, parent: nil, key: nil)
@@ -25,7 +22,9 @@ module JSONSkooma
       resolve_references if parent.nil?
     end
 
-    def evaluate(instance, result = nil)
+    def evaluate(instance, result = nil, ref: nil)
+      return resolve_ref(ref).evaluate(instance, result) if ref
+
       instance = JSONSkooma::JSONNode.new(instance) unless instance.is_a?(JSONNode)
 
       result ||= Result.new(self, instance)
@@ -43,7 +42,7 @@ module JSONSkooma
           end
         end
 
-        if result.children.any? { |_, child| !child.passed? && child.instance.path == instance.path }
+        if result.children[instance.path]&.any? { |_, child| !child.passed? }
           result.failure
         end
       end
@@ -51,19 +50,32 @@ module JSONSkooma
       result
     end
 
+    def resolve_uri(uri)
+      uri = URI.parse(uri)
+      return uri if uri.absolute?
+      return base_uri + uri if base_uri
+
+      raise Error, "No base URI against which to resolve uri `#{uri}`"
+    end
+
+    def resolve_ref(uri)
+      registry.schema(resolve_uri(uri), metaschema_uri: metaschema_uri, cache_id: cache_id)
+    end
+
     def validate
       metaschema.evaluate(self)
     end
 
     def parent_schema
+      return @parent_schema if instance_variable_defined?(:@parent_schema)
+
       node = parent
       while node
-        return node if node.is_a?(JSONSchema)
+        return @parent_schema = node if node.is_a?(JSONSchema)
 
         node = node.parent
       end
     end
-    memoize :parent_schema
 
     def uri=(uri)
       return if @uri == uri
@@ -81,9 +93,8 @@ module JSONSkooma
     end
 
     def metaschema_uri
-      @metaschema_uri || parent_schema&.metaschema_uri
+      @metaschema_uri ||= parent_schema&.metaschema_uri
     end
-    memoize :metaschema_uri
 
     def base_uri
       return parent_schema&.base_uri unless uri
@@ -93,6 +104,7 @@ module JSONSkooma
 
     def canonical_uri
       return uri if uri
+      return @canonical_uri if instance_variable_defined?(:@canonical_uri)
 
       keys = []
       node = self
@@ -102,14 +114,13 @@ module JSONSkooma
 
         if node.is_a?(JSONSchema) && node.uri
           fragment = JSONPointer.new(node.uri.fragment || "") << keys
-          return node.uri.dup.tap { |u| u.fragment = fragment.to_s }
+          return @canonical_uri = node.uri.dup.tap { |u| u.fragment = fragment.to_s }
         end
       end
     end
-    memoize :canonical_uri
 
     def resolve_references
-      @keywords.each_value { |kw| kw.resolve }
+      @keywords.each_value(&:resolve)
     end
 
     private
@@ -150,19 +161,19 @@ module JSONSkooma
     end
 
     def dependencies_in_order(kw_classes)
-      dependencies = kw_classes.map do |_, kw_class|
-        [kw_class, kw_class.depends_on.map { |dep| kw_classes[dep] }.compact]
-      end.to_h
+      dependencies = kw_classes.each_value.with_object({}) do |kw_class, res|
+        res[kw_class] = kw_class.depends_on.filter_map { |dep| kw_classes[dep] }
+      end
 
       while dependencies.any?
         kw_class, _ = dependencies.find { |_, depclasses| depclasses.empty? }
         dependencies.delete(kw_class)
-        dependencies.each { |_, deps| deps.delete(kw_class) }
+        dependencies.each_value { |deps| deps.delete(kw_class) }
         yield kw_class
       end
     end
 
-    def parse_value(value, **options)
+    def parse_value(value)
       case value
       when true, false
         ["boolean", value]

data/lib/json_skooma/keywords/applicator/additional_properties.rb

@@ -11,13 +11,14 @@ module JSONSkooma
 
         def evaluate(instance, result)
           known_property_names = result.sibling(instance, "properties")&.schema_node&.keys || []
-          known_property_patterns = result.sibling(instance, "patternProperties")&.schema_node&.keys || []
+          known_property_patterns = (result.sibling(instance, "patternProperties")&.schema_node&.keys || [])
+            .map { |pattern| Regexp.new(pattern) }
 
           annotation = []
           error = []
 
           instance.each do |name, item|
-            if !known_property_names.include?(name) && !known_property_patterns.any? { |pattern| Regexp.new(pattern).match?(name) }
+            if !known_property_names.include?(name) && !known_property_patterns.any? { |pattern| pattern.match?(name) }
               if json.evaluate(item, result).passed?
                 annotation << name
               else

data/lib/json_skooma/keywords/applicator/all_of.rb

@@ -17,7 +17,7 @@ module JSONSkooma
           end
           return if err_indices.empty?
 
-          result.failure("The instance is invalid against subschemas #{err_indices}")
+          result.failure("The instance is invalid against subschemas #{err_indices.join(", ")}")
         end
       end
     end

data/lib/json_skooma/keywords/applicator/pattern_properties.rb

@@ -35,7 +35,7 @@ module JSONSkooma
           end
 
           if err_names.any?
-            result.failure("Properties #{err_names} are invalid")
+            result.failure("Properties #{err_names.join(", ")} are invalid")
           else
             result.annotate(matched_names.to_a)
           end

data/lib/json_skooma/keywords/applicator/prefix_items.rb

@@ -11,7 +11,7 @@ module JSONSkooma
         def evaluate(instance, result)
           annotation = nil
           error = []
-          instance.take(json.length).each_with_index do |item, index|
+          instance.take(json.value.length).each_with_index do |item, index|
             annotation = index
             result.call(item, index.to_s) do |subresult|
               unless json[index].evaluate(item, subresult).passed?

data/lib/json_skooma/keywords/applicator/properties.rb

@@ -26,7 +26,7 @@ module JSONSkooma
 
           return result.annotate(annotation) if err_names.empty?
 
-          result.failure("Properties #{err_names} are invalid")
+          result.failure("Properties #{err_names.join(", ")} are invalid")
         end
       end
     end

data/lib/json_skooma/keywords/applicator/property_names.rb

@@ -10,7 +10,7 @@ module JSONSkooma
 
         def evaluate(instance, result)
           error = []
-          instance.each do |name,|
+          instance.each_key do |name|
             next if json.evaluate(JSONNode.new(name, key: name, parent: instance), result).passed?
 
             error << name

data/lib/json_skooma/keywords/core/ref.rb

@@ -7,28 +7,13 @@ module JSONSkooma
         self.key = "$ref"
 
         def resolve
-          uri = resolve_uri
-          @ref_schema = parent_schema.registry.schema(
-            uri,
-            metaschema_uri: parent_schema.metaschema_uri,
-            cache_id: parent_schema.cache_id
-          )
+          @ref_schema = parent_schema.resolve_ref(json)
         end
 
         def evaluate(instance, result)
           @ref_schema.evaluate(instance, result)
           result.ref_schema = @ref_schema
         end
-
-        private
-
-        def resolve_uri
-          uri = URI.parse(json)
-          return uri if uri.absolute?
-          return parent_schema.base_uri + uri if parent_schema.base_uri
-
-          raise Error, "No base URI against which to resolve the `$ref` value `#{uri}`"
-        end
       end
     end
   end

data/lib/json_skooma/keywords/draft_2019_09/items.rb

@@ -22,7 +22,7 @@ module JSONSkooma
             annotation = nil
             error = []
 
-            instance.take(json.length).each_with_index do |item, index|
+            instance.take(json.value.length).each_with_index do |item, index|
               annotation = index
               result.call(item, index.to_s) do |subresult|
                 unless json[index].evaluate(item, subresult).passed?

data/lib/json_skooma/keywords/draft_2019_09/unevaluated_items.rb

@@ -10,23 +10,19 @@ module JSONSkooma
         self.depends_on = %w[
           items additionalItems
           if then else allOf anyOf oneOf not
+          $ref $dynamicRef $recursiveRef
         ]
 
+        LOOKUP_KEYWORDS = %w[items additionalItems unevaluatedItems].freeze
+
         def evaluate(instance, result)
           last_evaluated_item = -1
 
-          result.parent.collect_annotations(instance, "items") do |i|
+          result.parent.collect_annotations(instance, keys: LOOKUP_KEYWORDS) do |node|
+            i = node.annotation
             next result.discard if i == true
 
-            last_evaluated_item = i if i > last_evaluated_item
-          end
-
-          result.parent.collect_annotations(instance, "additionalItems") do |i|
-            next result.discard if i == true
-          end
-
-          result.parent.collect_annotations(instance, "unevaluatedItems") do |i|
-            next result.discard if i == true
+            last_evaluated_item = i if node.key == "items" && i > last_evaluated_item
           end
 
           annotation = nil

data/lib/json_skooma/keywords/draft_2019_09/unevaluated_properties.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module JSONSkooma
+  module Keywords
+    module Draft201909
+      class UnevaluatedProperties < Base
+        self.key = "unevaluatedProperties"
+        self.instance_types = %w[object]
+        self.value_schema = :schema
+        self.depends_on = %w[
+          properties patternProperties additionalProperties
+          if then else dependentSchemas allOf anyOf oneOf not
+          $ref $dynamicRef $recursiveRef
+        ]
+
+        LOOKUP_KEYWORDS = %w[properties patternProperties additionalProperties unevaluatedProperties].freeze
+
+        def evaluate(instance, result)
+          evaluated_names = Set.new
+          result.parent.collect_annotations(instance, keys: LOOKUP_KEYWORDS) do |node|
+            evaluated_names += node.annotation
+          end
+
+          annotation = []
+          error = []
+          instance.each do |name, item|
+            next if evaluated_names.include?(name)
+
+            if json.evaluate(item, result).passed?
+              annotation << name
+            else
+              error << name
+              # reset to success for the next iteration
+              result.success
+            end
+          end
+
+          return result.failure(error) if error.any?
+
+          result.annotate(annotation)
+        end
+      end
+    end
+  end
+end

data/lib/json_skooma/keywords/unevaluated/unevaluated_items.rb

@@ -10,27 +10,24 @@ module JSONSkooma
         self.depends_on = %w[
           prefixItems items contains
           if then else allOf anyOf oneOf not
+          $ref $dynamicRef
         ]
 
+        LOOKUP_KEYWORDS = %w[items unevaluatedItems prefixItems contains].freeze
+
         def evaluate(instance, result)
+          contains_indices = Set.new
           last_evaluated_item = -1
 
-          result.parent.collect_annotations(instance, "prefixItems") do |i|
-            next result.discard if i == true
-
-            last_evaluated_item = i if i > last_evaluated_item
-          end
+          result.parent.collect_annotations(instance, keys: LOOKUP_KEYWORDS) do |node|
+            next contains_indices += node.annotation if node.key == "contains"
 
-          result.parent.collect_annotations(instance, "items") do |i|
+            i = node.annotation
             next result.discard if i == true
-          end
 
-          result.parent.collect_annotations(instance, "unevaluatedItems") do |i|
-            next result.discard if i == true
+            last_evaluated_item = i if node.key == "prefixItems" && i > last_evaluated_item
           end
 
-          contains_indices = Set.new
-          result.parent.collect_annotations(instance, "contains") { |i| contains_indices += Set.new(i) }
           annotation = nil
           error = []
 

data/lib/json_skooma/keywords/unevaluated/unevaluated_properties.rb

@@ -10,14 +10,16 @@ module JSONSkooma
         self.depends_on = %w[
           properties patternProperties additionalProperties
           if then else dependentSchemas allOf anyOf oneOf not
+          $ref $dynamicRef
         ]
 
+        LOOKUP_KEYWORDS = %w[properties patternProperties additionalProperties unevaluatedProperties].freeze
+
         def evaluate(instance, result)
           evaluated_names = Set.new
-          result.parent.collect_annotations(instance, "properties") { |name| evaluated_names += Set.new(name) }
-          result.parent.collect_annotations(instance, "patternProperties") { |name| evaluated_names += Set.new(name) }
-          result.parent.collect_annotations(instance, "additionalProperties") { |name| evaluated_names += Set.new(name) }
-          result.parent.collect_annotations(instance, "unevaluatedProperties") { |name| evaluated_names += Set.new(name) }
+          result.parent.collect_annotations(instance, keys: LOOKUP_KEYWORDS) do |node|
+            evaluated_names += node.annotation
+          end
 
           annotation = []
           error = []

data/lib/json_skooma/keywords/validation/const.rb

@@ -9,7 +9,7 @@ module JSONSkooma
         def evaluate(instance, result)
           return if instance == json
 
-          result.failure("The instance value #{instance.value.inspect} must be equal to the defined constant #{json.value.inspect}")
+          result.failure("The instance value #{instance.value} must be equal to the defined constant #{json.value}")
         end
       end
     end

data/lib/json_skooma/keywords/validation/enum.rb

@@ -10,7 +10,7 @@ module JSONSkooma
           return if json.include?(instance)
 
           result.failure(
-            "The instance value #{instance.value.inspect} must be equal to one of the elements in the defined enumeration: #{json.value}"
+            "The instance value #{instance.value} must be equal to one of the elements in the defined enumeration: #{json.value.join(", ")}"
           )
         end
       end

data/lib/json_skooma/keywords/validation/minimum.rb

@@ -8,7 +8,7 @@ module JSONSkooma
         self.instance_types = "number"
 
         def evaluate(instance, result)
-          if instance < json
+          if instance < json.value
             result.failure("The value may not be less than #{json.value})")
           end
         end

data/lib/json_skooma/keywords/validation/required.rb

@@ -8,10 +8,9 @@ module JSONSkooma
         self.instance_types = "object"
 
         def evaluate(instance, result)
-          missing_keys = json - instance.keys
-          return if missing_keys.empty?
+          return if json.value.all? { |val| instance.key?(val) }
 
-          result.failure("The object is missing required properties #{json.value}")
+          result.failure("The object is missing required properties #{json.value.join(", ")}")
         end
       end
     end

data/lib/json_skooma/metaschema.rb

@@ -21,7 +21,7 @@ module JSONSkooma
     def bootstrap(value)
       super
 
-      kw = Keywords::Core::Vocabulary.new(self, value.fetch("$vocabulary", default_vocabulary_urls))
+      kw = Keywords::Core::Vocabulary.new(self, value.fetch("$vocabulary") { default_vocabulary_urls })
       add_keyword(kw) if value.key?("$vocabulary")
     end
 

data/lib/json_skooma/result.rb

@@ -4,36 +4,68 @@ module JSONSkooma
   class Result
     attr_writer :ref_schema
 
-    attr_reader :children, :path, :relative_path, :schema, :instance, :parent, :annotation, :error, :key, :root
+    attr_reader :schema, :instance, :parent, :annotation, :error, :key
 
     def initialize(schema, instance, parent: nil, key: nil)
-      @schema = schema
-      @instance = instance
+      reset_with(instance, key, parent, schema)
+    end
+
+    def children
+      @children ||= {}
+    end
+
+    def each_children
+      children.each_value do |child|
+        child.each_value do |grandchild|
+          yield grandchild
+        end
+      end
+    end
+
+    def path
+      @path ||= @parent.nil? ? JSONPointer.new([]) : parent.path.child(key)
+    end
+
+    def relative_path
+      @relative_path ||=
+        if @parent.nil?
+          JSONPointer.new([])
+        elsif schema.equal?(parent.schema)
+          parent.relative_path.child(key)
+        else
+          JSONPointer.new_root(key)
+        end
+    end
+
+    def root
+      @root ||= parent&.root || self
+    end
+
+    def reset_with(instance, key, parent, schema = nil)
+      @schema = schema if schema
       @parent = parent
-      @root = parent&.root || self
       @key = key
-      @children = {}
       @valid = true
-      if parent.nil?
-        @path = JSONPointer.new([])
-        @relative_path = JSONPointer.new([])
-      else
-        @path = parent.path.child(key)
-        @relative_path =
-          if schema.equal?(parent.schema)
-            parent.relative_path.child(key)
-          else
-            JSONPointer.new_root(key)
-          end
-      end
+      @instance = instance
+
+      @children = nil
+      @annotation = nil
+      @discard = false
+      @skip_assertion = false
+      @error = nil
+      @path = nil
+      @ref_schema = nil
+      @relative_path = nil
     end
 
-    def call(instance, key, schema = nil, subclass: self.class)
-      child = subclass.new(schema || @schema, instance, parent: self, key: key)
+    def call(instance, key, schema = nil)
+      child = dup
+      child.reset_with(instance, key, self, schema)
 
       yield child
 
-      @children[[key, instance.path]] = child unless child.discard?
+      return if child.discard?
+      (children[instance.path] ||= {})[key] = child
     end
 
     def schema_node
@@ -41,7 +73,7 @@ module JSONSkooma
     end
 
     def sibling(instance, key)
-      @parent.children[[key, instance.path]] if @parent
+      @parent&.children&.dig(instance.path, key)
     end
 
     def annotate(value)
@@ -86,34 +118,36 @@ module JSONSkooma
       schema.canonical_uri.dup.tap { |u| u.fragment = path.to_s }
     end
 
-    def collect_annotations(instance = nil, key = nil)
+    def collect_annotations(instance, key: nil, keys: nil)
       return if !valid? || discard?
 
       if @annotation &&
           (key.nil? || key == @key) &&
-          (instance.nil? || instance.path == @instance.path)
-        yield @annotation
+          (keys.nil? || keys.include?(@key)) &&
+          (instance.path == @instance.path)
+        yield self
       end
 
-      @children.each do |_, child|
-        child.collect_annotations(instance, key) do |annotation|
-          yield annotation
+      children[instance.path]&.each_value do |child|
+        child.collect_annotations(instance, key: key, keys: keys) do |node|
+          yield node
         end
       end
     end
 
-    def collect_errors(instance: nil, key: nil)
+    def collect_errors(instance, key: nil, keys: nil)
       return if valid? || discard?
 
       if @error &&
           (key.nil? || key == @key) &&
-          (instance.nil? || instance.path == @instance.path)
-        yield @error
+          (keys.nil? || keys.include?(@key)) &&
+          (instance.path == @instance.path)
+        yield self
       end
 
-      @children.each do |_, child|
-        child.collect_errors(instance, key) do |error|
-          yield error
+      children[instance.path]&.each_value do |child|
+        child.collect_errors(instance, key: key, keys: keys) do |node|
+          yield node
         end
       end
     end
@@ -121,5 +155,9 @@ module JSONSkooma
     def output(format, **options)
       Formatters[format].call(self, **options)
     end
+
+    def to_s
+      output(:simple)
+    end
   end
 end

data/lib/json_skooma/validators/idn_hostname.rb

@@ -6,7 +6,8 @@ module JSONSkooma
   module Validators
     class IdnHostname < Base
       def call(data)
-        URI::IDNA.register(ulabel: data.value)
+        register_opts = data.value.ascii_only? ? {alabel: data.value} : {ulabel: data.value}
+        URI::IDNA.register(**register_opts)
       rescue URI::IDNA::Error => e
         raise FormatError, "#{data} is not a valid IDN hostname: #{e.message}"
       end

data/lib/json_skooma/validators/ipv4.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require "ipaddr"
-
 module JSONSkooma
   module Validators
     class Ipv4 < Base
-      self.class
+      IPV4_ADDRESS = /((25[0-5]|(2[0-4]|1\d|[1-9])?\d)\.?\b){4}/
+      REGEXP = /\A#{IPV4_ADDRESS}\z/
 
       class << self
         def call(data)
-          ip = IPAddr.new "#{data.value}/24"
-          raise FormatError, "must be a valid IPv4 address" unless ip.ipv4?
-        rescue IPAddr::Error => e
-          raise FormatError, e.message
+          match = REGEXP.match(data)
+          raise FormatError, "must be a valid IPv4 address" if match.nil?
         end
       end
     end

data/lib/json_skooma/validators/ipv6.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require "ipaddr"
-
 module JSONSkooma
   module Validators
     class Ipv6 < Base
+      H16 = /\h{1,4}/
+      LS32 = /(?:#{H16}:#{H16})|#{Ipv4::IPV4_ADDRESS}/
+      IPV6_ADDRESS = /(?:#{H16}:){6}#{LS32}|::(?:#{H16}:){5}#{LS32}|(?:#{H16})?::(?:#{H16}:){4}#{LS32}|(?:(?:#{H16}:){0,1}#{H16})?::(?:#{H16}:){3}#{LS32}|(?:(?:#{H16}:){0,2}#{H16})?::(?:#{H16}:){2}#{LS32}|(?:(?:#{H16}:){0,3}#{H16})?::(?:#{H16}:){1}#{LS32}|(?:(?:#{H16}:){0,4}#{H16})?::#{LS32}|(?:(?:#{H16}:){0,5}#{H16})?::#{H16}|(?:(?:#{H16}:){0,6}#{H16})?::/.freeze
+
+      REGEXP = /\A#{IPV6_ADDRESS}\z/
+
       def call(data)
-        ip = IPAddr.new "#{data.value}/64"
-        raise FormatError, "must be a valid IPv6 address" unless ip.ipv6? && ip.zone_id.nil?
-      rescue IPAddr::Error => e
-        raise FormatError, e.message
+        match = REGEXP.match(data)
+        raise FormatError, "must be a valid IPv6 address" if match.nil?
       end
     end
   end

data/lib/json_skooma/validators/iri.rb

@@ -23,7 +23,7 @@ module JSONSkooma
       IPATH_OLD = /#{IPATH_ABEMPTY}|#{IPATH_ABSOLUTE}|#{IPATH_NOSCHEME}|#{IPATH_ROOTLESS}|/.freeze
 
       IREG_NAME = /(?:#{IUNRESERVED}|#{Uri::PCT_ENCODED}|#{Uri::SUB_DELIMS})*/.freeze
-      IHOST = /#{Uri::IP_LITERAL}|#{Uri::IPV4_ADDRESS}|#{IREG_NAME}/.freeze
+      IHOST = /#{Uri::IP_LITERAL}|#{Ipv4::IPV4_ADDRESS}|#{IREG_NAME}/.freeze
       IUSERINFO = /(?:#{IUNRESERVED}|#{Uri::PCT_ENCODED}|#{Uri::SUB_DELIMS}|:)*/.freeze
       IAUTHORITY = /(?:#{IUSERINFO}@)?#{IHOST}(?::#{Uri::PORT})?/.freeze
 

data/lib/json_skooma/validators/uri.rb

@@ -22,17 +22,12 @@ module JSONSkooma
       PATH_ROOTLESS = /#{SEGMENT_NZ}(?:\/#{SEGMENT})*/.freeze
       PATH = /(?:#{PATH_ABEMPTY}|#{PATH_ABSOLUTE}|#{PATH_NOSCHEME}|#{PATH_ROOTLESS})?/.freeze
 
-      IPV4_ADDRESS = /((25[0-5]|(2[0-4]|1\d|[1-9])?\d)\.?\b){4}/
-      H16 = /\h{1,4}/
-      LS32 = /(?:#{H16}:#{H16})|#{IPV4_ADDRESS}/
-      IPV6_ADDRESS = /(?:#{H16}:){6}#{LS32}|::(?:#{H16}:){5}#{LS32}|(?:#{H16})?::(?:#{H16}:){4}#{LS32}|(?:(?:#{H16}:){0,1}#{H16})?::(?:#{H16}:){3}#{LS32}|(?:(?:#{H16}:){0,2}#{H16})?::(?:#{H16}:){2}#{LS32}|(?:(?:#{H16}:){0,3}#{H16})?::(?:#{H16}:){1}#{LS32}|(?:(?:#{H16}:){0,4}#{H16})?::#{LS32}|(?:(?:#{H16}:){0,5}#{H16})?::#{H16}|(?:(?:#{H16}:){0,6}#{H16})?::/.freeze
-
       IPV_FUTURE = /v\h+\.(?:#{UNRESERVED}|#{SUB_DELIMS}|:)+/.freeze
-      IP_LITERAL = /\[(?:#{IPV6_ADDRESS}|#{IPV_FUTURE})\]/.freeze
+      IP_LITERAL = /\[(?:#{Ipv6::IPV6_ADDRESS}|#{IPV_FUTURE})\]/.freeze
 
       PORT = /\d*/.freeze
       REG_NAME = /(?:#{UNRESERVED}|#{PCT_ENCODED}|#{SUB_DELIMS})*/.freeze
-      HOST = /(?:#{IP_LITERAL}|#{IPV4_ADDRESS}|#{REG_NAME})/.freeze
+      HOST = /(?:#{IP_LITERAL}|#{Ipv4::IPV4_ADDRESS}|#{REG_NAME})/.freeze
       USERINFO = /(?:#{UNRESERVED}|#{PCT_ENCODED}|#{SUB_DELIMS}|:)*/.freeze
       AUTHORITY = /(?:#{USERINFO}@)?#{HOST}(?::#{PORT})?/.freeze
 

data/lib/json_skooma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONSkooma
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/json_skooma.rb

@@ -6,7 +6,7 @@ require "zeitwerk"
 require_relative "json_skooma/inflector"
 
 loader = Zeitwerk::Loader.for_gem
-loader.inflector = JSONSkooma::Inflector.new
+loader.inflector = JSONSkooma::Inflector.new(__FILE__)
 loader.setup
 
 module JSONSkooma

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_skooma
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -58,17 +58,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 description: I bring some sugar for your JSONs.
 email:
-- s.g.kryukov@yandex.ru
+- me@skryukov.dev
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -152,6 +152,7 @@ files:
 - lib/json_skooma/keywords/draft_2019_09/recursive_anchor.rb
 - lib/json_skooma/keywords/draft_2019_09/recursive_ref.rb
 - lib/json_skooma/keywords/draft_2019_09/unevaluated_items.rb
+- lib/json_skooma/keywords/draft_2019_09/unevaluated_properties.rb
 - lib/json_skooma/keywords/format_annotation/format.rb
 - lib/json_skooma/keywords/meta_data/default.rb
 - lib/json_skooma/keywords/meta_data/deprecated.rb
@@ -184,7 +185,6 @@ files:
 - lib/json_skooma/keywords/validation/type.rb
 - lib/json_skooma/keywords/validation/unique_items.rb
 - lib/json_skooma/keywords/value_schemas.rb
-- lib/json_skooma/memoizable.rb
 - lib/json_skooma/metaschema.rb
 - lib/json_skooma/registry.rb
 - lib/json_skooma/result.rb

data/lib/json_skooma/memoizable.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module JSONSkooma
-  module Memoizable
-    def self.included(base)
-      base.extend(Memoizable)
-    end
-
-    def memoize(method_name)
-      this = respond_to?(:prepend) ? self : singleton_class
-      var_name = "@memoized_#{method_name}"
-      this.prepend(Module.new do
-        define_method(method_name) do
-          return instance_variable_get(var_name) if instance_variable_defined?(var_name)
-
-          instance_variable_set(var_name, super())
-        end
-      end)
-    end
-  end
-end