schemacop 3.0.27 → 3.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c0fc96299ed96cd4716792ebff5cd534a382bf0b3b986cf857a36041cba6da3
-  data.tar.gz: 2d3c689728bc7e9ebc5138be0b2b2cb9a06d2e77557914cc18880507c3d59cfb
+  metadata.gz: 0e7d7e77045f4130fe9e9863f3b6fddcbf5e847e4d461d2d40b13c472fecb40c
+  data.tar.gz: 55d594ce2ad63d13908e8d6cb97c4ae258b877c5b89d1ef52b64b345e4a83bf8
 SHA512:
-  metadata.gz: 1b9d0c4299ab4a94b70ecddcaf90ffee54b810f2b02f311afdd9d63dd7491f27382813211c2d4d66ceffbf2ab761f8b37b5a878daea227211c9bdfbf12214054
-  data.tar.gz: 381b90a930cc66ff5e098db51daf97aef4b30906ab4d0d9824d2616453e3144eb3adb42c84604a11608d1f83564722fff72d53d64eb1b9b433cc95d9773eadb9
+  metadata.gz: 5ea7238bd691e8ab2af17ae36e24fd10e3ad5033c2a70fd904ec253e6b57b4ab2b9a819781a5403a2e1d93bc138e2de82d8c42fe0ed730c10a2597fe2df85a3f
+  data.tar.gz: 84cff469cae0b9eefa9ce2a6675d301cc381082e694352818f5852a74296338957b172cf39e9420b49924696c6eab16f600388c89c7b816b187dfb22c3d5843d

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']
+        ruby-version: ['2.6.2', '2.7.1', '3.0.1', '3.1.0', '3.2.0', '3.3.0']
 
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## 3.0.29 (2024-06-06)
+
+* Add option `parse_json` to `hash` and `array` V3 nodes
+
+  Internal reference: `#125211`.
+
+## 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

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify gem dependencies in the .gemspec file
 gemspec
+
+# Development dependencies
+gem 'bundler'
+gem 'colorize'
+gem 'minitest'
+gem 'minitest-reporters'
+gem 'pry'
+gem 'rake'
+gem 'rubocop', '1.24.1'
+gem 'simplecov', '0.21.2'

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2016 - 2023 Sitrox
+Copyright © 2016 - 2024 Sitrox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -16,6 +16,8 @@ Schemacop is tested with the following ruby versions:
 * 2.7.1
 * 3.0.1
 * 3.1.0
+* 3.2.0
+* 3.3.0
 
 Other ruby versions might work but are not covered by our automated tests.
 
@@ -119,4 +121,4 @@ To run tests:
 
 ## Copyright
 
-Copyright © 2016 - 2023 Sitrox. See `LICENSE` for further details.
+Copyright © 2016 - 2024 Sitrox. See `LICENSE` for further details.

data/README_V2.md

@@ -144,11 +144,11 @@ s = Schema.new do
   req :foo, default: 42
 end
 
-collector = s.validate({}) 
+collector = s.validate({})
 collector.valid? # true
 collector.data   # => { foo: 42 }
 
-collector = s.validate({ foo: 'invalid' }) 
+collector = s.validate({ foo: 'invalid' })
 collector.valid?     # false
 collector.data       # => nil
 collector.exceptions # => Validation error
@@ -772,4 +772,4 @@ To run tests:
 
 ## Copyright
 
-Copyright (c) 2020 Sitrox. See `LICENSE` for further details.
+Copyright (c) 2024 Sitrox. See `LICENSE` for further details.

data/README_V3.md

@@ -632,6 +632,14 @@ It consists of one or multiple values, which can be validated using arbitrary no
 
   This is the inverse of option `filter`.
 
+* `parse_json`
+  Specifies whether JSON is accepted instead of an array. If this is set to
+  `true` and the given value is a string, Schemacop will attempt to parse the
+  string as JSON. If the JSON yields a valid array, it will cast the JSON to a
+  array and validate it using the given schema.
+
+  Defaults to `false`.
+
 #### Contains
 
 The `array` node features the *contains* node, which you can use with the DSL
@@ -855,6 +863,21 @@ end
 schema.validate!(['foo', 42, 0]) # => Schemacop::Exceptions::ValidationError: /[0]: Invalid type, got type "String", expected "integer".
 ```
 
+##### Parsing JSON
+
+By enabling `parse_json`, the given value will be parsed as JSON if it is a
+string instead of an array:
+
+```ruby
+# This schema will accept any additional properties, but remove them from the result
+schema = Schemacop::Schema3.new :array, parse_json: true do
+  list :integer
+end
+
+schema.validate!([1, 2, 3])   # => [1, 2, 3]
+schema.validate!('[1, 2, 3]') # => [1, 2, 3]
+```
+
 ### Hash
 
 Type: `:hash`\
@@ -892,6 +915,14 @@ It consists of key-value-pairs that can be validated using arbitrary nodes.
   If it is set to an enumerable (e.g. `Set` or `Array`), it functions as a
   white-list and only the given additional properties are allowed.
 
+* `parse_json`
+  Specifies whether JSON is accepted instead of a hash. If this is set to
+  `true` and the given value is a string, Schemacop will attempt to parse the
+  string as JSON. If the JSON yields a valid hash, it will cast the JSON to a
+  hash and validate it using the given schema.
+
+  Defaults to `false`.
+
 #### Specifying properties
 
 Hash nodes support a block in which you can specify the required hash contents.
@@ -1115,6 +1146,27 @@ schema.validate!({foo: :bar}) # => {"foo"=>:bar}
 schema.validate!({foo: :bar, baz: 42}) # => {"foo"=>:bar}
 ```
 
+##### Parsing JSON
+
+By enabling `parse_json`, the given value will be parsed as JSON if it is a
+string instead of a hash:
+
+```ruby
+# This schema will accept any additional properties, but remove them from the result
+schema = Schemacop::Schema3.new :hash, parse_json: true do
+  int! :id
+  str! :name
+end
+
+schema.validate!({
+  id: 42,
+  name: 'Jane Doe'
+}) # => { id: 42, name: 'Jane Doe' }
+schema.validate!('{ "id": 42, name: "Jane Doe" }') # => { "id" => 42, "name" => 'Jane Doe' }
+```
+
+Note that the parsed JSON will always result in string hash keys, not symbols.
+
 ##### Dependencies
 
 Using the DSL method `dep`, you can specifiy (non-nested) property dependencies:

data/Rakefile

@@ -19,15 +19,6 @@ task :gemspec do
     # behavior of that as in version 5 of ActiveSupport.
     spec.add_dependency 'activesupport', '>= 4.0'
     spec.add_dependency 'ruby2_keywords', '>= 0.0.4'
-    spec.add_development_dependency 'bundler'
-    spec.add_development_dependency 'rake'
-    spec.add_development_dependency 'minitest'
-    spec.add_development_dependency 'minitest-reporters'
-    spec.add_development_dependency 'colorize'
-    spec.add_development_dependency 'rubocop', '1.24.1'
-    spec.add_development_dependency 'pry'
-    spec.add_development_dependency 'byebug'
-    spec.add_development_dependency 'simplecov', '0.21.2'
   end
 
   File.write('schemacop.gemspec', gemspec.to_ruby.strip)

data/VERSION

@@ -1 +1 @@
-3.0.27
+3.0.29

data/lib/schemacop/v3/array_node.rb

@@ -10,7 +10,7 @@ module Schemacop
       supports_children
 
       def self.allowed_options
-        super + ATTRIBUTES + %i[additional_items reject filter]
+        super + ATTRIBUTES + %i[additional_items reject filter parse_json]
       end
 
       def self.dsl_methods
@@ -73,13 +73,21 @@ module Schemacop
       end
 
       def allowed_types
-        { Array => :array }
+        if options[:parse_json]
+          { Array => :array, String => :array }
+        else
+          { Array => :array }
+        end
       end
 
       def _validate(data, result:)
         super_data = super
         return if super_data.nil?
 
+        # Handle JSON
+        super_data = parse_if_json(super_data, result: result, allowed_types: { Array => :array })
+        return if super_data.nil?
+
         # Preprocess
         super_data = preprocess_array(super_data)
 
@@ -143,6 +151,8 @@ module Schemacop
       def cast(value)
         return default unless value
 
+        value = parse_if_json(value, allowed_types: { Array => :array })
+
         result = []
 
         value.each_with_index do |value_item, index|

data/lib/schemacop/v3/hash_node.rb

@@ -14,7 +14,7 @@ module Schemacop
       attr_reader :properties
 
       def self.allowed_options
-        super + ATTRIBUTES - %i[dependencies] + %i[additional_properties ignore_obsolete_properties]
+        super + ATTRIBUTES - %i[dependencies] + %i[additional_properties ignore_obsolete_properties parse_json]
       end
 
       def self.dsl_methods
@@ -78,13 +78,21 @@ module Schemacop
       end
 
       def allowed_types
-        { Hash => :object }
+        if options[:parse_json]
+          { Hash => :object, String => :string }
+        else
+          { Hash => :object }
+        end
       end
 
       def _validate(data, result: Result.new)
         super_data = super
         return if super_data.nil?
 
+        # Handle JSON
+        super_data = parse_if_json(super_data, result: result, allowed_types: { Hash => :object })
+        return if super_data.nil?
+
         original_data_hash = super_data.dup
         data_hash = super_data.with_indifferent_access
 
@@ -169,6 +177,7 @@ module Schemacop
       end
 
       def cast(data)
+        data = parse_if_json(data, allowed_types: { Hash => :object })
         result = {}.with_indifferent_access
         data ||= default
         return nil if data.nil?

data/lib/schemacop/v3/node.rb

@@ -192,6 +192,21 @@ module Schemacop
         return json.as_json
       end
 
+      def parse_if_json(data, allowed_types:, result: nil)
+        if data.is_a?(String)
+          data = JSON.parse(data)
+
+          if result && !validate_type(data, result, allowed_types: allowed_types)
+            return nil
+          end
+        end
+
+        return data
+      rescue JSON::ParserError => e
+        result&.error "JSON parse error: #{e.message.inspect}."
+        return nil
+      end
+
       def type_assertion_method
         :is_a?
       end
@@ -213,11 +228,7 @@ module Schemacop
         end
 
         # Validate type #
-        if allowed_types.any? && allowed_types.keys.none? { |c| data.send(type_assertion_method, c) }
-          collection = allowed_types.values.map { |t| "\"#{t}\"" }.uniq.sort.join(' or ')
-          result.error "Invalid type, got type \"#{data.class}\", expected #{collection}."
-          return nil
-        end
+        return nil unless validate_type(data, result)
 
         # Validate enums #
         if @enum && !@enum.include?(data)
@@ -227,6 +238,16 @@ module Schemacop
         return data
       end
 
+      def validate_type(data, result, allowed_types: self.allowed_types)
+        if allowed_types.any? && allowed_types.keys.none? { |c| data.send(type_assertion_method, c) }
+          collection = allowed_types.values.map { |t| "\"#{t}\"" }.uniq.sort.join(' or ')
+          result.error "Invalid type, got type \"#{data.class}\", expected #{collection}."
+          return false
+        end
+
+        return true
+      end
+
       def validate_self; end
     end
   end

data/lib/schemacop.rb

@@ -57,10 +57,9 @@ module Schemacop
 
   register_string_formatter(
     :mailbox,
-    pattern: %r{^.*\s?<[a-zA-Z0-9.!\#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*>$},
+    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,32 +1,33 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.27 ruby lib
+# stub: schemacop 3.0.29 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.27".freeze
+  s.version = "3.0.29"
 
   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-12-13"
+  s.date = "2024-06-06"
   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.4.22".freeze
+  s.rubygems_version = "3.0.3".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]
 
-  s.specification_version = 4
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
 
-  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])
+    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
 end

data/test/lib/test_helper.rb

@@ -28,7 +28,6 @@ require 'minitest/reporters'
 require 'schemacop'
 require 'pry'
 require 'colorize'
-require 'byebug'
 
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(color: true)]
 
@@ -131,7 +130,7 @@ class V3Test < SchemacopTest
 
               Expected
               --------
-              #{expected_error.blue}
+              #{expected_error.to_s.blue}
 
               #{'Actual'.red}
               #{'------'.red}

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

@@ -930,6 +930,31 @@ module Schemacop
           end
         end
       end
+
+      def test_parse_json
+        schema :array, parse_json: true do
+          list :integer
+        end
+        assert_validation([1, 2, 3])
+        assert_validation('[1,2,3]')
+        assert_cast('[1,2,3]', [1, 2, 3])
+
+        assert_validation('[1,2,"3"]') do
+          error '/[2]', 'Invalid type, got type "String", expected "integer".'
+        end
+
+        assert_validation('{ "id": 42 }') do
+          error '/', 'Invalid type, got type "Hash", expected "array".'
+        end
+
+        assert_validation('{42]') do
+          error '/', /JSON parse error: "(\d+: )?unexpected token at '{42]'"\./
+        end
+
+        assert_validation('"foo"') do
+          error '/', 'Invalid type, got type "String", expected "array".'
+        end
+      end
     end
   end
 end

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

@@ -14,6 +14,41 @@ module Schemacop
         assert_json(type: :object, additionalProperties: false)
       end
 
+      def test_parse_json
+        schema :hash, parse_json: true do
+          int! :id
+          str! :name
+        end
+        assert_validation({ id: 42, name: 'Jane Doe' })
+        assert_validation('{"id":42,"name":"Jane Doe"}')
+        assert_cast('{"id":42,"name":"Jane Doe"}', { id: 42, name: 'Jane Doe' }.stringify_keys)
+
+        assert_validation('{"id":42,"name":42}') do
+          error '/name', 'Invalid type, got type "Integer", expected "string".'
+        end
+
+        assert_validation('[42]') do
+          error '/', 'Invalid type, got type "Array", expected "object".'
+        end
+
+        assert_validation('{42]') do
+          error '/', /JSON parse error: "(\d+: )?unexpected token at '{42]'"\./
+        end
+
+        assert_validation('"foo"') do
+          error '/', 'Invalid type, got type "String", expected "object".'
+        end
+
+        schema :hash do
+          int! :id
+        end
+
+        assert_validation({ id: 42 })
+        assert_validation('{"id":42}') do
+          error '/', 'Invalid type, got type "String", expected "object".'
+        end
+      end
+
       def test_additional_properties_false_by_default
         schema
         assert_validation({})

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

@@ -196,43 +196,87 @@ module Schemacop
 
         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
 
-        assert_validation 'john.doe+foo-bar_baz@example.com' do
+        # Only leading angle bracket given
+        assert_validation '<john.doe@example.com' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation 'JOHN.DOE+FOO-BAR_BAZ@EXAMPLE.COM' do
+        # Only trailing angle bracket given
+        assert_validation 'john.doe@example.com>' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation 'someemail' do
+        # 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
 
-        assert_validation 'john doe@example.com' do
+        # Invalid email address given
+        assert_validation ' <john>' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation '@john@example.com' do
+        # 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
 
-        assert_validation 'John Doe <john.doe@example.com>'
-        assert_validation 'John Doe <john.doe+foo-bar_baz@example.com>'
-        assert_validation 'John Doe <JOHN.DOE+FOO-BAR_BAZ@EXAMPLE.COM>'
+        # 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
 
-        assert_validation 'John <john.doe@example.com>'
-        assert_validation 'John Doe 123 <john.doe@example.com>'
-        assert_validation 'John_Doe <john.doe@example.com>'
-        assert_validation 'John-Doe ÖÄ <john.doe@example.com>'
+        # Name with quotes and space before mail, OK
         assert_validation '"John Doe" <john.doe@example.com>'
-        assert_validation '<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 <john.doe@example.com>', 'John Doe <john.doe@example.com>')
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.27
+  version: 3.0.29
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,134 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.24.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.24.1
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -277,7 +151,7 @@ homepage: https://github.com/sitrox/schemacop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -292,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key: 
+rubygems_version: 3.5.4
+signing_key:
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.