json-schema 5.2.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a0cda95d4c1a12e6c74bc52da85bee95efe6918bc3c8a2364306c3875a34cd
-  data.tar.gz: b5b6750b3c5a116276b32352ad25676b45994bc668f8275bce0700804a55ee5b
+  metadata.gz: f59422377fa48d3a101aa046e33f7d58c8e07ac60e253dd85c92cdc9f62a5f28
+  data.tar.gz: c77a432690bf4ddd59c34fca91b78b902ac802ded9add8dcf671505b7f423309
 SHA512:
-  metadata.gz: 36b04ea4a0d91ff3f3814148b8375fdaea8cd0fc1787d6f3d2fed94ff6842810969421bf121e9adfe3105ed1ef4819e3944a695c6f88a4f62ba8e5aca8b9eef7
-  data.tar.gz: 9d14af644817dd7bba422920275e1f71ad6440bb4bd15fdd0fb007ee6361ce3c12228df987841640355be89da32e90934bea53215c72defa30d4922a5eb2a226
+  metadata.gz: b0c2b651991ff80dcfffaa360b2bb63e5b223acde172ed73435ed20edc8abada0b9c351cb042b0c03f20db08aa1f5eb09a20fc4b396b7296147e5680ca60f122
+  data.tar.gz: 695913ca06faf062d38e8b2b10c03f62cab6343b0d8b24b5b0f2d46a9b0f671dd5dd0f70cb137236661b637740da1353d8c10383029c62f2efce91906efe7350

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

@@ -30,7 +30,7 @@ module JSON
         schema = current_schema.schema
 
         if schema['properties']
-          extra_properties = extra_properties - schema['properties'].keys
+          extra_properties -= schema['properties'].keys
         end
 
         schema['patternProperties']&.each_key do |key|

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

@@ -32,7 +32,7 @@ module JSON
           diff = validation_errors(processor).count - pre_validation_error_count
 
           while diff > 0
-            diff = diff - 1
+            diff -= 1
             errors["allOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
         end
@@ -44,7 +44,7 @@ module JSON
           common_missing_properties = (all_property_errors.first || []).to_set
 
           all_property_errors[1..].each do |curr_property_errors|
-            common_missing_properties = common_missing_properties & curr_property_errors.to_set
+            common_missing_properties &= curr_property_errors.to_set
           end
         end
 

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

@@ -27,7 +27,7 @@ module JSON
           diff = validation_errors(processor).count - pre_validation_error_count
           valid = false if diff > 0
           while diff > 0
-            diff = diff - 1
+            diff -= 1
             errors["anyOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
 
@@ -36,7 +36,7 @@ module JSON
           data = original_data
         end
 
-        if !valid
+        unless valid
           message = "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match one or more of the required schemas"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
           validation_errors(processor).last.sub_errors = errors

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

@@ -6,7 +6,7 @@ module JSON
     class ExtendsAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         schemas = current_schema.schema['extends']
-        schemas = [schemas] if !schemas.is_a?(Array)
+        schemas = [schemas] unless schemas.is_a?(Array)
         schemas.each do |s|
           uri, schema = get_extended_uri_and_schema(s, current_schema, validator)
           if schema
@@ -22,7 +22,8 @@ module JSON
       end
 
       def self.get_extended_uri_and_schema(s, current_schema, validator)
-        uri, schema = nil, nil
+        uri = nil
+        schema = nil
 
         if s.is_a?(Hash)
           uri = current_schema.uri
@@ -30,7 +31,8 @@ module JSON
             ref_uri, ref_schema = JSON::Schema::RefAttribute.get_referenced_uri_and_schema(s, current_schema, validator)
             if ref_schema
               if s.size == 1 # Check if anything else apart from $ref
-                uri, schema = ref_uri, ref_schema
+                uri = ref_uri
+                schema = ref_schema
               else
                 s = s.dup
                 s.delete '$ref'

data/lib/json-schema/attributes/formats/custom.rb

@@ -9,12 +9,10 @@ module JSON
       end
 
       def validate(current_schema, data, fragments, processor, _validator, options = {})
-        begin
-          @validation_proc.call data
-        rescue JSON::Schema::CustomFormatError => e
-          message = "The property '#{self.class.build_fragment(fragments)}' #{e.message}"
-          self.class.validation_error(processor, message, fragments, current_schema, self.class, options[:record_errors])
-        end
+        @validation_proc.call data
+      rescue JSON::Schema::CustomFormatError => e
+        message = "The property '#{self.class.build_fragment(fragments)}' #{e.message}"
+        self.class.validation_error(processor, message, fragments, current_schema, self.class, options[:record_errors])
       end
     end
   end

data/lib/json-schema/attributes/formats/ip.rb

@@ -14,7 +14,7 @@ module JSON
           raise e unless e.message.start_with?('invalid address')
         end
 
-        family = ip_version == 6 ? Socket::AF_INET6 : Socket::AF_INET
+        family = (ip_version == 6) ? Socket::AF_INET6 : Socket::AF_INET
         unless ip && ip.family == family
           error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv#{ip_version} address"
           validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])

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

@@ -27,9 +27,9 @@ module JSON
 
           diff = validation_errors(processor).count - pre_validation_error_count
           valid = false if diff > 0
-          validation_error_count += 1 if !valid
+          validation_error_count += 1 unless valid
           while diff > 0
-            diff = diff - 1
+            diff -= 1
             errors["oneOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
           data = original_data

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

@@ -20,7 +20,8 @@ module JSON
       end
 
       def self.get_referenced_uri_and_schema(s, current_schema, validator)
-        uri, schema = nil, nil
+        uri = nil
+        schema = nil
 
         temp_uri = JSON::Util::URI.normalize_ref(s['$ref'], current_schema.uri)
 
@@ -35,17 +36,17 @@ module JSON
           fragments = JSON::Util::URI.parse(JSON::Util::URI.unescape_uri(temp_uri)).fragment.split('/')
           fragment_path = ''
           fragments.each do |fragment|
-            if fragment && fragment != ''
-              fragment = fragment.gsub('~0', '~').gsub('~1', '/')
-              target_schema = if target_schema.is_a?(Array)
-                                target_schema[fragment.to_i]
-                              else
-                                target_schema[fragment]
-                              end
-              fragment_path = fragment_path + "/#{fragment}"
-              if target_schema.nil?
-                raise SchemaError, "The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri}"
-              end
+            next unless fragment && fragment != ''
+
+            fragment = fragment.gsub('~0', '~').gsub('~1', '/')
+            target_schema = if target_schema.is_a?(Array)
+                              target_schema[fragment.to_i]
+                            else
+                              target_schema[fragment]
+                            end
+            fragment_path += "/#{fragment}"
+            if target_schema.nil?
+              raise SchemaError, "The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri}"
             end
           end
 

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

@@ -18,7 +18,7 @@ module JSON
                           !defined_properties[property]['default'].nil? &&
                           !defined_properties[property]['readonly']
 
-          if !prop_defaults
+          unless prop_defaults
             message = "The property '#{build_fragment(fragments)}' did not contain a required property of '#{property}'"
             validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
           end

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

@@ -11,7 +11,7 @@ module JSON
                   current_schema.schema['type']
                 end
 
-        if !types.is_a?(Array)
+        unless types.is_a?(Array)
           types = [types]
           union = false
         end
@@ -41,7 +41,7 @@ module JSON
             diff = validation_errors(processor).count - pre_validation_error_count
             valid = false if diff > 0
             while diff > 0
-              diff = diff - 1
+              diff -= 1
               union_errors["type ##{type_index}"].push(validation_errors(processor).pop)
             end
           end
@@ -50,7 +50,7 @@ module JSON
         end
 
         if options[:disallow]
-          return if !valid
+          return unless valid
 
           message = "The property '#{build_fragment(fragments)}' matched one or more of the following types: #{list_types(types)}"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])

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

@@ -6,7 +6,7 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         union = true
         types = current_schema.schema['type']
-        if !types.is_a?(Array)
+        unless types.is_a?(Array)
           types = [types]
           union = false
         end

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

@@ -16,7 +16,7 @@ module JSON
 
       def to_string(subschema_level = 0)
         if @sub_errors.empty?
-          subschema_level == 0 ? message_with_schema : message
+          (subschema_level == 0) ? message_with_schema : message
         else
           messages = ["#{message}. The schema specific errors were:\n"]
           @sub_errors.each do |subschema, errors|
@@ -29,7 +29,7 @@ module JSON
 
       def to_hash
         base = { schema: @schema.uri, fragment: ::JSON::Schema::Attribute.build_fragment(fragments), message: message_with_schema, failed_attribute: @failed_attribute.to_s.split(':').last.split('Attribute').first }
-        if !@sub_errors.empty?
+        unless @sub_errors.empty?
           base[:errors] = @sub_errors.each_with_object({}) do |(subschema, errors), hsh|
             subschema_sym = subschema.downcase.gsub(/\W+/, '_').to_sym
             hsh[subschema_sym] = Array(errors).map { |e| e.to_hash }

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

@@ -20,7 +20,7 @@ module JSON
       private
 
       def type_string
-        type == :uri ? 'URI' : type.to_s
+        (type == :uri) ? 'URI' : type.to_s
       end
     end
 

data/lib/json-schema/schema.rb

@@ -34,13 +34,13 @@ module JSON
 
     def self.stringify(schema)
       case schema
-      when Hash then
+      when Hash
         schema.map { |key, _value| [key.to_s, stringify(schema[key])] }.to_h
-      when Array then
+      when Array
         schema.map do |schema_item|
           stringify(schema_item)
         end
-      when Symbol then
+      when Symbol
         schema.to_s
       else
         schema

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

@@ -1,11 +1,9 @@
-require 'set'
-
 # This is a hack that I don't want to ever use anywhere else or repeat EVER, but we need enums to be
 # an Array to pass schema validation. But we also want fast lookup!
 
 class ArraySet < Array
   def include?(obj)
-    if !defined? @values
+    unless defined? @values
       @values = Set.new
       each { |x| @values << convert_to_float_if_numeric(x) }
     end

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

@@ -6,7 +6,7 @@ module JSON
   module Util
     # @api private
     class URI < Addressable::URI
-      SUPPORTED_PROTOCOLS = %w(http https ftp tftp sftp ssh svn+ssh telnet nntp gopher wais ldap prospero)
+      SUPPORTED_PROTOCOLS = %w[http https ftp tftp sftp ssh svn+ssh telnet nntp gopher wais ldap prospero]
 
       class << self
         alias unescape_uri unescape
@@ -14,7 +14,7 @@ module JSON
         # @param uri [String, Addressable::URI]
         # @return [Addressable::URI, nil]
         def parse(uri)
-          super(uri)
+          super
         rescue Addressable::URI::InvalidURIError => e
           raise JSON::Schema::UriError, e.message
         end

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

@@ -36,7 +36,7 @@ module JSON
       private_class_method :new
 
       class << self
-        def mask v, str
+        def mask(v, str)
           nstr = str.bytes.to_a
           version = [0, 16, 32, 48, 64, 80][v]
           nstr[6] &= 0b00001111
@@ -54,7 +54,7 @@ module JSON
 
         # UUID generation using SHA1. Recommended over create_md5.
         # Namespace object is another UUID, some of them are pre-defined below.
-        def create_sha1 str, namespace
+        def create_sha1(str, namespace)
           sha1 = Digest::SHA1.new
           sha1.update namespace.raw_bytes
           sha1.update str
@@ -67,7 +67,7 @@ module JSON
         alias create_v5 create_sha1
 
         # UUID generation using MD5 (for backward compat.)
-        def create_md5 str, namespace
+        def create_md5(str, namespace)
           md5 = Digest::MD5.new
           md5.update namespace.raw_bytes
           md5.update str
@@ -96,12 +96,12 @@ module JSON
         end
         alias create_v4 create_random
 
-        def read_state fp # :nodoc:
+        def read_state(fp) # :nodoc:
           fp.rewind
           Marshal.load fp.read
         end
 
-        def write_state fp, c, m # :nodoc:
+        def write_state(fp, c, m) # :nodoc:
           fp.rewind
           str = Marshal.dump [c, m]
           fp.write str
@@ -117,10 +117,10 @@ module JSON
         # invokation. If you want to speed  this up, try remounting tmpdir with a
         # memory based filesystem  (such as tmpfs).  STILL slow?  then no way but
         # rewrite it with c :)
-        def create clock = nil, time = nil, mac_addr = nil
+        def create(clock = nil, time = nil, mac_addr = nil)
           c = t = m = nil
           Dir.chdir Dir.tmpdir do
-            unless FileTest.exist? STATE_FILE then
+            unless FileTest.exist? STATE_FILE
               # Generate a pseudo MAC address because we have no pure-ruby way
               # to know  the MAC  address of the  NIC this system  uses.  Note
               # that cheating  with pseudo arresses here  is completely legal:
@@ -150,10 +150,10 @@ module JSON
               c = clock % 0x4000 if clock
               m = mac_addr if mac_addr
               t = time
-              if t.nil? then
+              if t.nil?
                 # UUID epoch is 1582/Oct/15
                 tt = Time.now
-                t = (tt.to_i * 10000000) + (tt.tv_usec * 10) + 0x01B21DD213814000
+                t = (tt.to_i * 10_000_000) + (tt.tv_usec * 10) + 0x01B21DD213814000
               end
               c = c.succ # important; increment here
               write_state fp, c, m
@@ -162,21 +162,21 @@ module JSON
 
           tl = t & 0xFFFF_FFFF
           tm = t >> 32
-          tm = tm & 0xFFFF
+          tm &= 0xFFFF
           th = t >> 48
-          th = th & 0x0FFF
-          th = th | 0x1000
+          th &= 0x0FFF
+          th |= 0x1000
           cl = c & 0xFF
           ch = c & 0x3F00
-          ch = ch >> 8
-          ch = ch | 0x80
+          ch >>= 8
+          ch |= 0x80
           pack tl, tm, th, cl, ch, m
         end
         alias create_v1 create
 
         # A  simple GUID  parser:  just ignores  unknown  characters and  convert
         # hexadecimal dump into 16-octet object.
-        def parse obj
+        def parse(obj)
           str = obj.to_s.sub(/\Aurn:uuid:/, '')
           str.gsub!(/[^0-9A-Fa-f]/, '')
           raw = str[0..31].lines.to_a.pack 'H*'
@@ -187,7 +187,7 @@ module JSON
 
         # The 'primitive constructor' of this class
         # Note UUID.pack(uuid.unpack) == uuid
-        def pack tl, tm, th, ch, cl, n
+        def pack(tl, tm, th, ch, cl, n)
           raw = [tl, tm, th, ch, cl, n].pack 'NnnCCa6'
           ret = new raw
           ret.freeze
@@ -238,13 +238,14 @@ module JSON
       # Two  UUIDs  are  said  to  be  equal if  and  only  if  their  (byte-order
       # canonicalized) integer representations are equivalent.  Refer RFC4122 for
       # details.
-      def == other
+      def ==(other)
         to_i == other.to_i
       end
 
       include Comparable
+
       # UUIDs are comparable (don't know what benefits are there, though).
-      def <=> other
+      def <=>(other)
         to_s <=> other.to_s
       end
 

data/lib/json-schema/validator.rb

@@ -188,11 +188,11 @@ module JSON
 
       # Check for schemas in union types
       %w[type disallow].each do |key|
-        if schema[key].is_a?(Array)
-          schema[key].each do |type|
-            if type.is_a?(Hash)
-              handle_schema(parent_schema, type)
-            end
+        next unless schema[key].is_a?(Array)
+
+        schema[key].each do |type|
+          if type.is_a?(Hash)
+            handle_schema(parent_schema, type)
           end
         end
       end
@@ -253,11 +253,9 @@ module JSON
 
     class << self
       def validate(schema, data, opts = {})
-        begin
-          validate!(schema, data, opts)
-        rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
-          false
-        end
+        validate!(schema, data, opts)
+      rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
+        false
       end
 
       def validate_json(schema, data, opts = {})
@@ -341,7 +339,7 @@ module JSON
 
       def cache_schemas=(val)
         warn '[DEPRECATION NOTICE] Schema caching is now a validation option. Schemas will still be cached if this is set to true, but this method will be removed in version >= 3. Please use the :clear_cache validation option instead.'
-        @@cache_schemas = val == true ? true : false
+        @@cache_schemas = val == true
       end
 
       def validators
