schemacop 3.0.31 → 3.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b921a349115da6b915e956565782f34f0a72596a0e5c3c4c38e62ffc7117655
-  data.tar.gz: 792d6db18eab413e190b6f25a878e8cf832e99bea0ff87039ce54b87fdf682ce
+  metadata.gz: 6b54eb0a424f170292546f9d932016f9b27198d6547979dc261e23273a7ee104
+  data.tar.gz: b769bc38d86cb5d98d0528e9139282c01fb761d9835591c8b9b56df80f246cdb
 SHA512:
-  metadata.gz: 58c5fe39a2a685441a9cddaa88ed32313bfdc1702270c472db56848849028a64976e89d3cb026fab1dd82c2f236b9bb2a7e698d279e938f97c7b6bfede29e061
-  data.tar.gz: a6dde92bccda133ec1ddbae0c8e90e3b91f6abe8a1ab6b6c6fa8d54f7e2511e7a51029dc6fed66a5292fdec0b979759df00beddc9b630dadc9d100289d372e9a
+  metadata.gz: b90ba156865727fd391841ad208b6881741af7d9c862f1464a57817eda4ab86429d7684f6c1859119e9e3d3d193ac5749f0d3ec45a72d6a38750a4e684634856
+  data.tar.gz: 1f2f20df4152726ce84fc1ce61545b4d0b0bb19387c68233f1a000baa1e1a31886178e86e25b3786bb71543d53d0b9bd5d79b6ee76a45f40db2d3d88cf0860ab

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## 3.0.33 (2025-02-11)
+
+* Fix bug marking subnet `/30` as invalid when using `ipv4-cidr` string format
+
+## 3.0.32 (2025-02-11)
+
+* Add format `ipv4-cidr` to `str` node for Schemacop3 schemas
+
 ## 3.0.31 (2025-02-05)
 
 * Add format `ipv4` and `ipv6` to `str` node for Schemacop3 schemas

data/README.md

@@ -122,4 +122,4 @@ To run tests:
 
 ## Copyright
 
-Copyright © 2016 - 2024 Sitrox. See `LICENSE` for further details.
+Copyright © 2016 - 2025 Sitrox. See `LICENSE` for further details.

data/README_V3.md

@@ -273,6 +273,9 @@ transformed into various types.
 * `ipv4`
   A valid IPv4 address without netmask. No casting is performed.
 
+* `ipv4-cidr`
+  A valid IPv4 CIDR address with netmask. No casting is performed.
+
 * `ipv6`
   A valid IPv6 address without netmask. No casting is performed.
 

data/VERSION

@@ -1 +1 @@
-3.0.31
+3.0.33

data/lib/schemacop.rb

@@ -104,6 +104,12 @@ module Schemacop
     handler: ->(value) { value }
   )
 
+  register_string_formatter(
+    :'ipv4-cidr',
+    pattern: Regexp.new(Resolv::IPv4::Regex.source[0..-3] + %r{/([0-9]|[1-2][0-9]|3[0-2])\z}.source),
+    handler: ->(value) { value }
+  )
+
   register_string_formatter(
     :ipv6,
     pattern: Resolv::IPv6::Regex,

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.31 ruby lib
+# stub: schemacop 3.0.33 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.31"
+  s.version = "3.0.33"
 
   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 = "2025-02-05"
+  s.date = "2025-02-11"
   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]

data/test/lib/test_helper.rb

@@ -134,11 +134,11 @@ class V3Test < SchemacopTest
 
               Expected
               --------
-              #{expected_error.to_s.blue}
+              #{expected_error}
 
-              #{'Actual'.red}
-              #{'------'.red}
-              #{result.messages_by_path[path].join("\n\n").green}
+              Actual
+              ------
+              #{result.messages_by_path[path].join("\n\n")}
             ERROR
           end
         end

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

@@ -403,6 +403,63 @@ module Schemacop
         end
       end
 
+      def test_format_ipv4_cidr
+        schema :string, format: :'ipv4-cidr'
+
+        assert_json(type: :string, format: :'ipv4-cidr')
+
+        assert_validation 234 do
+          error '/', StringNodeTest.invalid_type_error(Integer)
+        end
+
+        assert_validation 'sd sfdij soidf' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+
+        # Some valid IPv4 CIDR addresses
+        assert_validation '0.1.2.3/23'
+        assert_validation '110.0.217.94/1'
+        assert_validation '59.1.18.160/32'
+        assert_validation '83.212.124.74/24'
+        assert_validation '208.122.67.117/10'
+        assert_validation '175.186.176.213/8'
+
+        # Validate all subnets
+        (0..32).each do |subnet|
+          assert_validation "123.4.53.12/#{subnet}"
+        end
+
+        # Some invalid IPv4 CIDR addresses
+        assert_validation '256.1.4.2/24' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+        assert_validation '2.4.522.1/32' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+        assert_validation '1.1.1/21' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+        assert_validation '1/4' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+        assert_validation '0.1.2.3/33' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+        assert_validation '0.1.2.3/123' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+
+        # Normal IPv4 addresses are not allowed
+        assert_validation '247.182.236.127' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+
+        # And IPv6 isn't allowed as well
+        assert_validation 'd91c:af3e:72f1:f5c3::::ad81' do
+          error '/', 'String does not match format "ipv4-cidr".'
+        end
+      end
+
       def test_format_ipv6
         schema :string, format: :ipv6
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.31
+  version: 3.0.33
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport