json-schema 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3685239fb43fca88ffbeb8fe2f220b1b6a53e8ab8b367c51d3bd55526388d75d
-  data.tar.gz: dcfbf33b0a3f33b0c193e441430d85714f7ffc75deb5ce0d466a32d6dbb91b0a
+  metadata.gz: bc526677f82e629c0fd935d17525e2796385dbf1579f0228e4cdb65c75ff40e2
+  data.tar.gz: ac396f2df9fe27c39dd8408afe876aaf84eb9a577ed29635789085707183de9e
 SHA512:
-  metadata.gz: c6e9352ea89263e330481b725e9900fba6a4ae215ce2bc08772626e7282e3c9a279b1590f1d5209825d837a465b034c4128bc8ccbd4d31767e029575eb973ac1
-  data.tar.gz: 16be5e3ec637f8a7ecfbcdcf984beb862f9ca540a1faac84b9f6b596d3ee0e9b1ff86dc5a6e83f4bf7b3573f052566384491d1d7f7361a37720417cb7a5e91f0
+  metadata.gz: 7a8726a959df412d10959c9fd8bc8f2c06dd6e299e70781703b229ea00d704986b743365f25bbc51a4ac6d1a0927d08ab326fa25f81cd7d9ffc9bb3dd8ed00d3
+  data.tar.gz: 04ccfeb71443b438e9ad7a59c582d5f62e7ed345f20164fa87523d2127a6be38eeb9e3305af6a50b2e77f6e8720f2d420cc6fc424326c3a6f140aeccc12cf52e

data/README.md

@@ -241,6 +241,19 @@ JSON::Validator.validate(schema, { "a" => 1 }, :parse_data => false)
 # => false
 JSON::Validator.validate(schema, '{ "a": 1 }', :parse_data => false)
 
+#
+# with the `:parse_integer` option set to false, the integer value given as string will not be parsed.
+#
+
+# => true
+JSON::Validator.validate({type: "integer"}, "23")
+# => false
+JSON::Validator.validate({type: "integer"}, "23", parse_integer: false)
+# => true
+JSON::Validator.validate({type: "string"}, "123", parse_integer: false)
+# => false
+JSON::Validator.validate({type: "string"}, "123")
+
 #
 # with the `:json` option, the json must be an unparsed json text (not a hash, a uri or a file path)
 #

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

@@ -7,6 +7,7 @@ module JSON
         # Create an hash to hold errors that are generated during validation
         errors = Hash.new { |hsh, k| hsh[k] = [] }
         valid = true
+        message = nil
 
         current_schema.schema['allOf'].each_with_index do |element, schema_index|
           schema = JSON::Schema.new(element, current_schema.uri, validator)
@@ -17,8 +18,9 @@ module JSON
 
           begin
             schema.validate(data, fragments, processor, options)
-          rescue ValidationError
+          rescue ValidationError => e
             valid = false
+            message = e.message
           end
 
           diff = validation_errors(processor).count - pre_validation_error_count
@@ -29,7 +31,7 @@ module JSON
         end
 
         if !valid || !errors.empty?
-          message = "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match all of the required schemas"
+          message ||= "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match all of the required schemas"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
           validation_errors(processor).last.sub_errors = errors
         end

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

@@ -4,7 +4,7 @@ module JSON
   class Schema
     class PropertiesAttribute < Attribute
       def self.required?(schema, options)
-        schema.fetch('required') { options[:strict] }
+        schema.fetch('required') { options[:allPropertiesRequired] }
       end
 
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
@@ -33,8 +33,8 @@ module JSON
           end
         end
 
-        # When strict is true, ensure no undefined properties exist in the data
-        return unless options[:strict] == true && !schema.key?('additionalProperties')
+        # 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|
           k = k.to_s

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

@@ -6,7 +6,7 @@ module JSON
       # draft4 relies on its own RequiredAttribute validation at a higher level, rather than
       # as an attribute of individual properties.
       def self.required?(schema, options)
-        options[:strict] == true
+        options[:allPropertiesRequired] == true
       end
     end
   end

data/lib/json-schema/validator.rb

@@ -27,7 +27,10 @@ module JSON
       insert_defaults: false,
       clear_cache: false,
       strict: false,
+      allPropertiesRequired: false,
+      noAdditionalProperties: false,
       parse_data: true,
+      parse_integer: true,
     }
     @@validators = {}
     @@default_validator = nil
@@ -45,7 +48,13 @@ module JSON
 
       @validation_options = @options[:record_errors] ? { record_errors: true } : {}
       @validation_options[:insert_defaults] = true if @options[:insert_defaults]
-      @validation_options[:strict] = true if @options[:strict] == true
+      if @options[:strict] == true
+        @validation_options[:allPropertiesRequired] = true
+        @validation_options[:noAdditionalProperties] = true
+      else
+        @validation_options[:allPropertiesRequired] = true if @options[:allPropertiesRequired]
+        @validation_options[:noAdditionalProperties] = true if @options[:noAdditionalProperties]
+      end
       @validation_options[:clear_cache] = true if !@@cache_schemas || @options[:clear_cache]
 
       @@mutex.synchronize { @base_schema = initialize_schema(schema_data, configured_validator) }
@@ -569,7 +578,9 @@ module JSON
           data = self.class.parse(custom_open(json_uri))
         elsif data.is_a?(String)
           begin
-            data = self.class.parse(data)
+            # 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)
           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: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Kenny Hoxworth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler