schemacop 3.0.8 → 3.0.12

data/VERSION

@@ -1 +1 @@
-3.0.8
+3.0.12

data/lib/schemacop/v3/combination_node.rb

@@ -38,7 +38,7 @@ module Schemacop
       end
 
       def matches(data)
-        @items.filter { |i| item_matches?(i, data) }
+        @items.select { |i| item_matches?(i, data) }
       end
     end
   end

data/lib/schemacop/v3/node.rb

@@ -33,10 +33,11 @@ module Schemacop
         if options.delete(:cast_str)
           format = NodeRegistry.name(klass)
           one_of_options = {
-            required:    options.delete(:required),
-            name:        options.delete(:name),
-            as:          options.delete(:as),
-            description: options.delete(:description)
+            required:           options.delete(:required),
+            treat_blank_as_nil: true,
+            name:               options.delete(:name),
+            as:                 options.delete(:as),
+            description:        options.delete(:description)
           }
           node = create(:one_of, **one_of_options) do
             self.node node
@@ -206,7 +207,7 @@ module Schemacop
         # 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, expected #{collection}.)
+          result.error "Invalid type, got type \"#{data.class}\", expected #{collection}."
           return nil
         end
 

data/lib/schemacop/v3/one_of_node.rb

@@ -5,8 +5,30 @@ module Schemacop
         :oneOf
       end
 
+      def self.allowed_options
+        super + %i[treat_blank_as_nil]
+      end
+
+      def cast(value)
+        item = match(value)
+
+        unless item
+          if options[:treat_blank_as_nil] && value.blank? && !value.is_a?(FalseClass)
+            return nil
+          else
+            return value
+          end
+        end
+
+        return item.cast(value)
+      end
+
       def _validate(data, result:)
-        super_data = super
+        if options[:treat_blank_as_nil] && data.blank? && !data.is_a?(FalseClass)
+          data = nil
+        end
+
+        super_data = super(data, result: result)
         return if super_data.nil?
 
         matches = matches(super_data)

data/lib/schemacop/v3/string_node.rb

@@ -22,7 +22,7 @@ module Schemacop
       # rubocop:enable Layout/LineLength
 
       def self.allowed_options
-        super + ATTRIBUTES + %i[format_options pattern]
+        super + ATTRIBUTES + %i[format_options pattern allow_blank]
       end
 
       def allowed_types
@@ -39,6 +39,12 @@ module Schemacop
 
       def _validate(data, result:)
         super_data = super
+
+        # Validate blank #
+        if options[:allow_blank].is_a?(FalseClass) && super_data.blank?
+          result.error 'String is blank but must not be blank!'
+        end
+
         return if super_data.nil?
 
         # Validate length #
@@ -76,7 +82,7 @@ module Schemacop
       end
 
       def cast(value)
-        if value.present?
+        if !value.nil?
           to_cast = value
         elsif default.present?
           to_cast = default

data/schemacop.gemspec

@@ -1,37 +1,49 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.8 ruby lib
+# stub: schemacop 3.0.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.8"
+  s.version = "3.0.12"
 
   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 = "2021-02-23"
-  s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.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.date = "2021-09-14"
+  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.1.2".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]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  if s.respond_to? :add_runtime_dependency 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, ["= 0.92.0"])
-    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"])
+    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, ["= 0.92.0"])
+      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, ["= 0.92.0"])
+      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"])

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

@@ -3,7 +3,9 @@ require 'test_helper'
 module Schemacop
   module V3
     class ArrayNodeTest < V3Test
-      EXP_INVALID_TYPE = 'Invalid type, expected "array".'.freeze
+      def self.invalid_type_error(type)
+        "Invalid type, got type \"#{type}\", expected \"array\"."
+      end
 
       def test_basic
         schema :array
@@ -54,7 +56,7 @@ module Schemacop
           error '/', 'Array has 2 items but must have exactly 1.'
         end
         assert_validation [123] do
-          error '/[0]', 'Invalid type, expected "object".'
+          error '/[0]', 'Invalid type, got type "Integer", expected "object".'
         end
       end
 
@@ -64,7 +66,7 @@ module Schemacop
         assert_json(type: :array)
 
         assert_validation 42 do
-          error '/', EXP_INVALID_TYPE
+          error '/', ArrayNodeTest.invalid_type_error(Integer)
         end
 
         schema { ary! :foo }
@@ -79,11 +81,11 @@ module Schemacop
         )
 
         assert_validation foo: 42 do
-          error '/foo', EXP_INVALID_TYPE
+          error '/foo', ArrayNodeTest.invalid_type_error(Integer)
         end
 
         assert_validation foo: {} do
-          error '/foo', EXP_INVALID_TYPE
+          error '/foo', ArrayNodeTest.invalid_type_error(ActiveSupport::HashWithIndifferentAccess)
         end
       end
 
@@ -196,7 +198,7 @@ module Schemacop
         end
 
         assert_validation %i[foo] do
-          error '/[0]', 'Invalid type, expected "string".'
+          error '/[0]', 'Invalid type, got type "Symbol", expected "string".'
         end
       end
 
@@ -230,7 +232,7 @@ module Schemacop
         end
 
         assert_validation([42, 42, { name: 'Hello' }]) do
-          error '/[0]', 'Invalid type, expected "string".'
+          error '/[0]', 'Invalid type, got type "Integer", expected "string".'
         end
 
         assert_validation(['foo', 42, { namex: 'Hello' }]) do
@@ -305,7 +307,7 @@ module Schemacop
         assert_validation(['foo', 42])
         assert_validation(['foo', 42, 42])
         assert_validation(['foo', :foo]) do
-          error '/[1]', 'Invalid type, expected "integer".'
+          error '/[1]', 'Invalid type, got type "Symbol", expected "integer".'
         end
       end
 
@@ -328,7 +330,7 @@ module Schemacop
         assert_validation(['foo', 42])
         assert_validation(['foo', 42, 'additional', 'another'])
         assert_validation(['foo', 42, 'additional', 42, 'another']) do
-          error '/[3]', 'Invalid type, expected "string".'
+          error '/[3]', 'Invalid type, got type "Integer", expected "string".'
         end
 
         assert_cast(['foo', 42], ['foo', 42])
@@ -354,7 +356,7 @@ module Schemacop
         assert_validation(['foo', 42])
         assert_validation(['foo', 42, '1990-01-01'])
         assert_validation(['foo', 42, '1990-01-01', 42]) do
-          error '/[3]', 'Invalid type, expected "string".'
+          error '/[3]', 'Invalid type, got type "Integer", expected "string".'
         end
         assert_validation(['foo', 42, '1990-01-01', 'foo']) do
           error '/[3]', 'String does not match format "date".'
@@ -439,7 +441,7 @@ module Schemacop
         assert_validation(['foo', 42, { foo: '1990-01-01', bar: :baz }])
 
         assert_validation(['foo', 42, { foo: 1234 }]) do
-          error '/[2]/foo', 'Invalid type, expected "string".'
+          error '/[2]/foo', 'Invalid type, got type "Integer", expected "string".'
         end
         assert_validation(['foo', 42, { foo: 'String' }]) do
           error '/[2]/foo', 'String does not match format "date".'
@@ -555,16 +557,16 @@ module Schemacop
         # Even we put those types in the enum, they need to fail the validations,
         # as they are not arrays
         assert_validation('foo') do
-          error '/', 'Invalid type, expected "array".'
+          error '/', ArrayNodeTest.invalid_type_error(String)
         end
         assert_validation(1) do
-          error '/', 'Invalid type, expected "array".'
+          error '/', ArrayNodeTest.invalid_type_error(Integer)
         end
         assert_validation(:bar) do
-          error '/', 'Invalid type, expected "array".'
+          error '/', ArrayNodeTest.invalid_type_error(Symbol)
         end
         assert_validation({ qux: 42 }) do
-          error '/', 'Invalid type, expected "array".'
+          error '/', ArrayNodeTest.invalid_type_error(Hash)
         end
 
         # These need to fail validation, as they are not in the enum list
@@ -669,8 +671,8 @@ module Schemacop
         assert_validation([1, 2, 3, 4, 5, 6])
 
         assert_validation([1, :foo, 'bar']) do
-          error '/[1]', 'Invalid type, expected "integer".'
-          error '/[2]', 'Invalid type, expected "integer".'
+          error '/[1]', 'Invalid type, got type "Symbol", expected "integer".'
+          error '/[2]', 'Invalid type, got type "String", expected "integer".'
         end
       end
 

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

@@ -4,7 +4,10 @@ require 'test_helper'
 module Schemacop
   module V3
     class BooleanNodeTest < V3Test
-      EXP_INVALID_TYPE = 'Invalid type, expected "boolean".'.freeze
+      def self.invalid_type_error(type)
+        type = type.class unless type.class == Class
+        "Invalid type, got type \"#{type}\", expected \"boolean\"."
+      end
 
       def test_basic
         schema :boolean
@@ -47,12 +50,12 @@ module Schemacop
         assert_json(type: :boolean)
 
         assert_validation 42 do
-          error '/', EXP_INVALID_TYPE
+          error '/', BooleanNodeTest.invalid_type_error(Integer)
         end
 
         [:true, 'true', :false, 'false', 0, 1].each do |value|
           assert_validation value do
-            error '/', EXP_INVALID_TYPE
+            error '/', BooleanNodeTest.invalid_type_error(value)
           end
         end
 
@@ -68,7 +71,7 @@ module Schemacop
 
         [:true, 'true', :false, 'false', 0, 1].each do |value|
           assert_validation name: value do
-            error '/name', EXP_INVALID_TYPE
+            error '/name', BooleanNodeTest.invalid_type_error(value)
           end
         end
       end
@@ -87,13 +90,13 @@ module Schemacop
         # Even we put those types in the enum, they need to fail the validations,
         # as they are not booleans
         assert_validation('foo') do
-          error '/', 'Invalid type, expected "boolean".'
+          error '/', BooleanNodeTest.invalid_type_error(String)
         end
         assert_validation(:bar) do
-          error '/', 'Invalid type, expected "boolean".'
+          error '/', BooleanNodeTest.invalid_type_error(Symbol)
         end
         assert_validation({ qux: 42 }) do
-          error '/', 'Invalid type, expected "boolean".'
+          error '/', BooleanNodeTest.invalid_type_error(Hash)
         end
 
         # These need to fail validation, as they are not in the enum list
@@ -149,6 +152,36 @@ module Schemacop
         assert_validation('1') do
           error '/', 'Matches 0 definitions but should match exactly 1.'
         end
+
+        # Nil can be validated, as it's not required
+        assert_validation(nil)
+
+        assert_validation('')
+
+        assert_cast('', nil)
+        assert_cast(nil, nil)
+      end
+
+      def test_cast_str_required
+        schema :boolean, cast_str: true, required: true
+
+        assert_cast('true', true)
+        assert_cast('false', false)
+
+        assert_cast(true, true)
+        assert_cast(false, false)
+
+        assert_validation('1') do
+          error '/', 'Matches 0 definitions but should match exactly 1.'
+        end
+
+        assert_validation(nil) do
+          error '/', 'Value must be given.'
+        end
+
+        assert_validation('') do
+          error '/', 'Value must be given.'
+        end
       end
     end
   end

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

@@ -3,8 +3,6 @@ require 'test_helper'
 module Schemacop
   module V3
     class HashNodeTest < V3Test
-      EXP_INVALID_TYPE = 'Invalid type, expected "hash".'.freeze
-
       def test_basic
         schema
         assert_validation({})
@@ -54,7 +52,7 @@ module Schemacop
 
         assert_validation(foo: 'bar', baz: 'foo', answer: '42')
         assert_validation(foo: 'bar', baz: 'foo', answer: 42) do
