schemacop 3.0.26 → 3.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23f9d2f61955b57515d279b5ca4306aada1636d0935b6dad4c6cbe9a1e08a7ac
-  data.tar.gz: f618057644a8584dbf375a6544915eccc266226ad1e483c30035d992f26c06a5
+  metadata.gz: ff2b18b4f3426f6a06e4a9183c3b20375c5d55496929bdf30a569c19ad1cc28c
+  data.tar.gz: edb96299b93d5e49b6d5a8125fa2c95a73d6158c2cae4d4428c3fe9066b41244
 SHA512:
-  metadata.gz: a52ea42b484fca411e9f75db534f30f948334f683d6982b124a3ec324075c5f78efd03c75be0b372f0b0702b80c137a6c73de9418a17f8bb57ac05c073df77ce
-  data.tar.gz: a731ef060906674ac381311b64b021f7315601ff46d4884828bdd5a4cf39e8e580144f28d637675a5ef0ca26acd04e711b813cbca5082ff3d365e9ba04a37332
+  metadata.gz: 49b290cbf2a7fdfc4b938fbdad9d4bd54469867fa46be22dc1a2158c32fe68266d1cce136d824a263689b9fdd9797ddfd601c7fa9fafbd37bb9adf3634f126ba
+  data.tar.gz: 73241d7daed75ad77a230904821749dcb0e954f8c3c858bc207d9487dd4b7cffbe806ea7a64dffc28010e6dc27281133d5191129781ad2c462dbe2f395b76278

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## 3.0.28 (2023-12-20)
+
+* Fix `mailbox` format allowing incorrectly formatted strings
+
+## 3.0.27 (2023-12-13)
+
+* Add format `mailbox` to `str` node for Schemacop3 schemas
+
 ## 3.0.26 (2023-11-16)
 
 * Lock dependency `ruby2_keywords` to the more open `>= 0.0.4`

data/README_V3.md

@@ -243,6 +243,11 @@ transformed into various types.
   Validates for a valid email address. There is no casting involved since email
   addresses do not have their own ruby type.
 
+* `mailbox`
+  Validates for a valid mailbox, which is defined as a valid email enclosed in
+  brackets (`< >`), with an optional name before the email address. There is no
+  casting involved.
+
 * `boolean`
   The string must be either `true`, `false`, `0` or `1`. This value will be
   casted to Ruby's `TrueClass` or `FalseClass`. Please note that the strings

data/VERSION

@@ -1 +1 @@
-3.0.26
+3.0.28

data/lib/schemacop.rb

@@ -55,6 +55,11 @@ module Schemacop
     handler: ->(value) { value }
   )
 
+  register_string_formatter(
+    :mailbox,
+    pattern: /^("\p{Print}+"\s)?<#{URI::MailTo::EMAIL_REGEXP.source[2...-2]}>$/,
+    handler: ->(value) { value }
+  )
   register_string_formatter(
     :boolean,
     pattern: /^(true|false|0|1)$/i,

data/schemacop.gemspec

@@ -1,60 +1,32 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.26 ruby lib
+# stub: schemacop 3.0.28 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.26"
+  s.version = "3.0.28".freeze
 
   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 = "2023-11-16"
+  s.date = "2023-12-20"
   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.22".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"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_development_dependency(%q<minitest-reporters>.freeze, [">= 0"])
-      s.add_development_dependency(%q<colorize>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rubocop>.freeze, ["= 1.24.1"])
-      s.add_development_dependency(%q<pry>.freeze, [">= 0"])
-      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
-      s.add_development_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
-    else
-      s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
-      s.add_dependency(%q<ruby2_keywords>.freeze, [">= 0.0.4"])
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_dependency(%q<minitest-reporters>.freeze, [">= 0"])
-      s.add_dependency(%q<colorize>.freeze, [">= 0"])
-      s.add_dependency(%q<rubocop>.freeze, ["= 1.24.1"])
-      s.add_dependency(%q<pry>.freeze, [">= 0"])
-      s.add_dependency(%q<byebug>.freeze, [">= 0"])
-      s.add_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
-    end
-  else
-    s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
-    s.add_dependency(%q<ruby2_keywords>.freeze, [">= 0.0.4"])
-    s.add_dependency(%q<bundler>.freeze, [">= 0"])
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<minitest>.freeze, [">= 0"])
-    s.add_dependency(%q<minitest-reporters>.freeze, [">= 0"])
-    s.add_dependency(%q<colorize>.freeze, [">= 0"])
-    s.add_dependency(%q<rubocop>.freeze, ["= 1.24.1"])
-    s.add_dependency(%q<pry>.freeze, [">= 0"])
-    s.add_dependency(%q<byebug>.freeze, [">= 0"])
-    s.add_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
-  end
+  s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0".freeze])
+  s.add_runtime_dependency(%q<ruby2_keywords>.freeze, [">= 0.0.4".freeze])
+  s.add_development_dependency(%q<bundler>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<rake>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<minitest>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<minitest-reporters>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<colorize>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<rubocop>.freeze, ["= 1.24.1".freeze])
+  s.add_development_dependency(%q<pry>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<byebug>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, ["= 0.21.2".freeze])
 end

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

@@ -191,6 +191,94 @@ module Schemacop
         assert_cast('john.doe@example.com', 'john.doe@example.com')
       end
 
+      def test_format_mailbox
+        schema :string, format: :mailbox
+
+        assert_json(type: :string, format: :mailbox)
+
+        # No angle brackets given
+        assert_validation 'john.doe@example.com' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Only leading angle bracket given
+        assert_validation '<john.doe@example.com' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Only trailing angle bracket given
+        assert_validation 'john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Both angle brackets given, OK
+        assert_validation '<john.doe@example.com>'
+
+        # Both angle brackets given but leading space, not okay
+        assert_validation ' <john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Invalid email address given
+        assert_validation ' <john>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Invalid email address given
+        assert_validation ' <john@>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Invalid email address given
+        assert_validation ' <@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name given but no quotes
+        assert_validation 'John Doe <john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name given but only leading quote
+        assert_validation '"John Doe <john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name given but only trailing quote
+        assert_validation 'John Doe" <john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name given but no space between mail and name
+        assert_validation '"John Doe"<john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Too many brackets at start
+        assert_validation '"John Doe" <<john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Too many brackets at end
+        assert_validation '"John Doe" <john.doe@example.com>>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name with quotes and space before mail, OK
+        assert_validation '"John Doe" <john.doe@example.com>'
+
+        # Name with quotes and space before mail with special characters, OK
+        assert_validation '"Jöhn Doé-Test" <john.doe@example.com>'
+
+        # Name with quotes and space before mail with angle bracket in name, OK
+        assert_validation '"John < Doe" <john.doe@example.com>'
+
+        assert_cast(nil, nil)
+        assert_cast('<john.doe@example.com>', '<john.doe@example.com>')
+        assert_cast('"John Doe" <john.doe@example.com>', '"John Doe" <john.doe@example.com>')
+        assert_cast('"Jöhn Doé-Test" <john.doe@example.com>', '"Jöhn Doé-Test" <john.doe@example.com>')
+      end
+
       def test_format_boolean
         schema :string, format: :boolean
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.26
+  version: 3.0.28
 platform: ruby
 authors:
 - Sitrox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,8 +164,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.21.2
-description:
-email:
+description: 
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -277,7 +277,7 @@ homepage: https://github.com/sitrox/schemacop
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -292,8 +292,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.4.22
+signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.