schemacop 3.0.20 → 3.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4a4c21714a897d8dc9d04f6ef054890c39571a200390fc727943be5012f4fe
-  data.tar.gz: 29f3660744d2080d928bc0645fe6da7a110f985272a5a279508f7eb85816905e
+  metadata.gz: 2ac247150fb2c8a5e10bff8173787ce94e063b3a24f8fe2f323d78015424bfbb
+  data.tar.gz: c3393891a019419b1b0aac9200487bdd547124787507ce67d9be7d9a8ee2ae63
 SHA512:
-  metadata.gz: f5a5cfa4ea22c5b9203ecb7d049e15b29cb2c41ea1c4246bcab707a9265bb1769e1c645a1a7b5c7e5a8f0640c796aa154f87497d0a5b65228f512d6a14f893d8
-  data.tar.gz: ed8dd1f20572424c12dc1bb3b098169482a1ee887721054227d4f6111ad7fb65548e87b3a128f24b3a56ac4fbcd083de39bf25fd6b4404516850f9f2eab46711
+  metadata.gz: b51f45a493ce448dcb6413ec9f4eb7c109891bad83ff5bac50ef1fb59af7adac8606c70de744dff598b19784faa4c43a8c88e47ed3fddfa1e7f772eee97cc6e3
+  data.tar.gz: 42e69a2f2767bd95ebfaa13306e0e3e3d70b21998e013754b08a5ff6de448ddd680cec4f490b2acf9b94d9b5b2235bf713c63af675d256411feaa352b95912c9

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+## 3.0.22 (2022-10-31)
+
+* Fix `v3_default_options` being not applied to nodes
+
+## 3.0.21 (2022-10-31)
+
+* Adapt option `ignore_obsolete_properties` of `HashNode` so that it can also
+  function as a parameter white-list when set to an enumerable.
+
 ## 3.0.20 (2022-09-29)
 
 * Improve error messages for `all_of`, `any_of` and `one_of`

data/README_V3.md

@@ -873,6 +873,9 @@ It consists of key-value-pairs that can be validated using arbitrary nodes.
   controller, as this only allows white-listed params and removes any params
   which are not whitelisted (i.e. similar to strong params from Rails).
 
+  If it is set to an enumerable (e.g. `Set` or `Array`), it functions as a
+  white-list and only the given additional properties are allowed.
+
 #### Specifying properties
 
 Hash nodes support a block in which you can specify the required hash contents.

data/VERSION

@@ -1 +1 @@
-3.0.20
+3.0.22

data/lib/schemacop/v3/hash_node.rb

@@ -141,7 +141,9 @@ module Schemacop
               result.in_path(name) do
                 property_patterns[match]._validate(additional_property, result: result)
               end
-            elsif !options[:ignore_obsolete_properties]
+            elsif (options[:ignore_obsolete_properties].is_a?(Enumerable) &&
+                   options[:ignore_obsolete_properties].exclude?(name.to_sym)) ||
+                  !options[:ignore_obsolete_properties]
               result.error "Obsolete property #{name.to_s.inspect}."
             end
           elsif options[:additional_properties].is_a?(Node)

data/lib/schemacop/v3/node.rb

@@ -28,9 +28,8 @@ module Schemacop
         klass = resolve_class(type)
         fail "Could not find node for type #{type.inspect}." unless klass
 
-        node = klass.new(**options, &block)
-
         options = Schemacop.v3_default_options.slice(*klass.allowed_options).merge(options)
+        node = klass.new(**options, &block)
 
         if options.delete(:cast_str)
           format = NodeRegistry.name(klass)

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.20 ruby lib
+# stub: schemacop 3.0.22 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.20"
+  s.version = "3.0.22"
 
   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 = "2022-09-29"
+  s.date = "2022-10-31"
   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]

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

@@ -1074,6 +1074,43 @@ module Schemacop
         assert_cast({ foo: 1, bar: 'baz', obsolete_key: 42 }, { foo: 1, bar: 'baz' }.with_indifferent_access)
       end
 
+      def test_ignore_obsolete_properties_whitelist
+        schema :hash, ignore_obsolete_properties: %i[obsolete_key] do
+          int? :foo
+          str? :bar
+        end
+
+        # Some standard validations first
+        assert_validation({})
+        assert_validation({ foo: 1 })
+        assert_validation({ bar: 'baz' })
+        assert_validation({ foo: 1, bar: 'baz' })
+        assert_validation({ foo: 1, bar: 'baz', baz: 'foo' }) do
+          error '/', 'Obsolete property "baz".'
+        end
+
+        assert_cast({}, {}.with_indifferent_access)
+        assert_cast({ foo: 1 }, { foo: 1 }.with_indifferent_access)
+        assert_cast({ bar: 'baz' }, { bar: 'baz' }.with_indifferent_access)
+        assert_cast({ foo: 1, bar: 'baz' }, { foo: 1, bar: 'baz' }.with_indifferent_access)
+
+        # Should allow obsolete properties and remove them from the result
+        assert_validation({ obsolete_key: 42 })
+        assert_validation({ foo: 1, obsolete_key: 42 })
+        assert_validation({ bar: 'baz', obsolete_key: 42 })
+        assert_validation({ foo: 1, bar: 'baz', obsolete_key: 42 })
+
+        assert_cast({ obsolete_key: 42 }, {}.with_indifferent_access)
+        assert_cast({ foo: 1, obsolete_key: 42 }, { foo: 1 }.with_indifferent_access)
+        assert_cast({ bar: 'baz', obsolete_key: 42 }, { bar: 'baz' }.with_indifferent_access)
+        assert_cast({ foo: 1, bar: 'baz', obsolete_key: 42 }, { foo: 1, bar: 'baz' }.with_indifferent_access)
+
+        assert_cast({ obsolete_key: 42 }, {}.with_indifferent_access)
+        assert_cast({ foo: 1, obsolete_key: 42 }, { foo: 1 }.with_indifferent_access)
+        assert_cast({ bar: 'baz', obsolete_key: 42 }, { bar: 'baz' }.with_indifferent_access)
+        assert_cast({ foo: 1, bar: 'baz', obsolete_key: 42 }, { foo: 1, bar: 'baz' }.with_indifferent_access)
+      end
+
       def test_ignore_obsolete_properties_false
         schema :hash, ignore_obsolete_properties: false do
           int? :foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.20
+  version: 3.0.22
 platform: ruby
 authors:
 - Sitrox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport