json-schema 4.3.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbe37dbd0d05f133ae0158ff0c721f9baeca5b0c99bd7a7f449fee1dd86cc34
-  data.tar.gz: 68d4ffcaed1df4925aafe8eef95d346fa4707fb3452b8baef14f340eb7f63687
+  metadata.gz: c42ecb537bfb46692249a301cd3c0f6d8ad0a37588d572e2daaa7591a172bb5a
+  data.tar.gz: 304974463c21a8e456099e10b37dee2ab2f0936cea8f1a34b06143da0e1d84d0
 SHA512:
-  metadata.gz: 28f033e814cd2c139f0630b677b22f6bce0fdcfa06109f4827e3ad798bd24af3394c8ecf56b0a25ca8f58a2d0069ddefb7d6777929368bf3ce8d3d27e10f4a73
-  data.tar.gz: 87c9ff71b0f5c34adda4affe416603a1340e15b3ae7e9b7fb8172eb99d6fc185dfda920375fe4b4990263459ff6986888d4a8184313f824a487984f53731141f
+  metadata.gz: eb9b26e1e7251258d4af08666bad83904a362239f2dabecf4aaec3b3280a6d17d9aa7285faa47e84fa854504fe75b21a2a7ac607381bd047113ea1041fdef1ba
+  data.tar.gz: b17404fd2a367a562995aadb9882d3527098168a9e1689d2b231bf4f8e7b59b79aeba79f8525ceadffcd7fbe3d9a87297d23b7f6854f7c8fde29b59cda9867c0

data/README.md

@@ -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

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
@@ -51,26 +50,7 @@ module JSON
           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

data/lib/json-schema/validator.rb

@@ -300,7 +300,6 @@ module JSON
 
       def clear_cache
         @@schemas = {}
-        JSON::Util::URI.clear_cache
       end
 
       def schemas

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Kenny Hoxworth
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-08-19 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: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.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'
 description: 
@@ -178,7 +178,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/voxpupuli/json-schema/
   changelog_uri: https://github.com/voxpupuli/json-schema//blob/master/CHANGELOG.md
-  homepage_uri: https://github.com/voxpupuli/json-schema/
   bug_tracker_uri: https://github.com/voxpupuli/json-schema//issues
 post_install_message: 
 rdoc_options: []
@@ -188,14 +187,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.27
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Ruby JSON Schema Validator