schemacop 3.0.6 → 3.0.11

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

@@ -182,6 +182,18 @@ module Schemacop
           schema :one_of
         end
       end
+
+      def test_treat_blank_as_nil
+        schema :one_of, treat_blank_as_nil: true do
+          boo
+          str format: :boolean
+        end
+
+        assert_validation(nil)
+        assert_validation('')
+        assert_validation('true')
+        assert_validation(true)
+      end
     end
   end
 end

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

@@ -26,13 +26,13 @@ module Schemacop
           assert_validation(bar: { foo: 'String', baz: { foo: 42 } })
 
           assert_validation(foo: 42) do
-            error '/foo', 'Invalid type, expected "string".'
+            error '/foo', 'Invalid type, got type "Integer", expected "string".'
           end
           assert_validation(bar: { foo: 42 }) do
-            error '/bar/foo', 'Invalid type, expected "string".'
+            error '/bar/foo', 'Invalid type, got type "Integer", expected "string".'
           end
           assert_validation(bar: { foo: 'String', baz: { foo: '42' } }) do
-            error '/bar/baz/foo', 'Invalid type, expected "integer".'
+            error '/bar/baz/foo', 'Invalid type, got type "String", expected "integer".'
           end
 
           assert_json({
@@ -306,7 +306,7 @@ module Schemacop
         with_context context do
           assert_validation(first_name: 'John', last_name: 'Doe')
           assert_validation(first_name: 'John', last_name: 42) do
-            error '/last_name', 'Invalid type, expected "string".'
+            error '/last_name', 'Invalid type, got type "Integer", expected "string".'
           end
         end
 

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

@@ -3,7 +3,9 @@ require 'test_helper'
 module Schemacop
   module V3
     class StringNodeTest < V3Test
-      EXP_INVALID_TYPE = 'Invalid type, expected "string".'.freeze
+      def self.invalid_type_error(type)
+        "Invalid type, got type \"#{type}\", expected \"string\"."
+      end
 
       def test_basic
         schema :string
@@ -33,7 +35,7 @@ module Schemacop
         assert_json(type: :string)
 
         assert_validation 42 do
-          error '/', EXP_INVALID_TYPE
+          error '/', StringNodeTest.invalid_type_error(Integer)
         end
 
         schema { str! :name }
@@ -41,11 +43,11 @@ module Schemacop
         assert_json(type: :object, properties: { name: { type: :string } }, required: %i[name], additionalProperties: false)
 
         assert_validation name: :foo do
-          error '/name', EXP_INVALID_TYPE
+          error '/name', StringNodeTest.invalid_type_error(Symbol)
         end
 
         assert_validation name: 234 do
-          error '/name', EXP_INVALID_TYPE
+          error '/name', StringNodeTest.invalid_type_error(Integer)
         end
       end
 
@@ -190,7 +192,7 @@ module Schemacop
         assert_validation ''
 
         assert_validation 234 do
-          error '/', 'Invalid type, expected "string".'
+          error '/', StringNodeTest.invalid_type_error(Integer)
         end
 
         assert_cast(nil, nil)
@@ -218,7 +220,7 @@ module Schemacop
         # Integer value 42 is in the enum of allowed values, but it's not a string,
         # so the validation still fails
         assert_validation 42 do
-          error '/', 'Invalid type, expected "string".'
+          error '/', StringNodeTest.invalid_type_error(Integer)
         end
       end
 
@@ -278,7 +280,7 @@ module Schemacop
         assert_validation(nil)
         assert_validation('Foo')
         assert_validation(5) do
-          error '/', 'Invalid type, expected "string".'
+          error '/', StringNodeTest.invalid_type_error(Integer)
         end
 
         assert_cast('Foo', 'Foo')
@@ -297,7 +299,7 @@ module Schemacop
         assert_validation(nil)
         assert_validation('123')
         assert_validation(5) do
-          error '/', 'Invalid type, expected "string".'
+          error '/', StringNodeTest.invalid_type_error(Integer)
         end
 
         assert_cast('123', 123)
@@ -364,13 +366,13 @@ module Schemacop
         # Even we put those types in the enum, they need to fail the validations,
         # as they are not strings
         assert_validation(1) do
-          error '/', 'Invalid type, expected "string".'
+          error '/', StringNodeTest.invalid_type_error(Integer)
         end
         assert_validation(:bar) do
-          error '/', 'Invalid type, expected "string".'
+          error '/', StringNodeTest.invalid_type_error(Symbol)
         end
         assert_validation({ qux: 42 }) do
-          error '/', 'Invalid type, expected "string".'
+          error '/', StringNodeTest.invalid_type_error(Hash)
         end
 
         # These need to fail validation, as they are not in the enum list
@@ -400,6 +402,53 @@ module Schemacop
                       ]
                     })
       end
+
+      def test_cast_empty_or_whitespace_string
+        schema :string
+
+        assert_cast(nil, nil)
+        assert_cast('', '')
+        assert_cast('    ', '    ')
+        assert_cast("\n", "\n")
+        assert_cast("\t", "\t")
+      end
+
+      def test_cast_empty_or_whitespace_string_required
+        schema :string, required: true
+
+        assert_validation(nil) do
+          error '/', 'Value must be given.'
+        end
+
+        assert_cast('', '')
+        assert_cast('    ', '    ')
+        assert_cast("\n", "\n")
+        assert_cast("\t", "\t")
+      end
+
+      def test_empty_or_whitespace_string_blank_not_allowed
+        schema :string, allow_blank: false
+
+        assert_validation(nil) do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation('') do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation('   ') do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation("\n") do
+          error '/', 'String is blank but must not be blank!'
+        end
+
+        assert_validation("\t") do
+          error '/', 'String is blank but must not be blank!'
+        end
+      end
     end
   end
 end

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

@@ -3,7 +3,10 @@ require 'test_helper'
 module Schemacop
   module V3
     class SymbolNodeTest < V3Test
-      EXP_INVALID_TYPE = 'Invalid type, expected "Symbol".'.freeze
+      def self.invalid_type_error(type)
+        type = type.class unless type.class == Class
+        "Invalid type, got type \"#{type}\", expected \"Symbol\"."
+      end
 
       def test_basic
         schema :symbol
@@ -11,10 +14,10 @@ module Schemacop
         assert_validation :foo
         assert_validation :'n0238n)Q(hqr3hrw3'
         assert_validation 42 do
-          error '/', EXP_INVALID_TYPE
+          error '/', SymbolNodeTest.invalid_type_error(Integer)
         end
         assert_validation '42' do
-          error '/', EXP_INVALID_TYPE
+          error '/', SymbolNodeTest.invalid_type_error(String)
         end
         assert_json({})
       end
@@ -56,13 +59,13 @@ module Schemacop
         # Even we put those types in the enum, they need to fail the validations,
         # as they are not symbols
         assert_validation('foo') do
-          error '/', 'Invalid type, expected "Symbol".'
+          error '/', SymbolNodeTest.invalid_type_error(String)
         end
         assert_validation(1) do
-          error '/', 'Invalid type, expected "Symbol".'
+          error '/', SymbolNodeTest.invalid_type_error(Integer)
         end
         assert_validation({ qux: 42 }) do
-          error '/', 'Invalid type, expected "Symbol".'
+          error '/', SymbolNodeTest.invalid_type_error(Hash)
         end
 
         # These need to fail validation, as they are not in the enum list
@@ -70,6 +73,20 @@ module Schemacop
           error '/', 'Value not included in enum [1, 2, "foo", :bar, {:qux=>42}].'
         end
       end
+
+      # rubocop:disable Lint/BooleanSymbol
+      def test_cast_str
+        schema :symbol, cast_str: true
+
+        assert_cast('true', :true)
+        assert_cast('foo', :foo)
+        assert_cast('1', :'1')
+
+        assert_cast(:true, :true)
+        assert_cast(:foo, :foo)
+        assert_cast(:'1', :'1')
+      end
+      # rubocop:enable Lint/BooleanSymbol
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.11
 platform: ruby
 authors:
 - Sitrox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-03-26 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.1.4
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.