json_skooma 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41c787af86379c5c95a01c3180116d12854d11ca7def23569967d35352998da2
-  data.tar.gz: 4f3fbca4d35931fe884598c1c827e4434102c25b76973293af31b2af5ce62371
+  metadata.gz: 9da78d5df937e93b851e37daf72770aeb62c61a09922232a2dc308533a4c5e36
+  data.tar.gz: 13759edb9c18994d8f315f740b37a5e32c4935415c0262292f77f6f52e648a30
 SHA512:
-  metadata.gz: bef3119c2f4de1880ebde8036ad6517154b82373c80896b7d3d97ce70cb0d39f5b4c458ca2836d8f23439dcde2965b62a61e02586d7d2dfc12892e1f64fef815
-  data.tar.gz: 5aadc6b0af540a0d7d5eacae5959f5051a7b932ce9d92bd049bd5348f6d67e1740bba94a9b51be325aace1cdd1c28bf0521a8d325f137f5207afa79b1dd4c0c3
+  metadata.gz: b5b8b57d54a71b2c75f85c4f4964757cce15acedbbc49d967ebcea2447a17dfd0acbd36441aafb647f4e744ae91b78e84917ff0a7964b584a157602797210655
+  data.tar.gz: 8435cc06b0e079f1980797b0b2cbf3a7d635bb78bcbab8431f7c4408b54e871ee2dd79bd37bf948653f5d9c1f87626618135894e54fef24135e162aca046f7e3

data/CHANGELOG.md

@@ -7,6 +7,13 @@ 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
@@ -30,7 +37,8 @@ and this project adheres to [Semantic Versioning].
 
 [@skryukov]: https://github.com/skryukov
 
-[Unreleased]: https://github.com/skryukov/json_skooma/compare/v0.2.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
 

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_children do |child|
+          node.each_children do |child|
             collect_nodes(child, valid, result)
           end
 

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

@@ -10,6 +10,7 @@ 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

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,6 +10,7 @@ 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

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

@@ -10,6 +10,7 @@ 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

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_skooma
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -58,14 +58,14 @@ 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:
 - me@skryukov.dev
@@ -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