schemacop 3.0.29 → 3.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7d7e77045f4130fe9e9863f3b6fddcbf5e847e4d461d2d40b13c472fecb40c
-  data.tar.gz: 55d594ce2ad63d13908e8d6cb97c4ae258b877c5b89d1ef52b64b345e4a83bf8
+  metadata.gz: 2b921a349115da6b915e956565782f34f0a72596a0e5c3c4c38e62ffc7117655
+  data.tar.gz: 792d6db18eab413e190b6f25a878e8cf832e99bea0ff87039ce54b87fdf682ce
 SHA512:
-  metadata.gz: 5ea7238bd691e8ab2af17ae36e24fd10e3ad5033c2a70fd904ec253e6b57b4ab2b9a819781a5403a2e1d93bc138e2de82d8c42fe0ed730c10a2597fe2df85a3f
-  data.tar.gz: 84cff469cae0b9eefa9ce2a6675d301cc381082e694352818f5852a74296338957b172cf39e9420b49924696c6eab16f600388c89c7b816b187dfb22c3d5843d
+  metadata.gz: 58c5fe39a2a685441a9cddaa88ed32313bfdc1702270c472db56848849028a64976e89d3cb026fab1dd82c2f236b9bb2a7e698d279e938f97c7b6bfede29e061
+  data.tar.gz: a6dde92bccda133ec1ddbae0c8e90e3b91f6abe8a1ab6b6c6fa8d54f7e2511e7a51029dc6fed66a5292fdec0b979759df00beddc9b630dadc9d100289d372e9a

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.6.2', '2.7.1', '3.0.1', '3.1.0', '3.2.0', '3.3.0']
+        ruby-version: ['2.6.2', '2.7.1', '3.0.1', '3.1.0', '3.2.0', '3.3.0', '3.4.0']
 
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## 3.0.31 (2025-02-05)
+
+* Add format `ipv4` and `ipv6` to `str` node for Schemacop3 schemas
+
+## 3.0.30 (2024-12-11)
+
+* Fix `used_external_schemas` sometimes returning an incomplete list
+
+  Internal reference: `#132006`.
+
 ## 3.0.29 (2024-06-06)
 
 * Add option `parse_json` to `hash` and `array` V3 nodes

data/Gemfile

@@ -5,7 +5,6 @@ gemspec
 
 # Development dependencies
 gem 'bundler'
-gem 'colorize'
 gem 'minitest'
 gem 'minitest-reporters'
 gem 'pry'

data/README.md

@@ -18,6 +18,7 @@ Schemacop is tested with the following ruby versions:
 * 3.1.0
 * 3.2.0
 * 3.3.0
+* 3.4.0
 
 Other ruby versions might work but are not covered by our automated tests.
 

data/README_V3.md

@@ -270,6 +270,12 @@ transformed into various types.
 * `symbol`
   The string can be anything and will be casted to a ruby `Symbol` object.
 
+* `ipv4`
+  A valid IPv4 address without netmask. No casting is performed.
+
+* `ipv6`
+  A valid IPv6 address without netmask. No casting is performed.
+
 #### Custom Formats
 
 You can also implement your custom formats or override the behavior of the

data/VERSION

@@ -1 +1 @@
-3.0.29
+3.0.31

data/lib/schemacop/v3/array_node.rb

@@ -145,7 +145,7 @@ module Schemacop
       end
 
       def children
-        (@items + [@cont_item]).compact
+        (@items + [@cont_item, list_item]).compact
       end
 
       def cast(value)

data/lib/schemacop/v3/node.rb

@@ -62,8 +62,10 @@ module Schemacop
         {}
       end
 
-      def used_external_schemas
-        children.map(&:used_external_schemas).flatten.uniq
+      def used_external_schemas(encountered_nodes = Set.new)
+        return [] if encountered_nodes.include?(self)
+
+        return children.map { |c| c.used_external_schemas(encountered_nodes) }.flatten.uniq
       end
 
       def children

data/lib/schemacop/v3/reference_node.rb

@@ -39,8 +39,12 @@ module Schemacop
         return target.cast(data)
       end
 
-      def used_external_schemas
-        target_children_schema = target.used_external_schemas
+      def used_external_schemas(encountered_nodes = Set.new)
+        if encountered_nodes.include?(self)
+          return []
+        end
+
+        target_children_schema = target.used_external_schemas(encountered_nodes + [self])
 
         if schemas.include?(@path)
           return target_children_schema

data/lib/schemacop.rb

@@ -1,8 +1,10 @@
 # External dependencies
 require 'ruby2_keywords'
+require 'logger'
 require 'active_support/all'
 require 'set'
 require 'uri'
+require 'resolv'
 
 # Schemacop module
 module Schemacop
@@ -96,6 +98,18 @@ module Schemacop
     handler: ->(value) { value.split(',').map { |i| Integer(i, 10) } }
   )
 
+  register_string_formatter(
+    :ipv4,
+    pattern: Resolv::IPv4::Regex,
+    handler: ->(value) { value }
+  )
+
+  register_string_formatter(
+    :ipv6,
+    pattern: Resolv::IPv6::Regex,
+    handler: ->(value) { value }
+  )
+
   def self.with_context(context)
     prev_context = Thread.current[CONTEXT_THREAD_KEY]
     Thread.current[CONTEXT_THREAD_KEY] = context

data/schemacop.gemspec

@@ -1,33 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.29 ruby lib
+# stub: schemacop 3.0.31 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.29"
+  s.version = "3.0.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2024-06-06"
+  s.date = "2025-02-05"
   s.files = [".github/workflows/ruby.yml".freeze, ".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "README_V2.md".freeze, "README_V3.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/base_schema.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/railtie.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/schema2.rb".freeze, "lib/schemacop/schema3.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/v2.rb".freeze, "lib/schemacop/v2/caster.rb".freeze, "lib/schemacop/v2/collector.rb".freeze, "lib/schemacop/v2/dupper.rb".freeze, "lib/schemacop/v2/field_node.rb".freeze, "lib/schemacop/v2/node.rb".freeze, "lib/schemacop/v2/node_resolver.rb".freeze, "lib/schemacop/v2/node_supporting_field.rb".freeze, "lib/schemacop/v2/node_supporting_type.rb".freeze, "lib/schemacop/v2/node_with_block.rb".freeze, "lib/schemacop/v2/validator/array_validator.rb".freeze, "lib/schemacop/v2/validator/boolean_validator.rb".freeze, "lib/schemacop/v2/validator/float_validator.rb".freeze, "lib/schemacop/v2/validator/hash_validator.rb".freeze, "lib/schemacop/v2/validator/integer_validator.rb".freeze, "lib/schemacop/v2/validator/nil_validator.rb".freeze, "lib/schemacop/v2/validator/number_validator.rb".freeze, "lib/schemacop/v2/validator/object_validator.rb".freeze, "lib/schemacop/v2/validator/string_validator.rb".freeze, "lib/schemacop/v2/validator/symbol_validator.rb".freeze, "lib/schemacop/v3.rb".freeze, "lib/schemacop/v3/all_of_node.rb".freeze, "lib/schemacop/v3/any_of_node.rb".freeze, "lib/schemacop/v3/array_node.rb".freeze, "lib/schemacop/v3/boolean_node.rb".freeze, "lib/schemacop/v3/combination_node.rb".freeze, "lib/schemacop/v3/context.rb".freeze, "lib/schemacop/v3/dsl_scope.rb".freeze, "lib/schemacop/v3/global_context.rb".freeze, "lib/schemacop/v3/hash_node.rb".freeze, "lib/schemacop/v3/integer_node.rb".freeze, "lib/schemacop/v3/is_not_node.rb".freeze, "lib/schemacop/v3/node.rb".freeze, "lib/schemacop/v3/node_registry.rb".freeze, "lib/schemacop/v3/number_node.rb".freeze, "lib/schemacop/v3/numeric_node.rb".freeze, "lib/schemacop/v3/object_node.rb".freeze, "lib/schemacop/v3/one_of_node.rb".freeze, "lib/schemacop/v3/reference_node.rb".freeze, "lib/schemacop/v3/result.rb".freeze, "lib/schemacop/v3/string_node.rb".freeze, "lib/schemacop/v3/symbol_node.rb".freeze, "schemacop.gemspec".freeze, "test/lib/test_helper.rb".freeze, "test/schemas/nested/group.rb".freeze, "test/schemas/user.rb".freeze, "test/unit/schemacop/v2/casting_test.rb".freeze, "test/unit/schemacop/v2/collector_test.rb".freeze, "test/unit/schemacop/v2/custom_check_test.rb".freeze, "test/unit/schemacop/v2/custom_if_test.rb".freeze, "test/unit/schemacop/v2/defaults_test.rb".freeze, "test/unit/schemacop/v2/empty_test.rb".freeze, "test/unit/schemacop/v2/nil_dis_allow_test.rb".freeze, "test/unit/schemacop/v2/node_resolver_test.rb".freeze, "test/unit/schemacop/v2/short_forms_test.rb".freeze, "test/unit/schemacop/v2/types_test.rb".freeze, "test/unit/schemacop/v2/validator_array_test.rb".freeze, "test/unit/schemacop/v2/validator_boolean_test.rb".freeze, "test/unit/schemacop/v2/validator_float_test.rb".freeze, "test/unit/schemacop/v2/validator_hash_test.rb".freeze, "test/unit/schemacop/v2/validator_integer_test.rb".freeze, "test/unit/schemacop/v2/validator_nil_test.rb".freeze, "test/unit/schemacop/v2/validator_number_test.rb".freeze, "test/unit/schemacop/v2/validator_object_test.rb".freeze, "test/unit/schemacop/v2/validator_string_test.rb".freeze, "test/unit/schemacop/v2/validator_symbol_test.rb".freeze, "test/unit/schemacop/v3/all_of_node_test.rb".freeze, "test/unit/schemacop/v3/any_of_node_test.rb".freeze, "test/unit/schemacop/v3/array_node_test.rb".freeze, "test/unit/schemacop/v3/boolean_node_test.rb".freeze, "test/unit/schemacop/v3/global_context_test.rb".freeze, "test/unit/schemacop/v3/hash_node_test.rb".freeze, "test/unit/schemacop/v3/integer_node_test.rb".freeze, "test/unit/schemacop/v3/is_not_node_test.rb".freeze, "test/unit/schemacop/v3/node_test.rb".freeze, "test/unit/schemacop/v3/number_node_test.rb".freeze, "test/unit/schemacop/v3/object_node_test.rb".freeze, "test/unit/schemacop/v3/one_of_node_test.rb".freeze, "test/unit/schemacop/v3/reference_node_test.rb".freeze, "test/unit/schemacop/v3/string_node_test.rb".freeze, "test/unit/schemacop/v3/symbol_node_test.rb".freeze]
   s.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.4.6".freeze
   s.summary = "Schemacop validates ruby structures consisting of nested hashes and arrays against simple schema definitions.".freeze
   s.test_files = ["test/lib/test_helper.rb".freeze, "test/schemas/nested/group.rb".freeze, "test/schemas/user.rb".freeze, "test/unit/schemacop/v2/casting_test.rb".freeze, "test/unit/schemacop/v2/collector_test.rb".freeze, "test/unit/schemacop/v2/custom_check_test.rb".freeze, "test/unit/schemacop/v2/custom_if_test.rb".freeze, "test/unit/schemacop/v2/defaults_test.rb".freeze, "test/unit/schemacop/v2/empty_test.rb".freeze, "test/unit/schemacop/v2/nil_dis_allow_test.rb".freeze, "test/unit/schemacop/v2/node_resolver_test.rb".freeze, "test/unit/schemacop/v2/short_forms_test.rb".freeze, "test/unit/schemacop/v2/types_test.rb".freeze, "test/unit/schemacop/v2/validator_array_test.rb".freeze, "test/unit/schemacop/v2/validator_boolean_test.rb".freeze, "test/unit/schemacop/v2/validator_float_test.rb".freeze, "test/unit/schemacop/v2/validator_hash_test.rb".freeze, "test/unit/schemacop/v2/validator_integer_test.rb".freeze, "test/unit/schemacop/v2/validator_nil_test.rb".freeze, "test/unit/schemacop/v2/validator_number_test.rb".freeze, "test/unit/schemacop/v2/validator_object_test.rb".freeze, "test/unit/schemacop/v2/validator_string_test.rb".freeze, "test/unit/schemacop/v2/validator_symbol_test.rb".freeze, "test/unit/schemacop/v3/all_of_node_test.rb".freeze, "test/unit/schemacop/v3/any_of_node_test.rb".freeze, "test/unit/schemacop/v3/array_node_test.rb".freeze, "test/unit/schemacop/v3/boolean_node_test.rb".freeze, "test/unit/schemacop/v3/global_context_test.rb".freeze, "test/unit/schemacop/v3/hash_node_test.rb".freeze, "test/unit/schemacop/v3/integer_node_test.rb".freeze, "test/unit/schemacop/v3/is_not_node_test.rb".freeze, "test/unit/schemacop/v3/node_test.rb".freeze, "test/unit/schemacop/v3/number_node_test.rb".freeze, "test/unit/schemacop/v3/object_node_test.rb".freeze, "test/unit/schemacop/v3/one_of_node_test.rb".freeze, "test/unit/schemacop/v3/reference_node_test.rb".freeze, "test/unit/schemacop/v3/string_node_test.rb".freeze, "test/unit/schemacop/v3/symbol_node_test.rb".freeze]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0"])
-      s.add_runtime_dependency(%q<ruby2_keywords>.freeze, [">= 0.0.4"])
-    else
-      s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
-      s.add_dependency(%q<ruby2_keywords>.freeze, [">= 0.0.4"])
-    end
-  else
-    s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
-    s.add_dependency(%q<ruby2_keywords>.freeze, [">= 0.0.4"])
-  end
+  s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0"])
+  s.add_runtime_dependency(%q<ruby2_keywords>.freeze, [">= 0.0.4"])
 end

data/test/lib/test_helper.rb

@@ -27,7 +27,6 @@ require 'minitest/autorun'
 require 'minitest/reporters'
 require 'schemacop'
 require 'pry'
-require 'colorize'
 
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(color: true)]
 
@@ -57,6 +56,11 @@ class V3Test < SchemacopTest
       @errors[path] ||= []
       @errors[path] << exp
     end
+
+    def new_hash_inspect_format?
+      # See https://bugs.ruby-lang.org/issues/20433#note-10
+      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0')
+    end
   end
 
   def setup

data/test/unit/schemacop/v3/array_node_test.rb

@@ -597,11 +597,19 @@ module Schemacop
         assert_validation(['foo'])
 
         assert_validation([]) do
-          error '/', 'At least one entry must match schema {"type"=>"string"}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "string"}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"string"}.'
+          end
         end
 
         assert_validation([234, :foo]) do
-          error '/', 'At least one entry must match schema {"type"=>"string"}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "string"}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"string"}.'
+          end
         end
       end
 
@@ -689,10 +697,18 @@ module Schemacop
 
         # These need to fail validation, as they are not in the enum list
         assert_validation([1, 2, 3]) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, [1, 2], ["a", "b"]].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}, [1, 2], ["a", "b"]].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, [1, 2], ["a", "b"]].'
+          end
         end
         assert_validation([]) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, [1, 2], ["a", "b"]].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}, [1, 2], ["a", "b"]].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, [1, 2], ["a", "b"]].'
+          end
         end
       end
 
@@ -832,10 +848,18 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation([]) do
-          error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>3}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "integer", "minimum" => 3}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>3}.'
+          end
         end
         assert_validation([1, 2]) do
-          error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>3}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "integer", "minimum" => 3}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>3}.'
+          end
         end
         assert_validation([1, 2, 3])
       end
@@ -860,14 +884,26 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation([]) do
-          error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>5}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "integer", "minimum" => 5}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>5}.'
+          end
         end
         assert_validation([1]) do
-          error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>5}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "integer", "minimum" => 5}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>5}.'
+          end
           error '/[0]', 'Value must have a minimum of 2.'
         end
         assert_validation([2]) do
-          error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>5}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "integer", "minimum" => 5}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"integer", "minimum"=>5}.'
+          end
         end
 
         assert_validation([2, 3, 5])
@@ -914,7 +950,11 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation(['foo']) do
-          error '/', 'At least one entry must match schema {"type"=>"string", "format"=>"date"}.'
+          if new_hash_inspect_format?
+            error '/', 'At least one entry must match schema {"type" => "string", "format" => "date"}.'
+          else
+            error '/', 'At least one entry must match schema {"type"=>"string", "format"=>"date"}.'
+          end
         end
         assert_validation(%w[foo 1990-01-01])
 

data/test/unit/schemacop/v3/boolean_node_test.rb

@@ -133,7 +133,11 @@ module Schemacop
 
         # These need to fail validation, as they are not in the enum list
         assert_validation(false) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, true].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}, true].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, true].'
+          end
         end
       end
 

data/test/unit/schemacop/v3/hash_node_test.rb

@@ -499,7 +499,11 @@ module Schemacop
           error '/foo', 'Value must be given.'
         end
         assert_validation(foo: 'string') do
-          error '/foo', 'Must not match schema: {"type"=>"string"}.'
+          if new_hash_inspect_format?
+            error '/foo', 'Must not match schema: {"type" => "string"}.'
+          else
+            error '/foo', 'Must not match schema: {"type"=>"string"}.'
+          end
         end
       end
 
@@ -515,7 +519,11 @@ module Schemacop
         assert_validation(foo: { bar: :baz })
         assert_validation(foo: nil)
         assert_validation(foo: 'string') do
-          error '/foo', 'Must not match schema: {"type"=>"string"}.'
+          if new_hash_inspect_format?
+            error '/foo', 'Must not match schema: {"type" => "string"}.'
+          else
+            error '/foo', 'Must not match schema: {"type"=>"string"}.'
+          end
         end
       end
 

data/test/unit/schemacop/v3/integer_node_test.rb

@@ -307,10 +307,18 @@ module Schemacop
 
         # These need to fail validation, as they are not in the enum list
         assert_validation(13) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
         assert_validation(4) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
       end
 

data/test/unit/schemacop/v3/is_not_node_test.rb

@@ -17,7 +17,11 @@ module Schemacop
         assert_validation(:foo)
         assert_validation(4)
         assert_validation(8) do
-          error '/', 'Must not match schema: {"type"=>"integer", "minimum"=>5}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "integer", "minimum" => 5}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"integer", "minimum"=>5}.'
+          end
         end
       end
 
@@ -37,7 +41,11 @@ module Schemacop
         end
         assert_validation({})
         assert_validation(8) do
-          error '/', 'Must not match schema: {"type"=>"integer", "minimum"=>5}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "integer", "minimum" => 5}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"integer", "minimum"=>5}.'
+          end
         end
       end
 
@@ -61,11 +69,19 @@ module Schemacop
         # Needs to fail the validation, as the value is included in the enum
         # and a string (which the not turns into "failing the validation")
         assert_validation('bar') do
-          error '/', 'Must not match schema: {"type"=>"string", "enum"=>["bar", "qux", 123, "faz"]}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "string", "enum" => ["bar", "qux", 123, "faz"]}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"string", "enum"=>["bar", "qux", 123, "faz"]}.'
+          end
         end
 
         assert_validation('qux') do
-          error '/', 'Must not match schema: {"type"=>"string", "enum"=>["bar", "qux", 123, "faz"]}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "string", "enum" => ["bar", "qux", 123, "faz"]}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"string", "enum"=>["bar", "qux", 123, "faz"]}.'
+          end
         end
       end
 
@@ -89,11 +105,19 @@ module Schemacop
         # Needs to fail the validation, as the value is included in the enum
         # and a string (which the not turns into "failing the validation")
         assert_validation('bar') do
-          error '/', 'Must not match schema: {"type"=>"string", "title"=>"Short title", "examples"=>["foo"], "description"=>"Longer description", "enum"=>["bar", "qux", 123, "faz"]}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "string", "title" => "Short title", "examples" => ["foo"], "description" => "Longer description", "enum" => ["bar", "qux", 123, "faz"]}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"string", "title"=>"Short title", "examples"=>["foo"], "description"=>"Longer description", "enum"=>["bar", "qux", 123, "faz"]}.'
+          end
         end
 
         assert_validation('qux') do
-          error '/', 'Must not match schema: {"type"=>"string", "title"=>"Short title", "examples"=>["foo"], "description"=>"Longer description", "enum"=>["bar", "qux", 123, "faz"]}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "string", "title" => "Short title", "examples" => ["foo"], "description" => "Longer description", "enum" => ["bar", "qux", 123, "faz"]}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"string", "title"=>"Short title", "examples"=>["foo"], "description"=>"Longer description", "enum"=>["bar", "qux", 123, "faz"]}.'
+          end
         end
 
         # rubocop:enable Layout/LineLength
@@ -136,12 +160,20 @@ module Schemacop
 
         assert_validation(nil)
         assert_validation([]) do
-          error '/', 'Must not match schema: {"type"=>"array", "items"=>{"type"=>"integer"}}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "array", "items" => {"type" => "integer"}}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"array", "items"=>{"type"=>"integer"}}.'
+          end
         end
         assert_validation('foo')
         assert_validation(['foo'])
         assert_validation([1]) do
-          error '/', 'Must not match schema: {"type"=>"array", "items"=>{"type"=>"integer"}}.'
+          if new_hash_inspect_format?
+            error '/', 'Must not match schema: {"type" => "array", "items" => {"type" => "integer"}}.'
+          else
+            error '/', 'Must not match schema: {"type"=>"array", "items"=>{"type"=>"integer"}}.'
+          end
         end
       end
 

data/test/unit/schemacop/v3/node_test.rb

@@ -30,16 +30,32 @@ module Schemacop
         assert_validation({ qux: 42 })
 
         assert_validation(3) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
         assert_validation('bar') do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
         assert_validation(:foo) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
         assert_validation({ qux: 13 }) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
       end
 

data/test/unit/schemacop/v3/number_node_test.rb

@@ -274,10 +274,18 @@ module Schemacop
 
         # These need to fail validation, as they are not in the enum list
         assert_validation(0.5) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, 4.2].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}, 4.2].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, 4.2].'
+          end
         end
         assert_validation(4) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, 4.2].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}, 4.2].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}, 4.2].'
+          end
         end
       end
 

data/test/unit/schemacop/v3/object_node_test.rb

@@ -109,13 +109,25 @@ module Schemacop
 
         # These will fail, as we didn't put them into the enum list
         assert_validation(1) do
-          error '/', 'Value not included in enum [true, "foo", :baz, [], {:qux=>"123"}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [true, "foo", :baz, [], {qux: "123"}].'
+          else
+            error '/', 'Value not included in enum [true, "foo", :baz, [], {:qux=>"123"}].'
+          end
         end
         assert_validation(:bar) do
-          error '/', 'Value not included in enum [true, "foo", :baz, [], {:qux=>"123"}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [true, "foo", :baz, [], {qux: "123"}].'
+          else
+            error '/', 'Value not included in enum [true, "foo", :baz, [], {:qux=>"123"}].'
+          end
         end
         assert_validation({ qux: 42 }) do
-          error '/', 'Value not included in enum [true, "foo", :baz, [], {:qux=>"123"}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [true, "foo", :baz, [], {qux: "123"}].'
+          else
+            error '/', 'Value not included in enum [true, "foo", :baz, [], {:qux=>"123"}].'
+          end
         end
       end
 

data/test/unit/schemacop/v3/string_node_test.rb

@@ -357,6 +357,107 @@ module Schemacop
         assert_cast '01,032', [1, 32]
       end
 
+      def test_format_ipv4
+        schema :string, format: :ipv4
+
+        assert_json(type: :string, format: :ipv4)
+
+        assert_validation 234 do
+          error '/', StringNodeTest.invalid_type_error(Integer)
+        end
+
+        assert_validation 'sd sfdij soidf' do
+          error '/', 'String does not match format "ipv4".'
+        end
+
+        # Some valid IPv4 addresses
+        assert_validation '0.1.2.3'
+        assert_validation '110.0.217.94'
+        assert_validation '59.1.18.160'
+        assert_validation '83.212.124.74'
+        assert_validation '208.122.67.117'
+        assert_validation '175.186.176.213'
+
+        # Some invalid IPv4 addresses
+        assert_validation '256.1.4.2' do
+          error '/', 'String does not match format "ipv4".'
+        end
+        assert_validation '2.4.522.1' do
+          error '/', 'String does not match format "ipv4".'
+        end
+        assert_validation '1.1.1' do
+          error '/', 'String does not match format "ipv4".'
+        end
+        assert_validation '1' do
+          error '/', 'String does not match format "ipv4".'
+        end
+
+        # CIDR addresses are not allowed
+        assert_validation '247.182.236.127/24' do
+          error '/', 'String does not match format "ipv4".'
+        end
+
+        # And IPv6 isn't allowed as well
+        assert_validation 'd91c:af3e:72f1:f5c3::::ad81' do
+          error '/', 'String does not match format "ipv4".'
+        end
+      end
+
+      def test_format_ipv6
+        schema :string, format: :ipv6
+
+        assert_json(type: :string, format: :ipv6)
+
+        assert_validation 234 do
+          error '/', StringNodeTest.invalid_type_error(Integer)
+        end
+
+        assert_validation 'sd sfdij soidf' do
+          error '/', 'String does not match format "ipv6".'
+        end
+
+        # Some valid IPv6 addresses
+        assert_validation '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+        assert_validation '::1'
+        assert_validation '2001:db8::ff00:42:8329'
+
+        # Some invalid IPv6 addresses
+        assert_validation '2001:db8:85a3:0000:0000:8a2e:0370:7334:1234' do
+          error '/', 'String does not match format "ipv6".'
+        end
+        assert_validation '2001:db8:85a3::8a2e::7334' do
+          error '/', 'String does not match format "ipv6".'
+        end
+        assert_validation '2001:db8:85a3::g123:4567' do
+          error '/', 'String does not match format "ipv6".'
+        end
+
+        # CIDR addresses are not allowed
+        assert_validation '247.182.236.127/24' do
+          error '/', 'String does not match format "ipv6".'
+        end
+
+        # And IPv4 isn't allowed as well
+        assert_validation '0.1.2.3' do
+          error '/', 'String does not match format "ipv6".'
+        end
+        assert_validation '110.0.217.94' do
+          error '/', 'String does not match format "ipv6".'
+        end
+        assert_validation '59.1.18.160' do
+          error '/', 'String does not match format "ipv6".'
+        end
+        assert_validation '83.212.124.74' do
+          error '/', 'String does not match format "ipv6".'
+        end
+        assert_validation '208.122.67.117' do
+          error '/', 'String does not match format "ipv6".'
+        end
+        assert_validation '175.186.176.213' do
+          error '/', 'String does not match format "ipv6".'
+        end
+      end
+
       def test_format_custom
         Schemacop.register_string_formatter(
           :integer_tuple_list,
@@ -535,10 +636,18 @@ module Schemacop
 
         # These need to fail validation, as they are not in the enum list
         assert_validation('bar') do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
         assert_validation('Lorem ipsum') do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
       end
 

data/test/unit/schemacop/v3/symbol_node_test.rb

@@ -70,7 +70,11 @@ module Schemacop
 
         # These need to fail validation, as they are not in the enum list
         assert_validation(:foo) do
-          error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          if new_hash_inspect_format?
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {qux: 42}].'
+          else
+            error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.29
+  version: 3.0.31
 platform: ruby
 authors:
 - Sitrox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,8 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
-description:
-email:
+description: 
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -151,7 +151,7 @@ homepage: https://github.com/sitrox/schemacop
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
-signing_key:
+rubygems_version: 3.4.6
+signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.