schemacop 3.0.0.rc3 → 3.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93149de6cee935353aba3381d9e1ee76b51bc4b19763d8634566d375208fcac
-  data.tar.gz: cb8e1a8b82104f6482d5017d90e3d5c2094d564ac9ef1001d2336bac137886cb
+  metadata.gz: 7d4b39e7b5e7391e8c5a8ff8ca7a1b008b19f1b62496e9a48e4180f7e953449d
+  data.tar.gz: 77bcf64925543433aad78dc02fbe610801db6a618cb1c8b154cea1a55c7220cf
 SHA512:
-  metadata.gz: 0df1ba4b0c314901d015ca969996ffa9df862c79df0a52129bc3b749add7ff2e60ff52a9fb8a874f82b57017fef821c1e8d5d703093e0fd3bade224e8c84d259
-  data.tar.gz: 1f501b7fdee6cc8347fe1acaf522f268ef5882e595f0c136c68c773b98615b37a05aeeaf1b472c3152546cdd3ae0859dd216eae9850f9f2992c2e970c7111157
+  metadata.gz: 75030bf09dcbdc5f556e48aac4ac9b200713b3cb59c5a6dfa071bcb642e030638bc3de80a1969378b33c9c77ab5c0ca3f44866c2ce691e827b4067025ca89f0e
+  data.tar.gz: 54de1f2cac717dc6d8b4fcc89bdb679c7d7d528785a2a664bc9940061b1e5015bebd9827677bb581bc838f87ad62e0d54db87d13ce5ba0fa70ca44a37985e539

data/CHANGELOG.md

@@ -10,6 +10,15 @@
 ### Changes
 -->
 
+## 3.0.0.rc4 (2020-02-02)
+
+* Fix some minor bugs
+
+* Improve documentation
+
+* `used_external_schemas` for the `ReferenceNode` is now applied
+  recursively
+
 ## 3.0.0.rc3 (2020-01-28)
 
 * Add minor improvements to the documentation

data/README_V3.md

@@ -90,7 +90,7 @@ Schemacop can raise the following exceptions:
   Example:
 
   ```ruby
-  Schemacop::Schema3.new do
+  Schemacop::Schema3.new :hash do
     int!
   end
 
@@ -380,7 +380,7 @@ schema.validate!(1234)    # => Schemacop::Exceptions::ValidationError: /: Invali
 ### Array
 
 Type: `:array`\
-DSL: `arr`
+DSL: `ary`
 
 The array type represents a ruby `Array`.
 It consists of one or multiple values, which can be validated using arbitrary nodes.
@@ -587,8 +587,9 @@ It consists of key-value-pairs that can be validated using arbitrary nodes.
 
 * `additional_properties`
   This option specifies whether additional, unspecified properties are allowed
-  (`true`) or not (`false`). By default, this is `true` if no properties are
-  specified and `false` if you have specified at least one property.
+  (`true`) or not (`false`). By default, this is `false`, i.e. you need to
+  explicitly set it to `true` if you want to allow arbitrary additional properties,
+  or use the `add` DSL method (see below) to specify additional properties.
 
 * `property_names`
   This option allows to specify a regexp pattern (as string) which validates the
@@ -673,6 +674,61 @@ end
 schema.validate!(foo: 42, 'foo' => 43) # => Schemacop::Exceptions::ValidationError: /: Has 1 ambiguous properties: [:foo].
 ```
 
+In addition to the normal node options (which vary from type to type, check
+the respective nodes for details), properties also support the `as` option.
+
+With this, you can "rename" properties in the output:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int! :foo, as: :bar
+end
+
+schema.validate!({foo: 42}) # => {"bar"=>42}
+```
+
+Please note that if you specify a node with the same property name multiple
+times, or use the `as` option to rename a node to the same name of another
+node, the last specified node will be used:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int? :foo
+  str? :foo
+end
+
+schema.validate!({foo: 1})      # => Schemacop::Exceptions::ValidationError: /foo: Invalid type, expected "string".
+schema.validate!({foo: 'bar'})  # => {"foo"=>"bar"}
+```
+
+As well as:
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  int? :foo
+  int? :bar, as: :foo
+end
+
+schema.validate!({foo: 1})          # => {"foo"=>1}
+schema.validate!({foo: 1, bar: 2})  # => {"foo"=>2}
+schema.validate!({bar: 2})          # => {"foo"=>2}
+```
+
+If you want to specify a node which may be one of multiple types, use the `one_of`
+node (see further down for more details):
+
+```ruby
+schema = Schemacop::Schema3.new :hash do
+  one_of! :foo do
+    int
+    str
+  end
+end
+
+schema.validate!({foo: 1})      # => {"foo"=>1}
+schema.validate!({foo: 'bar'})  # => {"foo"=>"bar"}
+```
+
 ##### Pattern properties
 
 In addition to symbols, property keys can also be a regular expression. Here,

data/VERSION

@@ -1 +1 @@
-3.0.0.rc3
+3.0.0.rc4

data/lib/schemacop/v2/caster.rb

@@ -18,6 +18,7 @@ module Schemacop::V2
       @data = data
       @target_type = target_type
       @caster = nil
+      @value = nil
 
       if casts.is_a?(Array)
         from_types = casts

data/lib/schemacop/v3/hash_node.rb

@@ -68,7 +68,7 @@ module Schemacop
 
         # In schemacop, by default, additional properties are not allowed,
         # the users explicitly need to enable additional properties
-        if options[:additional_properties] == true
+        if options[:additional_properties].is_a?(TrueClass)
           json[:additionalProperties] = true
         elsif options[:additional_properties].is_a?(Node)
           json[:additionalProperties] = options[:additional_properties].as_json
@@ -141,7 +141,9 @@ module Schemacop
             result.error "Property name #{name.inspect} does not match #{options[:property_names].inspect}."
           end
 
-          if options[:additional_properties].blank?
+          if options[:additional_properties].is_a?(TrueClass)
+            next
+          elsif options[:additional_properties].is_a?(FalseClass) || options[:additional_properties].blank?
             match = property_patterns.keys.find { |p| p.match?(name.to_s) }
             if match
               result.in_path(name) do
@@ -176,16 +178,10 @@ module Schemacop
         data ||= default
         return nil if data.nil?
 
-        original_data_hash = data.dup
-        data_hash = data.with_indifferent_access
-
-        if original_data_hash.size != data_hash.size
-          ambiguous_properties = original_data_hash.keys - data_hash.keys
-
-          result.error "Has #{ambiguous_properties.size} ambiguous properties: #{ambiguous_properties}."
-        end
+        data_hash = data.dup.with_indifferent_access
 
         property_patterns = {}
+        as_names = []
 
         @properties.each_value do |prop|
           if prop.name.is_a?(Regexp)
@@ -193,10 +189,18 @@ module Schemacop
             next
           end
 
-          result[prop.as || prop.name] = prop.cast(data_hash[prop.name])
+          as_names << prop.as&.to_s if prop.as.present?
 
-          if result[prop.as || prop.name].nil? && !data_hash.include?(prop.name)
-            result.delete(prop.as || prop.name)
+          prop_name = prop.as&.to_s || prop.name
+
+          casted_data = prop.cast(data_hash[prop.name])
+
+          if casted_data.present? || data_hash.include?(prop.name)
+            result[prop_name] = casted_data
+          end
+
+          if result[prop_name].nil? && !data_hash.include?(prop.name) && !as_names.include?(prop.name)
+            result.delete(prop_name)
           end
         end
 
@@ -213,7 +217,7 @@ module Schemacop
         end
 
         # Handle additional properties
-        if options[:additional_properties] == true
+        if options[:additional_properties].is_a?(TrueClass)
           result = data_hash.merge(result)
         elsif options[:additional_properties].is_a?(Node)
           specified_properties = @properties.keys.to_set
@@ -238,6 +242,11 @@ module Schemacop
         unless @options[:additional_properties].nil? || @options[:additional_properties].is_a?(TrueClass) || @options[:additional_properties].is_a?(FalseClass)
           fail Schemacop::Exceptions::InvalidSchemaError, 'Option "additional_properties" must be a boolean value'
         end
+
+        # Default the additional_properties option to false if it's not given
+        if @options[:additional_properties].nil?
+          @options[:additional_properties] = false
+        end
       end
 
       def validate_self

data/lib/schemacop/v3/node.rb

@@ -72,7 +72,7 @@ module Schemacop
         disallowed_options = options.keys - self.class.allowed_options
 
         if disallowed_options.any?
-          fail "Options #{disallowed_options.inspect} are not allowed for this node."
+          fail Schemacop::Exceptions::InvalidSchemaError, "Options #{disallowed_options.inspect} are not allowed for this node."
         end
 
         # Assign attributes #
@@ -95,7 +95,7 @@ module Schemacop
         # Run DSL block #
         if block_given?
           unless self.class.supports_children_options
-            fail "Node #{self.class} does not support blocks."
+            fail Schemacop::Exceptions::InvalidSchemaError, "Node #{self.class} does not support blocks."
           end
 
           scope = DslScope.new(self)

data/lib/schemacop/v3/node_registry.rb

@@ -40,10 +40,6 @@ module Schemacop
       def self.name(klass)
         @by_class[klass][:name]
       end
-
-      def self.short_name(klass)
-        @by_class[klass][:short_name]
-      end
     end
   end
 end

data/lib/schemacop/v3/reference_node.rb

@@ -36,7 +36,13 @@ module Schemacop
       end
 
       def used_external_schemas
-        schemas.include?(@path) ? [] : [@path]
+        target_children_schema = target.used_external_schemas
+
+        if schemas.include?(@path)
+          return target_children_schema
+        else
+          return [@path] + target_children_schema
+        end
       end
 
       protected

data/lib/schemacop/v3/string_node.rb

@@ -66,21 +66,29 @@ module Schemacop
       end
 
       def cast(value)
+        if value.present?
+          to_cast = value
+        elsif default.present?
+          to_cast = default
+        else
+          return nil
+        end
+
         case options[:format]
         when :boolean
-          return value == 'true'
+          return to_cast == 'true'
         when :date
-          return Date.parse(value)
+          return Date.parse(to_cast)
         when :'date-time'
-          return DateTime.parse(value)
+          return DateTime.parse(to_cast)
         when :time
-          Time.parse(value)
+          Time.parse(to_cast)
         when :integer
-          return Integer(value)
+          return Integer(to_cast)
         when :number
-          return Float(value)
+          return Float(to_cast)
         else
-          return value || default
+          return to_cast
         end
       end
 

data/schemacop.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.0.rc3 ruby lib
+# stub: schemacop 3.0.0.rc4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.0.rc3"
+  s.version = "3.0.0.rc4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2021-01-28"
-  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/root_node.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-02-02"
+  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.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]
   s.rubygems_version = "3.0.3".freeze

data/test/lib/test_helper.rb

@@ -1,5 +1,15 @@
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_group 'v3', 'lib/schemacop/v3'
+  add_group 'v2', 'lib/schemacop/v2'
+
+  # We don't care about the test coverage for the
+  # tests themselves
+  add_filter 'test'
+
+  # Also enable branch coverage reporting
+  enable_coverage :branch
+end
 
 # TODO: Move to more sensible location
 def assert_verr(&block)
@@ -141,7 +151,12 @@ class V3Test < SchemacopTest
     input_data_was = Marshal.load(Marshal.dump(input_data))
     result = @schema.validate(input_data)
     assert_empty result.errors
-    assert_equal expected_data, result.data, 'Unexpected result data.'
+
+    if expected_data.nil?
+      assert_nil result.data, 'Unexpected result data.'
+    else
+      assert_equal expected_data, result.data, 'Unexpected result data.'
+    end
 
     if input_data.nil?
       assert_nil input_data_was, 'Expected input_data to stay the same.'

data/test/unit/schemacop/v2/casting_test.rb

@@ -115,6 +115,43 @@ module Schemacop
         assert_equal expected_float, s.validate!(float_field: '')
         assert_equal expected_float, s.validate!(float_field: '     ')
       end
+
+      def test_float_to_integer
+        s = Schema.new do
+          req :foo, :integer, cast: [Float]
+        end
+
+        assert_equal({ foo: 42 }, s.validate!(foo: 42.0))
+        assert_equal({ foo: 42 }, s.validate!(foo: Float(42)))
+      end
+
+      def test_integer_to_float
+        s = Schema.new do
+          req :foo, :float, cast: [Integer]
+        end
+
+        assert_equal({ foo: 42.0 }, s.validate!(foo: 42))
+        assert_equal({ foo: 42.0 }, s.validate!(foo: Integer(42)))
+      end
+
+      def test_invalid_cast_option
+        s = Schema.new do
+          req :foo, :integer, cast: true
+        end
+
+        assert_raises Schemacop::Exceptions::InvalidSchemaError do
+          s.validate!({ foo: '42' })
+        end
+      end
+
+      def test_impossible_cast
+        s = Schema.new do
+          req :foo, :integer, cast: [String]
+        end
+
+        assert_equal({ foo: 42 }, s.validate!(foo: '42'))
+        assert_verr { s.validate!(foo: 'foo') }
+      end
     end
   end
 end

data/test/unit/schemacop/v2/validator_hash_test.rb

@@ -90,6 +90,17 @@ module Schemacop
         assert_verr { s.validate!(o: true) }
         assert_verr { s.validate!(r: nil, r_nil: false, o: true) }
       end
+
+      def test_invalid_hash
+        s = Schema.new do
+          type :hash do
+            req :foo
+          end
+        end
+
+        assert_verr { s.validate!({ foo: 42, 'foo' => 42 }) }
+        assert_nothing_raised { s.validate!({ foo: 42 }.with_indifferent_access) }
+      end
     end
   end
 end

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

@@ -25,8 +25,10 @@ module Schemacop
 
       def test_schemas
         assert_equal({}, GlobalContext.instance.schemas)
+        assert_equal({}, GlobalContext.schemas)
         GlobalContext.instance.eager_load!
         assert_equal(%i[nested/group user], GlobalContext.instance.schemas.keys)
+        assert_equal(%i[nested/group user], GlobalContext.schemas.keys)
         assert_is_a Node, GlobalContext.instance.schemas.values.first
       end
 

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

@@ -16,7 +16,7 @@ module Schemacop
         assert_json(type: :object, additionalProperties: false)
       end
 
-      def test_additional_properties_false
+      def test_additional_properties_false_by_default
         schema
         assert_validation({})
         assert_validation(foo: :bar, bar: :baz) do
@@ -26,6 +26,17 @@ module Schemacop
         assert_json(type: :object, additionalProperties: false)
       end
 
+      def test_additional_properties_false
+        schema :hash, additional_properties: false
+
+        assert_validation({})
+        assert_validation(foo: :bar, bar: :baz) do
+          error '/', 'Obsolete property "foo".'
+          error '/', 'Obsolete property "bar".'
+        end
+        assert_json(type: :object, additionalProperties: false)
+      end
+
       def test_additional_properties_true
         schema :hash, additional_properties: true
         assert_validation({})
@@ -874,11 +885,88 @@ module Schemacop
         end
       end
 
-      # def test_invalid_key_names
-      #   schema :hash do
-      #     int!
-      #   end
-      # end
+      def test_invalid_options
+        assert_raises_with_message Schemacop::Exceptions::InvalidSchemaError, 'Options [:foo] are not allowed for this node.' do
+          schema :hash, foo: 'bar' do
+            int! :id
+          end
+        end
+      end
+
+      def test_casting_optional
+        schema :hash do
+          str? :foo, format: :integer
+        end
+
+        assert_validation(nil)
+        assert_validation({})
+
+        assert_cast(nil, nil)
+        assert_cast({}, {}.with_indifferent_access)
+      end
+
+      def test_as_option
+        schema :hash do
+          int! :foo, as: :bar
+        end
+
+        assert_validation(nil)
+        assert_validation({ foo: 42 })
+        assert_validation({ bar: 13 }) do
+          error '/', 'Obsolete property "bar".'
+          error '/foo', 'Value must be given.'
+        end
+
+        assert_validation({ foo: '13' }) do
+          error '/foo', 'Invalid type, expected "integer".'
+        end
+
+        assert_cast(nil, nil)
+        assert_cast({ foo: 42 }, { bar: 42 }.with_indifferent_access)
+      end
+
+      def test_as_option_overriding
+        schema :hash do
+          int? :foo, as: :bar
+          int? :bar
+        end
+
+        assert_validation(nil)
+        assert_validation({})
+        assert_validation({ foo: 42 })
+        assert_validation({ foo: 42, bar: 13 })
+
+        assert_validation({ foo: '13' }) do
+          error '/foo', 'Invalid type, expected "integer".'
+        end
+
+        # assert_cast(nil, nil)
+        assert_cast({ foo: 42 }, { bar: 42 }.with_indifferent_access)
+        assert_cast({ foo: 42, bar: 13 }, { bar: 13 }.with_indifferent_access)
+        assert_cast({ bar: 13, foo: 42 }, { bar: 13 }.with_indifferent_access)
+
+        # Swap order
+        schema :hash do
+          int? :bar
+          int! :foo, as: :bar
+        end
+
+        assert_validation(nil)
+        assert_validation({ foo: 42 })
+        assert_validation({ foo: 42, bar: 13 })
+        assert_validation({ bar: 13 }) do
+          error '/foo', 'Value must be given.'
+        end
+
+        assert_validation({ foo: '13' }) do
+          error '/foo', 'Invalid type, expected "integer".'
+        end
+
+        assert_cast(nil, nil)
+        assert_cast({ foo: 42 }, { bar: 42 }.with_indifferent_access)
+        assert_cast({ foo: 42, bar: 13 }, { bar: 42 }.with_indifferent_access)
+        assert_cast({ bar: 13, foo: 42 }, { bar: 42 }.with_indifferent_access)
+      end
     end
   end
 end

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

@@ -143,6 +143,20 @@ module Schemacop
           error '/[0]', 'Value must be given.'
         end
       end
+
+      def test_not_support_block
+        assert_raises_with_message Schemacop::Exceptions::InvalidSchemaError, 'Node Schemacop::V3::IntegerNode does not support blocks.' do
+          schema :integer do
+            int :foo
+          end
+        end
+      end
+
+      def test_node_no_children
+        @schema = Schemacop::Schema3.new
+
+        assert_equal(@schema.root.children, [])
+      end
     end
   end
 end

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

@@ -249,6 +249,8 @@ module Schemacop
           ref? :node, :Node
         end
 
+        assert_equal(@schema.root.used_external_schemas, [])
+
         assert_validation({})
         assert_validation(node: { name: '1', children: [{ name: '1' }, { name: '2' }] })
         assert_validation(
@@ -313,6 +315,8 @@ module Schemacop
             ref! :person, :Person
           end
 
+          assert_equal(@schema.root.used_external_schemas, %i[Person PersonInfo])
+
           assert_validation(person: { first_name: 'John', last_name: 'Doe' })
           assert_validation(person: { first_name: 'John', last_name: 'Doe', info: { born_at: '1990-01-13' } })
           assert_validation(person: { first_name_x: 'John', last_name: 'Doe' }) do
@@ -323,6 +327,18 @@ module Schemacop
             error '/person/info/born_at', 'String does not match format "date".'
           end
         end
+
+        with_context context do
+          schema do
+            scm :PersonNode do
+              ref! :person, :Person
+            end
+
+            ref! :personNode, :PersonNode
+          end
+
+          assert_equal(@schema.root.used_external_schemas, %i[Person PersonInfo])
+        end
       end
 
       def test_defaults

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

@@ -111,6 +111,9 @@ module Schemacop
         assert_validation 'foo 2020-01-29 bar' do
           error '/', 'String does not match format "date".'
         end
+
+        assert_cast(nil, nil)
+        assert_cast('2020-01-13', Date.new(2020, 1, 13))
       end
 
       def test_format_date_time
@@ -132,6 +135,9 @@ module Schemacop
         assert_validation '2018-11-13T20:20:39Y' do
           error '/', 'String does not match format "date-time".'
         end
+
+        assert_cast(nil, nil)
+        assert_cast('2018-11-13T20:20:39+00:00', DateTime.new(2018, 11, 13, 20, 20, 39))
       end
 
       def test_format_email
@@ -154,6 +160,9 @@ module Schemacop
         assert_validation '@john@example.com' do
           error '/', 'String does not match format "email".'
         end
+
+        assert_cast(nil, nil)
+        assert_cast('john.doe@example.com', 'john.doe@example.com')
       end
 
       def test_enum
@@ -187,18 +196,24 @@ module Schemacop
 
         assert_cast 'true', true
         assert_cast 'false', false
+
+        assert_cast nil, nil
       end
 
       def test_time_casting
         schema :string, format: :time
         assert_json(type: :string, format: :time)
         assert_cast '20:30:39+00:00', Time.strptime('20:30:39+00:00', '%H:%M:%S%z')
+
+        assert_cast nil, nil
       end
 
       def test_date_casting
         schema :string, format: :date
         assert_json(type: :string, format: :date)
         assert_cast '2018-11-13', Date.new(2018, 11, 13)
+
+        assert_cast nil, nil
       end
 
       def test_date_time_casting
@@ -207,12 +222,16 @@ module Schemacop
         assert_cast '2018-11-13T20:20:39+00:00', DateTime.new(2018, 11, 13, 20, 20, 39)
         assert_cast '2018-11-13T20:20:39Z', DateTime.new(2018, 11, 13, 20, 20, 39)
         assert_cast '2018-11-13T20:20:39+01:00', DateTime.new(2018, 11, 13, 20, 20, 39, '+1')
+
+        assert_cast nil, nil
       end
 
       def test_email_casting
         schema :string, format: :email
         assert_json(type: :string, format: :email)
         assert_cast 'support@example.com', 'support@example.com'
+
+        assert_cast nil, nil
       end
 
       def test_default
@@ -233,6 +252,25 @@ module Schemacop
         assert_cast(nil, 'Hello')
       end
 
+      def test_default_casting
+        schema :string, format: :integer, default: '42'
+
+        assert_json(
+          type:    :string,
+          format:  :integer,
+          default: '42'
+        )
+
+        assert_validation(nil)
+        assert_validation('123')
+        assert_validation(5) do
+          error '/', 'Invalid type, expected "string".'
+        end
+
+        assert_cast('123', 123)
+        assert_cast(nil, 42)
+      end
+
       # Helper function that checks for all the options if the option is
       # an integer or something else, in which case it needs to raise
       def validate_self_should_error(value_to_check)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc3
+  version: 3.0.0.rc4
 platform: ruby
 authors:
 - Sitrox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,8 +150,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.21.2
-description:
-email:
+description: 
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -188,7 +188,6 @@ files:
 - lib/schemacop/v2/node_supporting_field.rb
 - lib/schemacop/v2/node_supporting_type.rb
 - lib/schemacop/v2/node_with_block.rb
-- lib/schemacop/v2/root_node.rb
 - lib/schemacop/v2/validator/array_validator.rb
 - lib/schemacop/v2/validator/boolean_validator.rb
 - lib/schemacop/v2/validator/float_validator.rb
@@ -264,7 +263,7 @@ homepage: https://github.com/sitrox/schemacop
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -279,8 +278,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
   against simple schema definitions.