-          error '/answer', 'Invalid type, expected "string".'
+          error '/answer', 'Invalid type, got type "Integer", expected "string".'
         end
 
         assert_json(
@@ -70,7 +68,7 @@ module Schemacop
           @schema.validate!({ foo: 'foo' })
         end
 
-        assert_raises_with_message Exceptions::ValidationError, '/bar: Invalid type, expected "string".' do
+        assert_raises_with_message Exceptions::ValidationError, '/bar: Invalid type, got type "Symbol", expected "string".' do
           @schema.validate!({ foo: 'foo', bar: :baz })
         end
       end
@@ -247,7 +245,7 @@ module Schemacop
 
         assert_validation(name: 'John', xy: 'John', bar_baz: 'Doe') do
           error '/', 'Obsolete property "xy".'
-          error '/bar_baz', 'Invalid type, expected "integer".'
+          error '/bar_baz', 'Invalid type, got type "String", expected "integer".'
         end
 
         assert_json(
@@ -276,7 +274,7 @@ module Schemacop
         assert_validation(keyword: 'value')
 
         assert_validation(keyword: 42) do
-          error '/keyword', 'Invalid type, expected "string".'
+          error '/keyword', 'Invalid type, got type "Integer", expected "string".'
         end
 
         assert_json(
@@ -759,10 +757,10 @@ module Schemacop
         # Even we put those types in the enum, they need to fail the validations,
         # as they are not strings
         assert_validation({ foo: 123 }) do
-          error '/foo', 'Invalid type, expected "string".'
+          error '/foo', 'Invalid type, got type "Integer", expected "string".'
         end
         assert_validation({ foo: :faz }) do
-          error '/foo', 'Invalid type, expected "string".'
+          error '/foo', 'Invalid type, got type "Symbol", expected "string".'
         end
 
         # These need to fail validation, as they are not in the enum list
@@ -918,7 +916,7 @@ module Schemacop
         end
 
         assert_validation({ foo: '13' }) do
-          error '/foo', 'Invalid type, expected "integer".'
+          error '/foo', 'Invalid type, got type "String", expected "integer".'
         end
 
         assert_cast(nil, nil)
@@ -937,7 +935,7 @@ module Schemacop
         assert_validation({ foo: 42, bar: 13 })
 
         assert_validation({ foo: '13' }) do
-          error '/foo', 'Invalid type, expected "integer".'
+          error '/foo', 'Invalid type, got type "String", expected "integer".'
         end
 
         # assert_cast(nil, nil)
@@ -959,7 +957,7 @@ module Schemacop
         end
 
         assert_validation({ foo: '13' }) do
-          error '/foo', 'Invalid type, expected "integer".'
+          error '/foo', 'Invalid type, got type "String", expected "integer".'
         end
 
         assert_cast(nil, nil)
@@ -967,6 +965,46 @@ module Schemacop
         assert_cast({ foo: 42, bar: 13 }, { bar: 42 }.with_indifferent_access)
         assert_cast({ bar: 13, foo: 42 }, { bar: 42 }.with_indifferent_access)
       end
+
+      def test_cast_str_required
+        schema :hash do
+          boo! :active, cast_str: true
+          int! :id, cast_str: true
+        end
+
+        assert_validation({ active: true, id: 1 })
+        assert_validation({ active: 'true', id: '1' })
+
+        assert_validation({}) do
+          error '/active', 'Value must be given.'
+          error '/id', 'Value must be given.'
+        end
+
+        assert_cast({ active: 'true', id: '1' }, { active: true, id: 1 }.with_indifferent_access)
+
+        assert_validation({ active: '', id: '' }) do
+          error '/active', 'Value must be given.'
+          error '/id', 'Value must be given.'
+        end
+      end
+
+      def test_cast_str_optional
+        schema :hash do
+          boo? :active, cast_str: true
+          int? :id, cast_str: true
+        end
+
+        assert_validation({ active: true, id: 1 })
+        assert_validation({ active: 'true', id: '1' })
+
+        assert_cast({ active: 'true', id: '1' }, { active: true, id: 1 }.with_indifferent_access)
+
+        assert_validation({})
+        assert_validation({ active: nil, id: nil })
+
+        assert_validation({ active: '', id: '' })
+        assert_cast({ active: '', id: '' }, { active: nil, id: nil }.with_indifferent_access)
+      end
     end
   end
 end