json-schema 4.1.1 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b6a5072f20570ae4262df13648a1b637b5db2c02cf881c2728277ea5a203f6d
-  data.tar.gz: 4b92633224b1338d58918e7a2d2f5d3e117fee03409455d6f47ea51c8bef7b18
+  metadata.gz: 9c842fa3f98c7ebbdde9ebdbceb44bb1eab1f282f6a5c6c0008e0aac0eca92b6
+  data.tar.gz: d6f98215e98ce89c007d158594078d7135574543c10a82e953dcb3feed6dc9fb
 SHA512:
-  metadata.gz: 9b5301a03a3fb7d3a43c275858df22d41cface2a465ff2fcfda28c9528f491e6a8f302fbbf52232de68e31d6a32540b9ad8a392fab82ec2b2113980e83119b72
-  data.tar.gz: 16f57a870e6b75280f5376d57785ad94500cbfd50bc3ea9ba01df486d0938c36907114780bacfc4860359e73d7adf87ce5c73205ef52ebea1f829b64d7630906
+  metadata.gz: f744aa3ddcf37191afd16c7424b97d4e610f5da6f0c5ccbdad8fdcc10ee95f1d130f165142da95394ea09a758907b6bf6157343a1796477ed75a340c17217b65
+  data.tar.gz: 1a0d01bfb3595f4286603e9c31d3c578aff55b4abc37952c41e448d02a7ea22c37a7ba5bc8cbb85809f4395992b0da8c73ec79109e6d15338b8802cf96465dbb

data/README.md

@@ -1,6 +1,6 @@
 # Ruby JSON Schema Validator
 
