schemacop 2.4.2 → 2.4.7

data/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Nov  5 11:16:27 2019 by
+  Generated on Thu Jul  2 11:30:34 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/lib/schemacop.rb

@@ -1,8 +1,8 @@
 module Schemacop
   DEFAULT_CASTERS = {
     String => {
-      Integer => proc { |s| Integer(s) },
-      Float => proc { |s| Float(s) }
+      Integer => proc { |s| s.blank? ? nil : Integer(s, 10) },
+      Float => proc { |s| s.blank? ? nil : Float(s) }
     },
     Float => {
       Integer => proc { |f| Integer(f) }
@@ -15,8 +15,8 @@ end
 
 require 'set'
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/object/blank'
 require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/object/deep_dup'
 
 require 'schemacop/scoped_env'
 require 'schemacop/exceptions'
@@ -30,6 +30,7 @@ require 'schemacop/field_node'
 require 'schemacop/root_node'
 require 'schemacop/node_supporting_field'
 require 'schemacop/caster'
+require 'schemacop/dupper'
 require 'schemacop/validator/array_validator'
 require 'schemacop/validator/boolean_validator'
 require 'schemacop/validator/hash_validator'

data/lib/schemacop/dupper.rb

@@ -0,0 +1,19 @@
+module Schemacop
+  class Dupper
+    def self.dup_data(data)
+      if data.is_a?(Hash)
+        data = data.dup
+
+        data.each do |key, value|
+          data[key] = dup_data(value)
+        end
+
+        return data
+      elsif data.is_a?(Array)
+        return data.map { |value| dup_data(value) }
+      else
+        return data
+      end
+    end
+  end
+end

data/lib/schemacop/field_node.rb

@@ -37,6 +37,7 @@ module Schemacop
       @types.each do |type|
         next unless type.option?(:default)
         default = type.option(:default)
+        default = default.call if default.is_a?(Proc)
         collector.override_value(default)
         return default, true
       end

data/lib/schemacop/node_supporting_type.rb

@@ -105,12 +105,12 @@ module Schemacop
 
         next unless caster.castable?
         begin
-                    data = caster.cast
-                    collector.override_value(data)
-                    return data
-                  rescue Exceptions::InvalidSchemaError => e
-                    collector.error e.message
-                  end
+          data = caster.cast
+          collector.override_value(data)
+          return data
+        rescue Exceptions::InvalidSchemaError => e
+          collector.error e.message
+        end
       end
 
       return data

data/lib/schemacop/schema.rb

@@ -37,7 +37,8 @@ module Schemacop
     # @return [Schemacop::Collector] The object that collected errors
     #   throughout the validation.
     def validate(data)
-      collector = Collector.new(data.deep_dup)
+      dupped_data = Schemacop::Dupper.dup_data(data)
+      collector = Collector.new(dupped_data)
       @root.fields[:root].validate({ root: data }, collector.ignore_next_segment)
       return collector
     end

data/lib/schemacop/validator/hash_validator.rb

@@ -2,6 +2,8 @@ module Schemacop
   class HashValidator < NodeSupportingField
     register symbols: :hash, klasses: Hash
 
+    option :allow_obsolete_keys
+
     def validate(data, collector)
       super
 
@@ -21,7 +23,9 @@ module Schemacop
 
       obsolete_keys = data_keys - allowed_fields
 
-      collector.error "Obsolete keys: #{obsolete_keys.inspect}." if obsolete_keys.any?
+      unless option?(:allow_obsolete_keys)
+        collector.error "Obsolete keys: #{obsolete_keys.inspect}." if obsolete_keys.any?
+      end
 
       @fields.values.each do |field|
         field.validate(data, collector)

data/schemacop.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 2.4.2 ruby lib
+# stub: schemacop 2.4.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "2.4.2"
+  s.version = "2.4.7"
 
   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 = "2019-11-05"
-  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, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "doc/Schemacop.html".freeze, "doc/Schemacop/ArrayValidator.html".freeze, "doc/Schemacop/BooleanValidator.html".freeze, "doc/Schemacop/Caster.html".freeze, "doc/Schemacop/Collector.html".freeze, "doc/Schemacop/Exceptions.html".freeze, "doc/Schemacop/Exceptions/InvalidSchemaError.html".freeze, "doc/Schemacop/Exceptions/ValidationError.html".freeze, "doc/Schemacop/FieldNode.html".freeze, "doc/Schemacop/FloatValidator.html".freeze, "doc/Schemacop/HashValidator.html".freeze, "doc/Schemacop/IntegerValidator.html".freeze, "doc/Schemacop/NilValidator.html".freeze, "doc/Schemacop/Node.html".freeze, "doc/Schemacop/NodeResolver.html".freeze, "doc/Schemacop/NodeSupportingField.html".freeze, "doc/Schemacop/NodeSupportingType.html".freeze, "doc/Schemacop/NodeWithBlock.html".freeze, "doc/Schemacop/NumberValidator.html".freeze, "doc/Schemacop/ObjectValidator.html".freeze, "doc/Schemacop/RootNode.html".freeze, "doc/Schemacop/Schema.html".freeze, "doc/Schemacop/StringValidator.html".freeze, "doc/Schemacop/SymbolValidator.html".freeze, "doc/ScopedEnv.html".freeze, "doc/_index.html".freeze, "doc/class_list.html".freeze, "doc/css/common.css".freeze, "doc/css/full_list.css".freeze, "doc/css/style.css".freeze, "doc/file.README.html".freeze, "doc/file_list.html".freeze, "doc/frames.html".freeze, "doc/index.html".freeze, "doc/inheritance.graphml".freeze, "doc/inheritance.pdf".freeze, "doc/js/app.js".freeze, "doc/js/full_list.js".freeze, "doc/js/jquery.js".freeze, "doc/method_list.html".freeze, "doc/top-level-namespace.html".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/caster.rb".freeze, "lib/schemacop/collector.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/field_node.rb".freeze, "lib/schemacop/node.rb".freeze, "lib/schemacop/node_resolver.rb".freeze, "lib/schemacop/node_supporting_field.rb".freeze, "lib/schemacop/node_supporting_type.rb".freeze, "lib/schemacop/node_with_block.rb".freeze, "lib/schemacop/root_node.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/validator/array_validator.rb".freeze, "lib/schemacop/validator/boolean_validator.rb".freeze, "lib/schemacop/validator/float_validator.rb".freeze, "lib/schemacop/validator/hash_validator.rb".freeze, "lib/schemacop/validator/integer_validator.rb".freeze, "lib/schemacop/validator/nil_validator.rb".freeze, "lib/schemacop/validator/number_validator.rb".freeze, "lib/schemacop/validator/object_validator.rb".freeze, "lib/schemacop/validator/string_validator.rb".freeze, "lib/schemacop/validator/symbol_validator.rb".freeze, "schemacop.gemspec".freeze, "test/casting_test.rb".freeze, "test/collector_test.rb".freeze, "test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/defaults_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/node_resolver_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
+  s.date = "2020-07-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, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "doc/Schemacop.html".freeze, "doc/Schemacop/ArrayValidator.html".freeze, "doc/Schemacop/BooleanValidator.html".freeze, "doc/Schemacop/Caster.html".freeze, "doc/Schemacop/Collector.html".freeze, "doc/Schemacop/Dupper.html".freeze, "doc/Schemacop/Exceptions.html".freeze, "doc/Schemacop/Exceptions/InvalidSchemaError.html".freeze, "doc/Schemacop/Exceptions/ValidationError.html".freeze, "doc/Schemacop/FieldNode.html".freeze, "doc/Schemacop/FloatValidator.html".freeze, "doc/Schemacop/HashValidator.html".freeze, "doc/Schemacop/IntegerValidator.html".freeze, "doc/Schemacop/NilValidator.html".freeze, "doc/Schemacop/Node.html".freeze, "doc/Schemacop/NodeResolver.html".freeze, "doc/Schemacop/NodeSupportingField.html".freeze, "doc/Schemacop/NodeSupportingType.html".freeze, "doc/Schemacop/NodeWithBlock.html".freeze, "doc/Schemacop/NumberValidator.html".freeze, "doc/Schemacop/ObjectValidator.html".freeze, "doc/Schemacop/RootNode.html".freeze, "doc/Schemacop/Schema.html".freeze, "doc/Schemacop/StringValidator.html".freeze, "doc/Schemacop/SymbolValidator.html".freeze, "doc/ScopedEnv.html".freeze, "doc/_index.html".freeze, "doc/class_list.html".freeze, "doc/css/common.css".freeze, "doc/css/full_list.css".freeze, "doc/css/style.css".freeze, "doc/file.README.html".freeze, "doc/file_list.html".freeze, "doc/frames.html".freeze, "doc/index.html".freeze, "doc/inheritance.graphml".freeze, "doc/inheritance.pdf".freeze, "doc/js/app.js".freeze, "doc/js/full_list.js".freeze, "doc/js/jquery.js".freeze, "doc/method_list.html".freeze, "doc/top-level-namespace.html".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/caster.rb".freeze, "lib/schemacop/collector.rb".freeze, "lib/schemacop/dupper.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/field_node.rb".freeze, "lib/schemacop/node.rb".freeze, "lib/schemacop/node_resolver.rb".freeze, "lib/schemacop/node_supporting_field.rb".freeze, "lib/schemacop/node_supporting_type.rb".freeze, "lib/schemacop/node_with_block.rb".freeze, "lib/schemacop/root_node.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/validator/array_validator.rb".freeze, "lib/schemacop/validator/boolean_validator.rb".freeze, "lib/schemacop/validator/float_validator.rb".freeze, "lib/schemacop/validator/hash_validator.rb".freeze, "lib/schemacop/validator/integer_validator.rb".freeze, "lib/schemacop/validator/nil_validator.rb".freeze, "lib/schemacop/validator/number_validator.rb".freeze, "lib/schemacop/validator/object_validator.rb".freeze, "lib/schemacop/validator/string_validator.rb".freeze, "lib/schemacop/validator/symbol_validator.rb".freeze, "schemacop.gemspec".freeze, "test/casting_test.rb".freeze, "test/collector_test.rb".freeze, "test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/defaults_test.rb".freeze, "test/empty_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/node_resolver_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
   s.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".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/casting_test.rb".freeze, "test/collector_test.rb".freeze, "test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/defaults_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/node_resolver_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
+  s.test_files = ["test/casting_test.rb".freeze, "test/collector_test.rb".freeze, "test/custom_check_test.rb".freeze, "test/custom_if_test.rb".freeze, "test/defaults_test.rb".freeze, "test/empty_test.rb".freeze, "test/nil_dis_allow_test.rb".freeze, "test/node_resolver_test.rb".freeze, "test/short_forms_test.rb".freeze, "test/test_helper.rb".freeze, "test/types_test.rb".freeze, "test/validator_array_test.rb".freeze, "test/validator_boolean_test.rb".freeze, "test/validator_float_test.rb".freeze, "test/validator_hash_test.rb".freeze, "test/validator_integer_test.rb".freeze, "test/validator_nil_test.rb".freeze, "test/validator_number_test.rb".freeze, "test/validator_object_test.rb".freeze, "test/validator_string_test.rb".freeze, "test/validator_symbol_test.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/test/casting_test.rb

@@ -86,5 +86,33 @@ module Schemacop
 
       assert_equal 42, s.validate!('42')
     end
+
+    def test_decimal_basis_castings
+      s = Schema.new do
+        type :integer, cast: [String]
+      end
+
+      assert_equal 1, s.validate!('01')
+      assert_equal 8, s.validate!('08')
+      assert_equal 11, s.validate!('011')
+    end
+
+    def test_string_to_nil_castings
+      s = Schema.new do
+        opt :int_field, :integer, cast: [String]
+        opt :float_field, :float, cast: [String]
+      end
+
+      expected_int = { int_field: nil }
+      expected_float = { float_field: nil }
+
+      assert_equal expected_int, s.validate!(int_field: nil)
+      assert_equal expected_int, s.validate!(int_field: "")
+      assert_equal expected_int, s.validate!(int_field: "     ")
+
+      assert_equal expected_float, s.validate!(float_field: nil)
+      assert_equal expected_float, s.validate!(float_field: "")
+      assert_equal expected_float, s.validate!(float_field: "     ")
+    end
   end
 end

data/test/defaults_test.rb

@@ -58,6 +58,28 @@ module Schemacop
       assert_equal({ foo: [{ bar: 42 }] }, output)
     end
 
+    def test_proc
+      s = Schema.new do
+        opt :year, :integer, default: ->() { Time.now.year }
+      end
+
+      input = {}
+      output = s.validate!(input)
+      assert_equal({ year: Time.now.year }, output)
+    end
+
+    def test_nested_proc
+      myproc = proc { 42 }
+
+      s = Schema.new do
+        opt :myproc, Proc, default: ->() { myproc }
+      end
+
+      input = {}
+      output = s.validate!(input)
+      assert_equal({ myproc: myproc }, output)
+    end
+
     def test_invalid_default
       s = Schema.new :integer, default: '42'
 

data/test/empty_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+module Schemacop
+  class EmptyTest < Minitest::Test
+    def test_empty_hash
+      schema = Schema.new do
+        type Hash
+      end
+
+      assert_nothing_raised { schema.validate!({}) }
+      assert_verr { schema.validate!(foo: :bar) }
+    end
+  end
+end

data/test/validator_hash_test.rb

@@ -21,6 +21,28 @@ module Schemacop
       assert_verr { s.validate!(one: 3, three: true) }
     end
 
+    def test_allow_obsolete_keys
+      s = Schema.new do
+        type :hash, allow_obsolete_keys: true
+      end
+
+      assert_nothing_raised { s.validate!(foo: :bar) }
+      assert_equal({ foo: { bar: :baz } }, s.validate!(foo: { bar: :baz }))
+
+      assert_verr { s.validate!(3) }
+    end
+
+    def test_allow_obsolete_keys_with_substructore
+      s = Schema.new do
+        type :hash, allow_obsolete_keys: true do
+          req :foo
+        end
+      end
+
+      assert_nothing_raised { s.validate!(foo: :bar, bar: :baz) }
+      assert_verr { s.validate!(bar: :baz) }
+    end
+
     def test_nested
       s = Schema.new do
         type :hash do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.7
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,6 +187,7 @@ files:
 - doc/Schemacop/BooleanValidator.html
 - doc/Schemacop/Caster.html
 - doc/Schemacop/Collector.html
+- doc/Schemacop/Dupper.html
 - doc/Schemacop/Exceptions.html
 - doc/Schemacop/Exceptions/InvalidSchemaError.html
 - doc/Schemacop/Exceptions/ValidationError.html
@@ -226,6 +227,7 @@ files:
 - lib/schemacop.rb
 - lib/schemacop/caster.rb
 - lib/schemacop/collector.rb
+- lib/schemacop/dupper.rb
 - lib/schemacop/exceptions.rb
 - lib/schemacop/field_node.rb
 - lib/schemacop/node.rb
@@ -252,6 +254,7 @@ files:
 - test/custom_check_test.rb
 - test/custom_if_test.rb
 - test/defaults_test.rb
+- test/empty_test.rb
 - test/nil_dis_allow_test.rb
 - test/node_resolver_test.rb
 - test/short_forms_test.rb
@@ -286,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Schemacop validates ruby structures consisting of nested hashes and arrays
@@ -297,6 +300,7 @@ test_files:
 - test/custom_check_test.rb
 - test/custom_if_test.rb
 - test/defaults_test.rb
+- test/empty_test.rb
 - test/nil_dis_allow_test.rb
 - test/node_resolver_test.rb
 - test/short_forms_test.rb