json_schema 0.20.5 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f22094d77a8c40595f358c40c431ce2b86e694403bf310854046e069377dc83
-  data.tar.gz: 131983e9114e14eb15d87de99571631644827fbe40927f1a9912443343c474e7
+  metadata.gz: 3cef7b24665bb90268f4feaac55fedc33027cab76886b05a54be71767c55802c
+  data.tar.gz: d20911da20ffffdecb4c8335cc081e9bc96c6236cd350dc0b4148e1d8a351edc
 SHA512:
-  metadata.gz: d8dd23eb8a3e81fa88b4fe77d03b46289f687827c6eb92db29cce1daf41d1fe154a20840e918cb1be0580746929a2db68515795be6f1746fa9f0c649ecd15a2c
-  data.tar.gz: 2b7e8a4c19049c24fde7faa579bf7c21f1e650b5e9ba1a72b83b5cf899f560ef92b9d8883585adc1b663fa005e3d9980412f536bc988c7af97080ee74471579c
+  metadata.gz: 79671495e3e027b3ee4b76f68d76f651fa93df94a4102569970e40c8444105b30f04b441850dda768d063cce7d091163fb7d9de37a352e9c50e2e439b8068d11
+  data.tar.gz: 5d331de53da190de60e53c13293a54a0e26aa56c48c4b7676725a3862cfc074aff4c56e91aca53bb7abe257e9ac60afa9a4b99ff671fb2780cfb47376cf3a03d

data/README.md