-[![License](https://img.shields.io/github/license/voxpupuli/json-schema.svg)](https://github.com/voxpupuli/json-schema/blob/master/LICENSE)
+[![License](https://img.shields.io/github/license/voxpupuli/json-schema.svg)](https://github.com/voxpupuli/json-schema/blob/master/LICENSE.md)
 [![Test](https://github.com/voxpupuli/json-schema/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/json-schema/actions/workflows/test.yml)
 [![Release](https://github.com/voxpupuli/json-schema/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/json-schema/actions/workflows/release.yml)
 [![RubyGem Version](https://img.shields.io/gem/v/json-schema.svg)](https://rubygems.org/gems/json-schema)
@@ -80,7 +80,7 @@ that the `$schema` attribute takes precedence over the `:version` option during
 parsing and validation.
 
 For further information on json schema itself refer to <a
-href="http://spacetelescope.github.io/understanding-json-schema/">Understanding
+href="https://json-schema.org/understanding-json-schema">Understanding
 JSON Schema</a>.
 
 Basic Usage
@@ -505,7 +505,7 @@ Existing pull requests and issues were transferred, please fork and continue to
 
 # License
 
-This gem is licensed unter the [MIT license](LICENSE.md).
+This gem is licensed under the [MIT license](LICENSE.md).
 
 ## Release information
 

data/lib/json-schema/attributes/extends.rb

@@ -12,7 +12,7 @@ module JSON
           if schema
             schema.validate(data, fragments, processor, options)
           elsif uri
-            message = "The extended schema '#{uri.to_s}' cannot be found"
+            message = "The extended schema '#{uri}' cannot be found"
             validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
           else
             message = "The property '#{build_fragment(fragments)}' was not a valid schema"

data/lib/json-schema/attributes/patternproperties.rb

@@ -10,7 +10,7 @@ module JSON
           regexp = Regexp.new(property)
 
           # Check each key in the data hash to see if it matches the regex
-          data.each do |key, value|
+          data.each do |key, _value|
             next unless regexp.match(key)
 
             schema = JSON::Schema.new(property_schema, current_schema.uri, validator)

data/lib/json-schema/attributes/properties.rb

@@ -36,12 +36,12 @@ module JSON
         # When noAdditionalProperties is true, ensure no undefined properties exist in the data
         return unless options[:noAdditionalProperties] == true && !schema.key?('additionalProperties')
 
-        diff = data.select do |k, v|
+        diff = data.select do |k, _v|
           k = k.to_s
 
           if schema.has_key?('patternProperties')
             match = false
-            schema['patternProperties'].each do |property, property_schema|
+            schema['patternProperties'].each do |property, _property_schema|
               regexp = Regexp.new(property)
               if regexp.match(k)
                 match = true

data/lib/json-schema/attributes/ref.rb

@@ -11,7 +11,7 @@ module JSON
         if schema
           schema.validate(data, fragments, processor, options)
         elsif uri
-          message = "The referenced schema '#{uri.to_s}' cannot be found"
+          message = "The referenced schema '#{uri}' cannot be found"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
         else
           message = "The property '#{build_fragment(fragments)}' was not a valid schema"
@@ -44,7 +44,7 @@ module JSON
               end
               fragment_path = fragment_path + "/#{fragment}"
               if target_schema.nil?
-                raise SchemaError, "The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri.to_s}"
+                raise SchemaError, "The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri}"
               end
             end
           end

data/lib/json-schema/attributes/required.rb

@@ -9,7 +9,7 @@ module JSON
         schema = current_schema.schema
         defined_properties = schema['properties']
 
-        schema['required'].each do |property, property_schema|
+        schema['required'].each do |property, _property_schema|
           next if data.has_key?(property.to_s)
 
           prop_defaults = options[:insert_defaults] &&

data/lib/json-schema/errors/validation_error.rb

@@ -20,7 +20,7 @@ module JSON
           messages = ["#{message}. The schema specific errors were:\n"]
           @sub_errors.each do |subschema, errors|
             messages.push "- #{subschema}:"
-            messages.concat Array(errors).map { |e| "#{INDENT}- #{e.to_string(subschema_level + 1)}" }
+            messages.concat(Array(errors).map { |e| "#{INDENT}- #{e.to_string(subschema_level + 1)}" })
           end
           messages.map { |m| (INDENT * subschema_level) + m }.join("\n")
         end

data/lib/json-schema/schema/validator.rb

@@ -20,7 +20,7 @@ module JSON
       end
 
       def validate(current_schema, data, fragments, processor, options = {})
-        current_schema.schema.each do |attr_name, attribute|
+        current_schema.schema.each do |attr_name, _attribute|
           if @attributes.has_key?(attr_name.to_s)
             @attributes[attr_name.to_s].validate(current_schema, data, fragments, processor, self, options)
           end

data/lib/json-schema/schema.rb

@@ -35,7 +35,7 @@ module JSON
     def self.stringify(schema)
       case schema
       when Hash then
-        schema.map { |key, value| [key.to_s, stringify(schema[key])] }.to_h
+        schema.map { |key, _value| [key.to_s, stringify(schema[key])] }.to_h
       when Array then
         schema.map do |schema_item|
           stringify(schema_item)

data/lib/json-schema/util/uri.rb

@@ -1,109 +1,132 @@
+# frozen_string_literal: true
+
 require 'addressable/uri'
 
 module JSON
   module Util
-    module URI
+    # @api private
+    class URI < Addressable::URI
       SUPPORTED_PROTOCOLS = %w(http https ftp tftp sftp ssh svn+ssh telnet nntp gopher wais ldap prospero)
 
-      def self.normalized_uri(uri, base_path = Dir.pwd)
-        @normalize_cache ||= {}
-        normalized_uri = @normalize_cache[uri]
-
-        if !normalized_uri
-          normalized_uri = parse(uri)
-          # Check for absolute path
-          if normalized_uri.relative?
-            data = normalized_uri
-            data = File.join(base_path, data) if data.path[0, 1] != '/'
-            normalized_uri = file_uri(data)
-          end
-          @normalize_cache[uri] = normalized_uri.freeze
-        end
-
-        normalized_uri
-      end
+      class << self
+        alias unescape_uri unescape
 
-      def self.absolutize_ref(ref, base)
-        ref_uri = strip_fragment(ref.dup)
-
-        return ref_uri if ref_uri.absolute?
-        return parse(base) if ref_uri.path.empty?
+        # @param uri [String, Addressable::URI]
+        # @return [Addressable::URI, nil]
+        def parse(uri)
+          super(uri)
+        rescue Addressable::URI::InvalidURIError => e
+          raise JSON::Schema::UriError, e.message
+        end
 
-        uri = strip_fragment(base.dup).join(ref_uri.path)
-        normalized_uri(uri)
-      end
+        # @param uri [String, Addressable::URI]
+        # @return [Addressable::URI, nil]
+        def file_uri(uri)
+          convert_path(parse(uri).path)
+        end
 
-      def self.normalize_ref(ref, base)
-        ref_uri = parse(ref)
-        base_uri = parse(base)
+        # @param uri [String, Addressable::URI
+        # @return [String]
+        def unescaped_path(uri)
+          parse(uri).unescaped_path
+        end
 
-        ref_uri.defer_validation do
-          if ref_uri.relative?
-            ref_uri.merge!(base_uri)
+        # Strips the fragment from the URI.
+        # @param uri [String, Addressable::URI]
+        # @return [Addressable::URI]
+        def strip_fragment(uri)
+          parse(uri).strip_fragment
+        end
 
-            # Check for absolute path
-            path, fragment = ref.to_s.split('#')
-            if path.nil? || path == ''
-              ref_uri.path = base_uri.path
-            elsif path[0, 1] == '/'
-              ref_uri.path = Pathname.new(path).cleanpath.to_s
-            else
-              ref_uri.join!(path)
-            end
+        # @param uri [String, Addressable::URI]
+        # @return [Addressable::URI]
+        def normalized_uri(uri, base_path = Dir.pwd)
+          parse(uri).normalized_uri(base_path)
+        end
 
-            ref_uri.fragment = fragment
-          end
+        # Normalizes the reference URI based on the provided base URI
+        #
+        # @param ref [String, Addressable::URI]
+        # @param base [String, Addressable::URI]
+        # @return [Addressable::URI]
+        def normalize_ref(ref, base)
+          parse(ref).normalize_ref(base)
+        end
 
-          ref_uri.fragment = '' if ref_uri.fragment.nil? || ref_uri.fragment.empty?
+        def absolutize_ref(ref, base)
+          parse(ref).absolutize_ref(base)
         end
+      end
 
-        ref_uri
+      # Unencodes any percent encoded characters within a path component.
+      #
+      # @return [String]
+      def unescaped_path
+        self.class.unescape_component(path)
       end
 
-      def self.parse(uri)
-        if uri.is_a?(Addressable::URI)
-          uri.dup
+      # Strips the fragment from the URI.
+      # @return [Addressable::URI] a new instance of URI without a fragment
+      def strip_fragment
+        if fragment.nil? || fragment.empty?
+          self
         else
-          @parse_cache ||= {}
-          parsed_uri = @parse_cache[uri]
-          if parsed_uri
-            parsed_uri.dup
-          else
-            @parse_cache[uri] = Addressable::URI.parse(uri)
-          end
+          merge(fragment: '')
         end
-      rescue Addressable::URI::InvalidURIError => e
-        raise JSON::Schema::UriError, e.message
       end
 
-      def self.strip_fragment(uri)
-        parsed_uri = parse(uri)
-        if parsed_uri.fragment.nil? || parsed_uri.fragment.empty?
-          parsed_uri
+      # Normalizes the URI based on the provided base path.
+      #
+      # @param base_path [String] the base path to use for relative URIs. Defaults to the current working directory.
+      # @return [Addressable::URI] the normalized URI or nil
+      def normalized_uri(base_path = Dir.pwd)
+        if relative?
+          if path[0, 1] == '/'
+            self.class.file_uri(self)
+          else
+            self.class.file_uri(File.join(base_path, self))
+          end
         else
-          parsed_uri.merge(fragment: '')
+          self
         end
       end
 
-      def self.file_uri(uri)
-        parsed_uri = parse(uri)
+      # @param base [Addressable::URI, String]
+      # @return [Addressable::URI]
+      def normalize_ref(base)
+        base_uri = self.class.parse(base)
+        defer_validation do
+          if relative?
+            # Check for absolute path
+            path, fragment = to_s.split('#')
+            merge!(base_uri)
 
-        Addressable::URI.convert_path(parsed_uri.path)
-      end
+            if path.nil? || path == ''
+              self.path = base_uri.path
+            elsif path[0, 1] == '/'
+              self.path = Pathname.new(path).cleanpath.to_s
+            else
+              join!(path)
+            end
 
-      def self.unescape_uri(uri)
-        Addressable::URI.unescape(uri)
-      end
+            self.fragment = fragment
+          end
 
-      def self.unescaped_path(uri)
-        parsed_uri = parse(uri)
+          self.fragment = '' if self.fragment.nil? || self.fragment.empty?
+        end
 
-        Addressable::URI.unescape(parsed_uri.path)
+        self
       end
 
-      def self.clear_cache
-        @parse_cache = {}
-        @normalize_cache = {}
+      # @param base [Addressable::URI, String]
+      # @return [Addressable::URI]
+      def absolutize_ref(base)
+        ref = strip_fragment
+        if ref.absolute?
+          ref
+        else
+          self.class.strip_fragment(base).join(ref.path).normalized_uri
+        end
       end
     end
   end

data/lib/json-schema/util/uuid.rb

@@ -36,8 +36,7 @@ module JSON
       private_class_method :new
 
       class << self
-        # :nodoc
-        def mask19 v, str
+        def mask v, str
           nstr = str.bytes.to_a
           version = [0, 16, 32, 48, 64, 80][v]
           nstr[6] &= 0b00001111
@@ -46,31 +45,12 @@ module JSON
           # nstr[7] |= 0b01010000
           nstr[8] &= 0b00111111
           nstr[8] |= 0b10000000
-          str = ''
+          str = +''
           nstr.each { |s| str << s.chr }
           str
         end
 
-        # :nodoc
-        def mask18 v, str
-          version = [0, 16, 32, 48, 64, 80][v]
-          str[6] &= 0b00001111
-          str[6] |= version
-          # str[7] &= 0b00001111
-          # str[7] |= 0b01010000
-          str[8] &= 0b00111111
-          str[8] |= 0b10000000
-          str
-        end
-
-        def mask v, str
-          if RUBY_VERSION >= '1.9.0'
-            mask19 v, str
-          else
-            mask18 v, str
-          end
-        end
-        private :mask, :mask18, :mask19
+        private :mask
 
         # UUID generation using SHA1. Recommended over create_md5.
         # Namespace object is another UUID, some of them are pre-defined below.
@@ -153,14 +133,10 @@ module JSON
               str = sha1.digest
               r = rand 14 # 20-6
               node = str[r, 6] || str
-              if RUBY_VERSION >= '1.9.0'
-                nnode = node.bytes.to_a
-                nnode[0] |= 0x01
-                node = ''
-                nnode.each { |s| node << s.chr }
-              else
-                node[0] |= 0x01 # multicast bit
-              end
+              nnode = node.bytes.to_a
+              nnode[0] |= 0x01
+              node = ''
+              nnode.each { |s| node << s.chr }
               k = rand 0x40000
               open STATE_FILE, 'w' do |fp|
                 fp.flock IO::LOCK_EX
@@ -177,7 +153,7 @@ module JSON
               if t.nil? then
                 # UUID epoch is 1582/Oct/15
                 tt = Time.now
-                t = tt.to_i * 10000000 + tt.tv_usec * 10 + 0x01B21DD213814000
+                t = (tt.to_i * 10000000) + (tt.tv_usec * 10) + 0x01B21DD213814000
               end
               c = c.succ # important; increment here
               write_state fp, c, m
@@ -244,7 +220,7 @@ module JSON
       def to_int
         tmp = raw_bytes.unpack 'C*'
         tmp.inject do |r, i|
-          r * 256 | i
+          (r * 256) | i
         end
       end
       alias to_i to_int
@@ -260,7 +236,7 @@ module JSON
       end
 
       # Two  UUIDs  are  said  to  be  equal if  and  only  if  their  (byte-order
-      # canonicalized) integer representations are equivallent.  Refer RFC4122 for
+      # canonicalized) integer representations are equivalent.  Refer RFC4122 for
       # details.
       def == other
         to_i == other.to_i

data/lib/json-schema/validator.rb

@@ -5,6 +5,7 @@ require 'digest/sha1'
 require 'date'
 require 'thread'
 require 'timeout'
+require 'stringio'
 require 'yaml'
 
 require 'json-schema/schema/reader'
@@ -179,7 +180,7 @@ module JSON
       %w[definitions properties patternProperties].each do |key|
         next unless value = schema[key]
 
-        value.each do |k, inner_schema|
+        value.each do |_k, inner_schema|
           handle_schema(parent_schema, inner_schema)
         end
       end
@@ -299,7 +300,6 @@ module JSON
 
       def clear_cache
         @@schemas = {}
-        JSON::Util::URI.clear_cache
       end
 
       def schemas
@@ -377,7 +377,7 @@ module JSON
         @@default_validator = v
       end
 
-      def register_format_validator(format, validation_proc, versions = (@@validators.flat_map { |k, v| v.names.first } + [nil]))
+      def register_format_validator(format, validation_proc, versions = (@@validators.flat_map { |_k, v| v.names.first } + [nil]))
         custom_format_validator = JSON::Schema::CustomFormat.new(validation_proc)
         versions.each do |version|
           validator = validator_for_name(version)
@@ -385,14 +385,14 @@ module JSON
         end
       end
 
-      def deregister_format_validator(format, versions = (@@validators.flat_map { |k, v| v.names.first } + [nil]))
+      def deregister_format_validator(format, versions = (@@validators.flat_map { |_k, v| v.names.first } + [nil]))
         versions.each do |version|
           validator = validator_for_name(version)
           validator.formats[format.to_s] = validator.default_formats[format.to_s]
         end
       end
 
-      def restore_default_formats(versions = (@@validators.flat_map { |k, v| v.names.first } + [nil]))
+      def restore_default_formats(versions = (@@validators.flat_map { |_k, v| v.names.first } + [nil]))
         versions.each do |version|
           validator = validator_for_name(version)
           validator.formats = validator.default_formats.clone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.1.1
 platform: ruby
 authors:
 - Kenny Hoxworth
@@ -9,78 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-15 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.23'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: 
 email: voxpupuli@groups.io
 executables: []
@@ -172,10 +186,14 @@ files:
 - resources/draft-03.json
 - resources/draft-04.json
 - resources/draft-06.json
-homepage: http://github.com/voxpupuli/json-schema/
+homepage: https://github.com/voxpupuli/json-schema/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/voxpupuli/json-schema/
+  changelog_uri: https://github.com/voxpupuli/json-schema//blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/voxpupuli/json-schema//issues
+  funding_uri: https://github.com/sponsors/voxpupuli
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -184,14 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Ruby JSON Schema Validator