@@ -423,7 +421,7 @@ module JSON
 
       def json_backend=(backend)
         if defined?(MultiJson)
-          backend = backend == 'json' ? 'json_gem' : backend
+          backend = 'json_gem' if backend == 'json'
           MultiJson.respond_to?(:use) ? MultiJson.use(backend) : MultiJson.engine = backend
         else
           backend = backend.to_s
@@ -483,7 +481,7 @@ module JSON
         end
       end
 
-      if !defined?(MultiJson)
+      unless defined?(MultiJson)
         if Gem::Specification.find_all_by_name('json').any?
           require 'json'
           @@available_json_backends << 'json'
@@ -505,11 +503,11 @@ module JSON
         end
 
         @@serializer = if @@json_backend == 'yajl'
-                         lambda { |o| Yajl::Encoder.encode(o) }
+                         ->(o) { Yajl::Encoder.encode(o) }
                        elsif @@json_backend == 'json'
-                         lambda { |o| JSON.dump(o) }
+                         ->(o) { JSON.dump(o) }
                        else
-                         lambda { |o| YAML.dump(o) }
+                         ->(o) { YAML.dump(o) }
                        end
       end
     end
@@ -518,13 +516,13 @@ module JSON
 
     if Gem::Specification.find_all_by_name('uuidtools').any?
       require 'uuidtools'
-      @@fake_uuid_generator = lambda { |s| UUIDTools::UUID.sha1_create(UUIDTools::UUID_URL_NAMESPACE, s).to_s }
+      @@fake_uuid_generator = ->(s) { UUIDTools::UUID.sha1_create(UUIDTools::UUID_URL_NAMESPACE, s).to_s }
     else
       require 'json-schema/util/uuid'
-      @@fake_uuid_generator = lambda { |s| JSON::Util::UUID.create_v5(s, JSON::Util::UUID::Nil).to_s }
+      @@fake_uuid_generator = ->(s) { JSON::Util::UUID.create_v5(s, JSON::Util::UUID::Nil).to_s }
     end
 
-    def serialize schema
+    def serialize(schema)
       if defined?(MultiJson)
         MultiJson.respond_to?(:dump) ? MultiJson.dump(schema) : MultiJson.encode(schema)
       else
@@ -532,7 +530,7 @@ module JSON
       end
     end
 
-    def fake_uuid schema
+    def fake_uuid(schema)
       @@fake_uuid_generator.call(schema)
     end
 
@@ -549,7 +547,15 @@ module JSON
         rescue JSON::Schema::JsonParseError
           # Build a uri for it
           schema_uri = Util::URI.normalized_uri(schema)
-          if !self.class.schema_loaded?(schema_uri)
+          if self.class.schema_loaded?(schema_uri)
+            schema = self.class.schema_for_uri(schema_uri)
+            if @options[:list] && @options[:fragment].nil?
+              schema = schema.to_array_schema
+              schema.uri = JSON::Util::URI.parse(fake_uuid(serialize(schema.schema)))
+              self.class.add_schema(schema)
+            end
+            schema
+          else
             schema = @options[:schema_reader].read(schema_uri)
             schema = JSON::Schema.stringify(schema)
 
@@ -558,14 +564,6 @@ module JSON
             end
 
             self.class.add_schema(schema)
-          else
-            schema = self.class.schema_for_uri(schema_uri)
-            if @options[:list] && @options[:fragment].nil?
-              schema = schema.to_array_schema
-              schema.uri = JSON::Util::URI.parse(fake_uuid(serialize(schema.schema)))
-              self.class.add_schema(schema)
-            end
-            schema
           end
         end
       elsif schema.is_a?(Hash)
@@ -594,7 +592,7 @@ module JSON
           begin
             # Check if the string is valid integer
             strict_convert = data.match?(/\A[+-]?\d+\z/) && !@options[:parse_integer]
-            data = strict_convert ? data : self.class.parse(data)
+            data = self.class.parse(data) unless strict_convert
           rescue JSON::Schema::JsonParseError
             begin
               json_uri = Util::URI.normalized_uri(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 6.0.0
 platform: ruby
 authors:
 - Kenny Hoxworth
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="