schemacop 2.3.0 → 2.4.2

data/test/test_helper.rb

@@ -1,6 +1,13 @@
 require 'minitest/autorun'
 require 'schemacop'
+require 'pry'
+require 'colorize'
 
 def assert_verr(&_block)
   assert_raises(Schemacop::Exceptions::ValidationError) { yield }
 end
+
+def assert_nothing_raised(&_block)
+  yield
+  assert true
+end

data/test/types_test.rb

@@ -40,9 +40,9 @@ module Schemacop
         type :integer, min: 5
       end
 
-      assert_nil s.validate! true
-      assert_nil s.validate! false
-      assert_nil s.validate! 5
+      assert_nothing_raised { s.validate! true }
+      assert_nothing_raised { s.validate! false }
+      assert_nothing_raised { s.validate! 5 }
 
       assert_verr { s.validate! 'sali' }
       assert_verr { s.validate! 4 }
@@ -55,7 +55,7 @@ module Schemacop
           type :integer
         end
       end
-      assert_nil s.validate! [5]
+      assert_nothing_raised { s.validate! [5] }
       assert_verr { s.validate! [nil] }
       assert_verr { s.validate! ['a'] }
       assert_verr { s.validate! [5, 'a'] }
@@ -74,7 +74,7 @@ module Schemacop
            (type == :number && allowed_types.include?(:float)) ||
            allowed_types.include?(:object)
 
-          assert_nil schema.validate! data
+          assert_nothing_raised { schema.validate! data }
         else
           assert_verr { schema.validate! data }
         end

data/test/validator_array_test.rb

@@ -8,9 +8,9 @@ module Schemacop
           type :integer
         end
       end
-      assert_nil s.validate!([])
-      assert_nil s.validate!([0])
-      assert_nil s.validate!([0, 1])
+      assert_nothing_raised { s.validate!([]) }
+      assert_nothing_raised { s.validate!([0]) }
+      assert_nothing_raised { s.validate!([0, 1]) }
       assert_verr { s.validate!(['string']) }
     end
 
@@ -19,8 +19,8 @@ module Schemacop
         type :array, min: 2
       end
 
-      assert_nil s.validate!([0, 1])
-      assert_nil s.validate!([0, 1, 2])
+      assert_nothing_raised { s.validate!([0, 1]) }
+      assert_nothing_raised { s.validate!([0, 1, 2]) }
       assert_verr { s.validate!([]) }
       assert_verr { s.validate!([0]) }
     end
@@ -30,9 +30,9 @@ module Schemacop
         type :array, max: 2
       end
 
-      assert_nil s.validate!([])
-      assert_nil s.validate!([0])
-      assert_nil s.validate!([0, 1])
+      assert_nothing_raised { s.validate!([]) }
+      assert_nothing_raised { s.validate!([0]) }
+      assert_nothing_raised { s.validate!([0, 1]) }
       assert_verr { s.validate!([0, 1, 2]) }
     end
 
@@ -43,8 +43,8 @@ module Schemacop
         end
       end
 
-      assert_nil s.validate!([1, 2])
-      assert_nil s.validate!([1, 2, 3])
+      assert_nothing_raised { s.validate!([1, 2]) }
+      assert_nothing_raised { s.validate!([1, 2, 3]) }
       assert_verr { s.validate!([]) }
       assert_verr { s.validate!([1]) }
       assert_verr { s.validate!([1, 2, 3, 4]) }
@@ -57,7 +57,7 @@ module Schemacop
         end
       end
 
-      assert_nil s.validate!([1, nil, 2])
+      assert_nothing_raised { s.validate!([1, nil, 2]) }
       assert_verr { s.validate!([1, nil, 'nope']) }
     end
 
@@ -71,8 +71,8 @@ module Schemacop
         end
       end
 
-      assert_nil s.validate!([1, 2, 3])
-      assert_nil s.validate!(%w(one two three))
+      assert_nothing_raised { s.validate!([1, 2, 3]) }
+      assert_nothing_raised { s.validate!(%w(one two three)) }
       assert_verr { s.validate!([1, 'mix']) }
       assert_verr { s.validate!([]) }
     end
@@ -88,9 +88,9 @@ module Schemacop
         type :array
       end
 
-      assert_nil s.validate!([])
-      assert_nil s.validate!([1, 2, 3])
-      assert_nil s.validate!(%w(one two three))
+      assert_nothing_raised { s.validate!([]) }
+      assert_nothing_raised { s.validate!([1, 2, 3]) }
+      assert_nothing_raised { s.validate!(%w(one two three)) }
       assert_verr { s.validate!([1, 'mix']) }
     end
   end

data/test/validator_boolean_test.rb

@@ -6,8 +6,8 @@ module Schemacop
       s = Schema.new do
         type :boolean
       end
-      assert_nil s.validate! true
-      assert_nil s.validate! false
+      assert_nothing_raised { s.validate! true }
+      assert_nothing_raised { s.validate! false }
       assert_verr { s.validate! nil }
       assert_verr { s.validate! 1 }
     end

data/test/validator_float_test.rb

@@ -6,11 +6,11 @@ module Schemacop
       s = Schema.new do
         type :float
       end
-      assert_nil s.validate!(-3.0)
-      assert_nil s.validate!(-3.123)
-      assert_nil s.validate!(0.0)
-      assert_nil s.validate!(15.0)
-      assert_nil s.validate!(15.13)
+      assert_nothing_raised { s.validate!(-3.0) }
+      assert_nothing_raised { s.validate!(-3.123) }
+      assert_nothing_raised { s.validate!(0.0) }
+      assert_nothing_raised { s.validate!(15.0) }
+      assert_nothing_raised { s.validate!(15.13) }
       assert_verr { s.validate!(-3) }
       assert_verr { s.validate!(0) }
       assert_verr { s.validate!(15) }
@@ -21,9 +21,9 @@ module Schemacop
         type :float, min: -2
       end
 
-      assert_nil s.validate!(-2.0)
-      assert_nil s.validate!(-1.99999)
-      assert_nil s.validate!(1.2)
+      assert_nothing_raised { s.validate!(-2.0) }
+      assert_nothing_raised { s.validate!(-1.99999) }
+      assert_nothing_raised { s.validate!(1.2) }
       assert_verr { s.validate!(-5.2) }
       assert_verr { s.validate!(-2.00001) }
     end
@@ -33,8 +33,8 @@ module Schemacop
         type :float, max: 5.2
       end
 
-      assert_nil s.validate!(-2.0)
-      assert_nil s.validate!(5.2)
+      assert_nothing_raised { s.validate!(-2.0) }
+      assert_nothing_raised { s.validate!(5.2) }
       assert_verr { s.validate!(5.200001) }
     end
 
@@ -43,11 +43,11 @@ module Schemacop
         type :float, min: -2, max: 5.2
       end
 
-      assert_nil s.validate!(-2.0)
-      assert_nil s.validate!(-1.99999)
-      assert_nil s.validate!(0.0)
-      assert_nil s.validate!(1.2)
-      assert_nil s.validate!(5.2)
+      assert_nothing_raised { s.validate!(-2.0) }
+      assert_nothing_raised { s.validate!(-1.99999) }
+      assert_nothing_raised { s.validate!(0.0) }
+      assert_nothing_raised { s.validate!(1.2) }
+      assert_nothing_raised { s.validate!(5.2) }
       assert_verr { s.validate!(-2.00001) }
       assert_verr { s.validate!(5.200001) }
       assert_verr { s.validate!(6) }

data/test/validator_hash_test.rb

@@ -13,7 +13,7 @@ module Schemacop
           end
         end
       end
-      assert_nil s.validate!(one: 3, two: true)
+      assert_nothing_raised { s.validate!(one: 3, two: true) }
       assert_verr { s.validate!(one: 3) }
       assert_verr { s.validate!(two: true) }
       assert_verr { s.validate!({}) }
@@ -59,10 +59,10 @@ module Schemacop
         end
       end
 
-      assert_nil s.validate!(r: true, r_nil: false)
-      assert_nil s.validate!(r: true, r_nil: nil)
-      assert_nil s.validate!(r: true, r_nil: false, o: false)
-      assert_nil s.validate!(r: true, r_nil: false, o: nil)
+      assert_nothing_raised { s.validate!(r: true, r_nil: false) }
+      assert_nothing_raised { s.validate!(r: true, r_nil: nil) }
+      assert_nothing_raised { s.validate!(r: true, r_nil: false, o: false) }
+      assert_nothing_raised { s.validate!(r: true, r_nil: false, o: nil) }
       assert_verr { s.validate!(r: true, r_nil: false, o_nonnil: nil) }
       assert_verr { s.validate!(o: true) }
       assert_verr { s.validate!(r: nil, r_nil: false, o: true) }

data/test/validator_integer_test.rb

@@ -6,9 +6,9 @@ module Schemacop
       s = Schema.new do
         type :integer
       end
-      assert_nil s.validate!(-3)
-      assert_nil s.validate!(0)
-      assert_nil s.validate!(15)
+      assert_nothing_raised { s.validate!(-3) }
+      assert_nothing_raised { s.validate!(0) }
+      assert_nothing_raised { s.validate!(15) }
       assert_verr { s.validate!(0.0) }
     end
 
@@ -17,8 +17,8 @@ module Schemacop
         type :integer, min: 6
       end
 
-      assert_nil s.validate!(6)
-      assert_nil s.validate!(7)
+      assert_nothing_raised { s.validate!(6) }
+      assert_nothing_raised { s.validate!(7) }
       assert_verr { s.validate!(5) }
     end
 
@@ -27,8 +27,8 @@ module Schemacop
         type :integer, max: 7
       end
 
-      assert_nil s.validate!(6)
-      assert_nil s.validate!(7)
+      assert_nothing_raised { s.validate!(6) }
+      assert_nothing_raised { s.validate!(7) }
       assert_verr { s.validate!(8) }
     end
 
@@ -37,8 +37,8 @@ module Schemacop
         type :integer, min: 6, max: 7
       end
 
-      assert_nil s.validate!(6)
-      assert_nil s.validate!(7)
+      assert_nothing_raised { s.validate!(6) }
+      assert_nothing_raised { s.validate!(7) }
       assert_verr { s.validate!(5) }
       assert_verr { s.validate!(8) }
     end

data/test/validator_nil_test.rb

@@ -6,7 +6,7 @@ module Schemacop
       s = Schema.new do
         type :nil
       end
-      assert_nil s.validate! nil
+      assert_nothing_raised { s.validate! nil }
       assert_verr { s.validate! false }
     end
   end

data/test/validator_number_test.rb

@@ -6,11 +6,11 @@ module Schemacop
       s = Schema.new do
         type :number
       end
-      assert_nil s.validate!(-3)
-      assert_nil s.validate!(-3.123)
-      assert_nil s.validate!(0)
-      assert_nil s.validate!(15)
-      assert_nil s.validate!(15.13)
+      assert_nothing_raised { s.validate!(-3) }
+      assert_nothing_raised { s.validate!(-3.123) }
+      assert_nothing_raised { s.validate!(0) }
+      assert_nothing_raised { s.validate!(15) }
+      assert_nothing_raised { s.validate!(15.13) }
       assert_verr { s.validate!('0.12') }
     end
 
@@ -19,10 +19,10 @@ module Schemacop
         type :number, min: -2
       end
 
-      assert_nil s.validate!(-2)
-      assert_nil s.validate!(-1.99999)
-      assert_nil s.validate!(0)
-      assert_nil s.validate!(1.2)
+      assert_nothing_raised { s.validate!(-2) }
+      assert_nothing_raised { s.validate!(-1.99999) }
+      assert_nothing_raised { s.validate!(0) }
+      assert_nothing_raised { s.validate!(1.2) }
       assert_verr { s.validate!(-3) }
       assert_verr { s.validate!(-2.00001) }
     end
@@ -32,11 +32,11 @@ module Schemacop
         type :number, max: 5.2
       end
 
-      assert_nil s.validate!(-2)
-      assert_nil s.validate!(-1.9)
-      assert_nil s.validate!(0)
-      assert_nil s.validate!(5.19999)
-      assert_nil s.validate!(5.2)
+      assert_nothing_raised { s.validate!(-2) }
+      assert_nothing_raised { s.validate!(-1.9) }
+      assert_nothing_raised { s.validate!(0) }
+      assert_nothing_raised { s.validate!(5.19999) }
+      assert_nothing_raised { s.validate!(5.2) }
       assert_verr { s.validate!(5.200001) }
       assert_verr { s.validate!(6) }
     end
@@ -46,11 +46,11 @@ module Schemacop
         type :number, min: -2, max: 5.2
       end
 
-      assert_nil s.validate!(-2)
-      assert_nil s.validate!(-1.99999)
-      assert_nil s.validate!(0)
-      assert_nil s.validate!(1.2)
-      assert_nil s.validate!(5.2)
+      assert_nothing_raised { s.validate!(-2) }
+      assert_nothing_raised { s.validate!(-1.99999) }
+      assert_nothing_raised { s.validate!(0) }
+      assert_nothing_raised { s.validate!(1.2) }
+      assert_nothing_raised { s.validate!(5.2) }
       assert_verr { s.validate!(-3) }
       assert_verr { s.validate!(-2.00001) }
       assert_verr { s.validate!(5.200001) }

data/test/validator_object_test.rb

@@ -12,19 +12,53 @@ module Schemacop
         type :object, classes: User
       end
 
-      assert_nil s.validate!(User.new)
+      assert_nothing_raised { s.validate!(User.new) }
       assert_verr { s.validate!(SubUser.new) }
       assert_verr { s.validate!(AdminUser.new) }
     end
 
+    # In modern versions of ruby, some classes such as Tempfile are not derived
+    # from Object but from BasicObject. Before the time of writing this test,
+    # the ObjectValidator only accepted subclasses of Object and classes like
+    # Tempfile did not work at all. This test ensures that this is working now.
+    def test_basic_object
+      refute Tempfile <= Object
+      assert Tempfile <= BasicObject
+
+      s = Schema.new do
+        type :object
+      end
+
+      assert_nothing_raised { s.validate!(Tempfile.new) }
+
+      s = Schema.new do
+        req :foo
+      end
+
+      assert_nothing_raised { s.validate!(foo: Tempfile.new) }
+
+      s = Schema.new do
+        req :foo, Tempfile
+      end
+
+      assert_nothing_raised { s.validate!(foo: Tempfile.new) }
+      assert_verr { s.validate!(foo: Time.new) }
+
+      s = Schema.new do
+        req :foo, :object, classes: Tempfile
+      end
+
+      assert_nothing_raised { s.validate!(foo: Tempfile.new) }
+    end
+
     def test_multiple_classes_long
       s = Schema.new do
         type :object, classes: User
         type :object, classes: AdminUser
       end
 
-      assert_nil s.validate!(User.new)
-      assert_nil s.validate!(AdminUser.new)
+      assert_nothing_raised { s.validate!(User.new) }
+      assert_nothing_raised { s.validate!(AdminUser.new) }
       assert_verr { s.validate!(SubUser.new) }
       assert_verr { s.validate!([User.new, AdminUser.new]) }
     end
@@ -34,8 +68,8 @@ module Schemacop
         type :object, classes: [User, AdminUser]
       end
 
-      assert_nil s.validate!(User.new)
-      assert_nil s.validate!(AdminUser.new)
+      assert_nothing_raised { s.validate!(User.new) }
+      assert_nothing_raised { s.validate!(AdminUser.new) }
       assert_verr { s.validate!(SubUser.new) }
       assert_verr { s.validate!([User.new, AdminUser.new]) }
     end
@@ -50,9 +84,9 @@ module Schemacop
         end
       end
 
-      assert_nil s.validate!(user: User.new)
-      assert_nil s.validate!(user: User.new, multitype: AdminUser.new)
-      assert_nil s.validate!(user: User.new, multitype: User.new)
+      assert_nothing_raised { s.validate!(user: User.new) }
+      assert_nothing_raised { s.validate!(user: User.new, multitype: AdminUser.new) }
+      assert_nothing_raised { s.validate!(user: User.new, multitype: User.new) }
       assert_verr { s.validate!(user: AdminUser.new) }
       assert_verr { s.validate!(user: User.new, multitype: 12) }
       assert_verr { s.validate!(user: User.new, multitype: self) }
@@ -63,11 +97,11 @@ module Schemacop
         type :object
       end
 
-      assert_nil s.validate!(User.new)
-      assert_nil s.validate!(123)
-      assert_nil s.validate!('sali')
-      assert_nil s.validate!(self)
-      assert_nil s.validate!(self.class)
+      assert_nothing_raised { s.validate!(User.new) }
+      assert_nothing_raised { s.validate!(123) }
+      assert_nothing_raised { s.validate!('sali') }
+      assert_nothing_raised { s.validate!(self) }
+      assert_nothing_raised { s.validate!(self.class) }
       assert_verr { s.validate!(nil) }
     end
 
@@ -78,8 +112,8 @@ module Schemacop
         end
       end
 
-      assert_nil s.validate!(fld: User.new)
-      assert_nil s.validate!(fld: self)
+      assert_nothing_raised { s.validate!(fld: User.new) }
+      assert_nothing_raised { s.validate!(fld: self) }
       assert_verr { s.validate!(fld: nil) }
       assert_verr { s.validate!({}) }
     end
@@ -94,9 +128,9 @@ module Schemacop
         end
       end
 
-      assert_nil s.validate!(o_strict: User.new, o_ns: User.new)
-      assert_nil s.validate!(o_strict: User.new, o_ns: SubUser.new)
-      assert_nil s.validate!(o_strict: User.new)
+      assert_nothing_raised { s.validate!(o_strict: User.new, o_ns: User.new) }
+      assert_nothing_raised { s.validate!(o_strict: User.new, o_ns: SubUser.new) }
+      assert_nothing_raised { s.validate!(o_strict: User.new) }
       assert_verr { s.validate!(o_strict: SubUser.new) }
       assert_verr { s.validate!(o_strict: User.new, o_ns: AdminUser.new) }
       assert_verr { s.validate!(o_strict: SubUser.new, o_ns: User.new) }