@@ -67,7 +67,8 @@ ruby -Ilib -Itest test/json_schema/validator_test.rb -n /anyOf/
 
 1. Update the version in `json_schema.gemspec` as appropriate for [semantic
    versioning](http://semver.org) and add details to `CHANGELOG`.
-2. Run the `release` task:
+2. `git commit` those changes with a message like "Bump version to x.y.z".
+3. Run the `release` task:
 
     ```
     bundle exec rake release

data/bin/validate-schema

@@ -26,17 +26,15 @@ parser = OptionParser.new { |opts|
   end
 }
 
-if $0 == __FILE__
-  parser.parse!
-  success = command.run(ARGV.dup)
+parser.parse!
+success = command.run(ARGV.dup)
 
-  if success
-    command.messages.each { |m| $stdout.puts(m) }
-  elsif !command.errors.empty?
-    command.errors.each { |e| $stderr.puts(e) }
-    exit(1)
-  else
-    print_usage!
-    exit(1)
-  end
+if success
+  command.messages.each { |m| $stdout.puts(m) }
+elsif !command.errors.empty?
+  command.errors.each { |e| $stderr.puts(e) }
+  exit(1)
+else
+  print_usage!
+  exit(1)
 end

data/lib/json_schema/parser.rb

@@ -17,6 +17,10 @@ module JsonSchema
       TrueClass  => "boolean",
     }
 
+    # Reuse these frozen objects to avoid allocations
+    EMPTY_ARRAY = [].freeze
+    EMPTY_HASH = {}.freeze
+
     attr_accessor :errors
 
     # Basic parsing of a schema. May return a malformed schema! (Use `#parse!`
@@ -101,21 +105,21 @@ module JsonSchema
     end
 
     def parse_all_of(schema)
-      if schema.all_of
+      if schema.all_of && !schema.all_of.empty?
         schema.all_of = schema.all_of.each_with_index.
           map { |s, i| parse_data(s, schema, "allOf/#{i}") }
       end
     end
 
     def parse_any_of(schema)
-      if schema.any_of
+      if schema.any_of && !schema.any_of.empty?
         schema.any_of = schema.any_of.each_with_index.
           map { |s, i| parse_data(s, schema, "anyOf/#{i}") }
       end
     end
 
     def parse_one_of(schema)
-      if schema.one_of
+      if schema.one_of && !schema.one_of.empty?
         schema.one_of = schema.one_of.each_with_index.
           map { |s, i| parse_data(s, schema, "oneOf/#{i}") }
       end
@@ -140,7 +144,7 @@ module JsonSchema
     end
 
     def parse_definitions(schema)
-      if schema.definitions
+      if schema.definitions && !schema.definitions.empty?
         # leave the original data reference intact
         schema.definitions = schema.definitions.dup
         schema.definitions.each do |key, definition|
@@ -151,7 +155,7 @@ module JsonSchema
     end
 
     def parse_dependencies(schema)
-      if schema.dependencies
+      if schema.dependencies && !schema.dependencies.empty?
         # leave the original data reference intact
         schema.dependencies = schema.dependencies.dup
         schema.dependencies.each do |k, s|
@@ -181,7 +185,7 @@ module JsonSchema
     end
 
     def parse_links(schema)
-      if schema.links
+      if schema.links && !schema.links.empty?
         schema.links = schema.links.each_with_index.map { |l, i|
           link             = Schema::Link.new
           link.parent      = schema
@@ -231,7 +235,7 @@ module JsonSchema
     end
 
     def parse_pattern_properties(schema)
-      if schema.pattern_properties
+      if schema.pattern_properties && !schema.pattern_properties.empty?
         # leave the original data reference intact
         properties = schema.pattern_properties.dup
         properties = properties.map do |k, s|
@@ -254,8 +258,8 @@ module JsonSchema
 
     def parse_properties(schema)
       # leave the original data reference intact
-      schema.properties = schema.properties.dup
-      if schema.properties && schema.properties.is_a?(Hash)
+      if schema.properties && schema.properties.is_a?(Hash) && !schema.properties.empty?
+        schema.properties = schema.properties.dup
         schema.properties.each do |key, definition|
           subschema = parse_data(definition, schema, "properties/#{key}")
           schema.properties[key] = subschema
@@ -282,11 +286,11 @@ module JsonSchema
       schema.default     = schema.data["default"]
 
       # validation: any
-      schema.all_of        = validate_type(schema, [Array], "allOf") || []
-      schema.any_of        = validate_type(schema, [Array], "anyOf") || []
-      schema.definitions   = validate_type(schema, [Hash], "definitions") || {}
+      schema.all_of        = validate_type(schema, [Array], "allOf") || EMPTY_ARRAY
+      schema.any_of        = validate_type(schema, [Array], "anyOf") || EMPTY_ARRAY
+      schema.definitions   = validate_type(schema, [Hash], "definitions") || EMPTY_HASH
       schema.enum          = validate_type(schema, [Array], "enum")
-      schema.one_of        = validate_type(schema, [Array], "oneOf") || []
+      schema.one_of        = validate_type(schema, [Array], "oneOf") || EMPTY_ARRAY
       schema.not           = validate_type(schema, [Hash], "not")
       schema.type          = validate_type(schema, [Array, String], "type")
       schema.type          = [schema.type] if schema.type.is_a?(String)
@@ -309,11 +313,11 @@ module JsonSchema
       # validation: object
       schema.additional_properties =
         validate_type(schema, BOOLEAN + [Hash], "additionalProperties")
-      schema.dependencies       = validate_type(schema, [Hash], "dependencies") || {}
+      schema.dependencies       = validate_type(schema, [Hash], "dependencies") || EMPTY_HASH
       schema.max_properties     = validate_type(schema, [Integer], "maxProperties")
       schema.min_properties     = validate_type(schema, [Integer], "minProperties")
-      schema.pattern_properties = validate_type(schema, [Hash], "patternProperties") || {}
-      schema.properties         = validate_type(schema, [Hash], "properties") || {}
+      schema.pattern_properties = validate_type(schema, [Hash], "patternProperties") || EMPTY_HASH
+      schema.properties         = validate_type(schema, [Hash], "properties") || EMPTY_HASH
       schema.required           = validate_type(schema, [Array], "required")
       schema.strict_properties  = validate_type(schema, BOOLEAN, "strictProperties")
 
@@ -358,10 +362,10 @@ module JsonSchema
     end
 
     def validate_type(schema, types, field)
-      friendly_types =
-        types.map { |t| FRIENDLY_TYPES[t] || t }.sort.uniq.join("/")
       value = schema.data[field]
       if !value.nil? && !types.any? { |t| value.is_a?(t) }
+        friendly_types =
+          types.map { |t| FRIENDLY_TYPES[t] || t }.sort.uniq.join("/")
         message = %{#{value.inspect} is not a valid "#{field}", must be a #{friendly_types}.}
         @errors << SchemaError.new(schema, message, :invalid_type)
         nil

data/lib/json_schema/reference_expander.rb

@@ -93,6 +93,7 @@ module JsonSchema
       if !ref
         schema_children(ref_schema) do |subschema|
           next unless subschema.reference
+          next if ref_schema.uri == parent_ref.uri.to_s
 
           if !subschema.reference.uri && parent_ref
             subschema.reference = JsonReference::Reference.new("#{parent_ref.uri}#{subschema.reference.pointer}")

data/lib/json_schema/validator.rb

@@ -567,7 +567,7 @@ module JsonSchema
     end
 
     DEFAULT_FORMAT_VALIDATORS = {
-      "date" => ->(data) { data =~ DATE_PATTERN },
+      "date" => ->(data) { data =~ DATE_PATTERN && Date.parse(data) rescue false },
       "date-time" => ->(data) { data =~ DATE_TIME_PATTERN },
       "email" => ->(data) { data =~ EMAIL_PATTERN },
       "hostname" => ->(data) { data =~ HOSTNAME_PATTERN },

data/test/bin_test.rb

@@ -1,12 +1,10 @@
 require "test_helper"
 
 #
-# The purpose of this sets of tests is just to include our Ruby executables
-# where possible so that we can get very basic sanity checks on their syntax
-# (which is something that of course Ruby can't do by default).
+# The purpose of this sets of tests is just to test our Ruby executables
+# where possible so that we can get very basic sanity checks on their syntax.
 #
-# We can do this without actually executing them because they're gated by `if
-# $0 == __FILE__` statements.
+# We can do this without actually executing them with a "ruby -c" call.
 #
 
 describe "executables in bin/" do
@@ -15,6 +13,7 @@ describe "executables in bin/" do
   end
 
   it "has roughly valid Ruby structure for validate-schema" do
-    load File.join(@bin_dir, "validate-schema")
+    IO.popen(["ruby", "-c", File.join(@bin_dir, "validate-schema")]) { |io| io.read }
+    assert_equal $?.exitstatus, 0, "Ruby syntax check failed; see error above"
   end
 end

data/test/json_schema/reference_expander_test.rb

@@ -454,6 +454,38 @@ describe JsonSchema::ReferenceExpander do
     assert_equal 3, schema1.properties["foo"].properties["bar"].one_of[1].properties["baz"].max_length
   end
 
+  it "does not infinitely recurse when external ref is local to its schema" do
+    sample1 = {
+      "id" => "http://json-schema.org/draft-04/schema#",
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "properties" => {
+        "additionalItems" => {
+          "anyOf" => [ { "$ref" => "#" } ]
+        }
+      }
+    }
+    schema1 = JsonSchema::Parser.new.parse!(sample1)
+    sample2 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema#",
+      "id" => "http://json-schema.org/draft-04/hyper-schema#",
+      "allOf" => [
+        { "$ref" => "http://json-schema.org/draft-04/schema#" }
+      ]
+    }
+    schema2 = JsonSchema::Parser.new.parse!(sample2)
+
+    store = JsonSchema::DocumentStore.new
+    expander = JsonSchema::ReferenceExpander.new
+
+    store.add_schema(schema1)
+    store.add_schema(schema2)
+
+    expander.expand!(schema2, store: store)
+
+    assert schema1.expanded?
+    assert schema2.expanded?
+  end
+
   it "it handles oneOf with nested references to a local schema" do
     sample1 = {
       "$schema" => "http://json-schema.org/draft-04/hyper-schema",

data/test/json_schema/validator_test.rb

@@ -718,6 +718,14 @@ describe JsonSchema::Validator do
     refute_valid
   end
 
+  it "validates date format when month and day exceed valid range unsuccessfully" do
+    pointer("#/definitions/app/definitions/owner").merge!(
+      "format" => "date"
+    )
+    data_sample["owner"] = "2014-24-60"
+    refute_valid
+  end
+
   it "validates date-time format successfully" do
     pointer("#/definitions/app/definitions/owner").merge!(
       "format" => "date-time"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.20.5
+  version: 0.21.0
 platform: ruby
 authors:
 - Brandur
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - brandur@mutelight.org
 executables:
@@ -54,7 +54,7 @@ homepage: https://github.com/brandur/json_schema
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,9 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A JSON Schema V4 and Hyperschema V4 parser and validator.
 test_files: []