dry-validation 1.5.1 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2deba7f8bd2d4ad011e0f4be2aa20d4f20d219d85d0eeec23d3b3e0b12c0bcf4
-  data.tar.gz: 12f9500062c0239d19f6bf32450db22065a9caa3062e4cb71d79a9370c3229ec
+  metadata.gz: 1cbb33c9bad218b481c727b04080736ad0d974f47b552ed305de4f50e5bd8d6d
+  data.tar.gz: e464d56a10afa52ab975d44d204a0879649007eeb98a1a15038e5c6d29b78b21
 SHA512:
-  metadata.gz: be6cf6d5dfce8ebec88743b7661eaf4d3cc1294cea249b87e7c02fd00b36013a033fe5feab1ccdb3e6e6020873435fbfc5bf6ee41b5f76836358973f5074843e
-  data.tar.gz: 77f87593b028dfa608f22835413a73fcbd7c2585e9a98c95f20a158df47fc5ca3f46a0357188f5bd1fc37140de7b57b833ae969aabe55bbdf71628f7db6f645e
+  metadata.gz: 94637a8714ffc4111c0279a7aeb52613fccf894abd33207600131e7af59803371b044691949c9a457c85bbdbb9d063c7c050aa58fc51966e7469b62f97156008
+  data.tar.gz: f15fbb334bd99fe79348a750bca344beff68156394c314f1845307a1b5b2462446117a80e47d0d3eb40108e3042de99744c205a7ffc99ef48bebd179a5fa0299

data/CHANGELOG.md

@@ -1,14 +1,127 @@
-## unreleased 
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 1.8.1 2022-05-28
+
+
+### Fixed
+
+- Raise an InvalidKeyErrors on substring of valid keys (issue #705 fixed via #706) (@MatElGran)
+- Using `rule(:arr).each { .. }` doesn't crash when `:arr` turns out to be `nil` (issue #708 fixed via #709) (@bautrey37)
+
+
+[Compare v1.8.0...v1.8.1](https://github.com/dry-rb/dry-validation/compare/v1.8.0...v1.8.1)
+
+## 1.8.0 2022-02-17
+
+
+### Added
+
+- New rule helper `base_rule_error?` which checks if there's any base error set (via #690) (@wuarmin)
+
+### Changed
+
+- Dependency on dry-schema was bumped to 1.9.1 (@solnic)
+
+[Compare v1.7.0...v1.8.0](https://github.com/dry-rb/dry-validation/compare/v1.7.0...v1.8.0)
+
+## 1.7.0 2021-09-12
+
+
+### Changed
+
+- [internal] Upgraded to new `setting` API provided in dry-configurable 0.13.0 (@timriley in #686 and 3f8f7d8)
+- Bumped dry-schema dependency to 1.8.0 (in part, to ensure dry-configurable 0.13.0 is available) (@timriley)
+
+[Compare v1.6.0...v1.7.0](https://github.com/dry-rb/dry-validation/compare/v1.6.0...v1.7.0)
+
+## 1.6.0 2020-12-05
+
+
+### Added
+
+- You can now pass a key name or path to `rule_error?` predicate (issue #658 closed via #673) (@moofkit)
+- You can now pass initial context object to `Contract#call` (issue #674 via #675) (@pyromaniac)
+
+### Fixed
+
+- Checking `key?` within a rule no longer crashes when value is `nil` or an empty string (issue #670 fixed via #672) (@alexxty7)
+
+
+[Compare v1.5.6...v1.6.0](https://github.com/dry-rb/dry-validation/compare/v1.5.6...v1.6.0)
+
+## 1.5.6 2020-09-04
+
+
+### Fixed
+
+- Dependency on dry-schema was bumped to >= 1.5.1. This time for real (@solnic)
+
+
+[Compare v1.5.5...v1.5.6](https://github.com/dry-rb/dry-validation/compare/v1.5.5...v1.5.6)
+
+## 1.5.5 2020-09-03
+
+
+### Fixed
+
+- Dependency on dry-schema was bumped to >= 1.5.2 (see #666 for more info) (@artofhuman)
+
+
+[Compare v1.5.4...v1.5.5](https://github.com/dry-rb/dry-validation/compare/v1.5.4...v1.5.5)
+
+## 1.5.4 2020-08-21
+
+
+### Added
+
+- You can now pass any key or a path to the rule's `key?` helper (see #664 for more info) (@alassek)
+
+### Fixed
+
+- Full messages work correctly with rule failures now (issue #661 fixed via #662) (@stind)
+- Providing a custom message template for array errors works correctly (issue #663 fixed via #665) (@tadeusz-niemiec)
+
+
+[Compare v1.5.3...v1.5.4](https://github.com/dry-rb/dry-validation/compare/v1.5.3...v1.5.4)
+
+## 1.5.3 2020-07-27
+
+
+### Added
+
+- You can now access current value's index via `rule(:foo).each do |index:|` (issue #606 done via #657) (@mrbongiolo)
+
+### Fixed
+
+- Using `.each(:foo)` works as expected when there are errors related to other keys (issue #659 fixed via #660) (@solnic)
+
+### Changed
+
+- `Result#error?` is now a public API and it takes into consideration both schema and rule errors (issue #655 fixed via #656) (@PragTob)
+
+[Compare v1.5.2...v1.5.3](https://github.com/dry-rb/dry-validation/compare/v1.5.2...v1.5.3)
+
+## 1.5.2 2020-07-14
+
+
+### Fixed
+
+- `key?` predicate in rules no longer crashes when the rule path points to a non-existent array value (issue #653 fixed via #654) (@solnic)
+
+
+[Compare v1.5.1...v1.5.2](https://github.com/dry-rb/dry-validation/compare/v1.5.1...v1.5.2)
+
+## 1.5.1 2020-06-18
 
 
 ### Fixed
 
 - dry-monads no longer required for the `:hints` extension (@schokomarie)
 - Using `full: true` option works as expected with custom rule messages (issue #618 fixed via #651) (@sirfilip)
-- Using `locale: ...` option works as expected with hints (issue #589 fixed via #652) (@sirfilip)
+- Using `locale: ...` option works as expected with hints (issue #589 fixed via 652) (@sirfilip)
 
 
-[Compare v1.5.0...master](https://github.com/dry-rb/dry-validation/compare/v1.5.0...master)
+[Compare v1.5.0...v1.5.1](https://github.com/dry-rb/dry-validation/compare/v1.5.0...v1.5.1)
 
 ## 1.5.0 2020-03-11
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 dry-rb team
+Copyright (c) 2015-2021 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-validation
 [actions]: https://github.com/dry-rb/dry-validation/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-validation
@@ -10,19 +11,19 @@
 [![CI Status](https://github.com/dry-rb/dry-validation/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f30e3ff5ec304c55a73868cdbf055c67)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f30e3ff5ec304c55a73868cdbf055c67)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-validation.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-validation.svg?branch=main)][inchpages]
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-validation)
+* [User documentation](https://dry-rb.org/gems/dry-validation)
 * [API documentation](http://rubydoc.info/gems/dry-validation)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.4`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-validation.gemspec

@@ -1,39 +1,39 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/validation/version'
+require "dry/validation/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-validation'
+  spec.name          = "dry-validation"
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Validation::VERSION.dup
 
   spec.summary       = "Validation library"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-validation'
+  spec.homepage      = "https://dry-rb.org/gems/dry-validation"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-validation.gemspec", "lib/**/*", "config/*.yml"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-validation/blob/master/CHANGELOG.md'
-  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-validation'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-validation/issues'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-validation/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-validation"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-validation/issues"
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "dry-container", "~> 0.7", ">= 0.7.1"
-  spec.add_runtime_dependency "dry-core", "~> 0.4"
-  spec.add_runtime_dependency "dry-equalizer", "~> 0.2"
+  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-schema", "~> 1.5"
+  spec.add_runtime_dependency "dry-schema", "~> 1.8", ">= 1.8.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/validation/config.rb

@@ -11,7 +11,7 @@ module Dry
     #
     # @api public
     class Config < Schema::Config
-      setting :macros, Macros::Container.new, &:dup
+      setting :macros, default: Macros::Container.new, constructor: :dup.to_proc
 
       # @api private
       def dup

data/lib/dry/validation/contract/class_interface.rb

@@ -158,11 +158,13 @@ module Dry
           valid_paths = key_map.to_dot_notation
           key_paths = key_paths(keys)
 
-          invalid_keys = key_paths.map { |(key, path)|
-            unless valid_paths.any? { |vp| vp.include?(path) || vp.include?("#{path}[]") }
+          invalid_keys = key_paths.filter_map { |(key, path)|
+            if valid_paths.none? { |vp|
+                 vp == path || vp.start_with?("#{path}.", "#{path}[]")
+               }
               key
             end
-          }.compact.uniq
+          }.uniq
 
           return if invalid_keys.empty?
 

data/lib/dry/validation/contract.rb

@@ -2,7 +2,7 @@
 
 require "concurrent/map"
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/initializer"
 require "dry/schema/path"
 
@@ -68,6 +68,11 @@ module Dry
       #   @api public
       option :macros, default: -> { config.macros }
 
+      # @!attribute [r] default_context
+      #   @return [Hash] Default context for rules
+      #   @api public
+      option :default_context, default: -> { EMPTY_HASH }
+
       # @!attribute [r] schema
       #   @return [Dry::Schema::Params, Dry::Schema::JSON, Dry::Schema::Processor]
       #   @api private
@@ -86,12 +91,19 @@ module Dry
       # Apply the contract to an input
       #
       # @param [Hash] input The input to validate
+      # @param [Hash] context Initial context for rules
       #
       # @return [Result]
       #
       # @api public
-      def call(input)
-        Result.new(schema.(input), Concurrent::Map.new) do |result|
+      # rubocop: disable Metrics/AbcSize
+      def call(input, context = EMPTY_HASH)
+        context_map = Concurrent::Map.new.tap do |map|
+          default_context.each { |key, value| map[key] = value }
+          context.each { |key, value| map[key] = value }
+        end
+
+        Result.new(schema.(input), context_map) do |result|
           rules.each do |rule|
             next if rule.keys.any? { |key| error?(result, key) }
 
@@ -103,6 +115,7 @@ module Dry
           end
         end
       end
+      # rubocop: enable Metrics/AbcSize
 
       # Return a nice string representation
       #
@@ -123,14 +136,14 @@ module Dry
           return path.expand.any? { |nested_path| error?(result, nested_path) }
         end
 
-        return true if result.error?(path)
+        return true if result.schema_error?(path)
 
         path
           .to_a[0..-2]
           .any? { |key|
             curr_path = Schema::Path[path.keys[0..path.keys.index(key)]]
 
-            return false unless result.error?(curr_path)
+            return false unless result.schema_error?(curr_path)
 
             result.errors.any? { |err|
               (other = Schema::Path[err.path]).same_root?(curr_path) && other == curr_path

data/lib/dry/validation/evaluator.rb

@@ -17,7 +17,7 @@ module Dry
     # @api public
     class Evaluator
       extend Dry::Initializer
-      extend Dry::Core::Deprecations[:'dry-validation']
+      extend Dry::Core::Deprecations[:"dry-validation"]
 
       deprecate :error?, :schema_error?
 
@@ -73,7 +73,7 @@ module Dry
         @_options = options
 
         if block
-          exec_opts = block_options.map { |key, value| [key, _options[value]] }.to_h
+          exec_opts = block_options.transform_values { _options[_1] }
           instance_exec(**exec_opts, &block)
         end
 
@@ -155,16 +155,23 @@ module Dry
       #
       # This is useful when dealing with rules for optional keys
       #
-      # @example
+      # @example use the default key name
       #   rule(:age) do
       #     key.failure(:invalid) if key? && value < 18
       #   end
       #
+      # @example specify the key name
+      #   rule(:start_date, :end_date) do
+      #     if key?(:start_date) && !key?(:end_date)
+      #       key(:end_date).failure("must provide an end_date with start_date")
+      #     end
+      #   end
+      #
       # @return [Boolean]
       #
       # @api public
-      def key?
-        values.key?(key_name)
+      def key?(name = key_name)
+        values.key?(name)
       end
 
       # Check if there are any errors on the schema under the provided path
@@ -175,16 +182,31 @@ module Dry
       #
       # @api public
       def schema_error?(path)
-        result.error?(path)
+        result.schema_error?(path)
       end
 
       # Check if there are any errors on the current rule
       #
+      # @param path [Symbol, String, Array] A Path-compatible spec
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def rule_error?(path = nil)
+        if path.nil?
+          !key(self.path).empty?
+        else
+          result.rule_error?(path)
+        end
+      end
+
+      # Check if there are any base rule errors
+      #
       # @return [Boolean]
       #
       # @api public
-      def rule_error?
-        !key(path).empty?
+      def base_rule_error?
+        !base.empty? || result.base_rule_error?
       end
 
       # @api private

data/lib/dry/validation/function.rb

@@ -36,8 +36,7 @@ module Dry
         block
           .parameters
           .select { |arg,| arg.equal?(:keyreq) }
-          .map { |_, name| [name, BLOCK_OPTIONS_MAPPINGS[name]] }
-          .to_h
+          .to_h { [_2, BLOCK_OPTIONS_MAPPINGS[_2]] }
       end
     end
   end

data/lib/dry/validation/macro.rb

@@ -31,7 +31,7 @@ module Dry
 
       # @api private
       def extract_block_options(options)
-        block_options.map { |key, value| [key, options[value]] }.to_h
+        block_options.transform_values { options[_1] }
       end
     end
   end

data/lib/dry/validation/message.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/schema/constants"
 require "dry/schema/message"
@@ -70,11 +70,13 @@ module Dry
       # Initialize a new error object
       #
       # @api private
+      # rubocop: disable Lint/MissingSuper
       def initialize(text, path:, meta: EMPTY_HASH)
         @text = text
         @path = Array(path)
         @meta = meta
       end
+      # rubocop: enable Lint/MissingSuper
 
       # Check if this is a base error not associated with any key
       #

data/lib/dry/validation/messages/resolver.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require "dry/validation/message"
+require "dry/schema/message_compiler"
 
 module Dry
   module Validation
     module Messages
+      FULL_MESSAGE_WHITESPACE = Dry::Schema::MessageCompiler::FULL_MESSAGE_WHITESPACE
+
       # Resolve translated messages from failure arguments
       #
       # @api public
@@ -33,7 +36,7 @@ module Dry
           when Symbol
             Message[->(**opts) { message(message, path: path, tokens: tokens, **opts) }, path, meta]
           when String
-            Message[->(**opts) { [message_text(message, path, **opts), meta] }, path, meta]
+            Message[->(**opts) { [message_text(message, path: path, **opts), meta] }, path, meta]
           when Hash
             meta = message.dup
             text = meta.delete(:text) { |key|
@@ -51,18 +54,6 @@ module Dry
         end
         alias_method :[], :call
 
-        # Resolve a message
-        #
-        # @return String
-        #
-        # @api public
-        def message_text(message, path, locale: nil, full: false, **opts)
-          keys = path.to_a.compact
-          msg_opts = EMPTY_HASH.merge(path: keys, locale: locale || messages.default_locale)
-
-          full ? "#{messages.rule(keys.last, msg_opts) || keys.last} #{message}" : message
-        end
-
         # Resolve a message
         #
         # @return [String]
@@ -70,7 +61,8 @@ module Dry
         # @api public
         #
         # rubocop:disable Metrics/AbcSize
-        def message(rule, tokens: EMPTY_HASH, locale: nil, full: false, path:)
+        # rubocop:disable Metrics/PerceivedComplexity
+        def message(rule, path:, tokens: EMPTY_HASH, locale: nil, full: false)
           keys = path.to_a.compact
           msg_opts = tokens.merge(path: keys, locale: locale || messages.default_locale)
 
@@ -81,6 +73,11 @@ module Dry
             template, meta = messages[rule, msg_opts.merge(path: keys.last)] unless template
           end
 
+          if !template && keys.size > 1
+            non_index_keys = keys.reject { |k| k.is_a?(Integer) }
+            template, meta = messages[rule, msg_opts.merge(path: non_index_keys.join(DOT))]
+          end
+
           unless template
             raise MissingMessageError, <<~STR
               Message template for #{rule.inspect} under #{keys.join(DOT).inspect} was not found
@@ -90,18 +87,32 @@ module Dry
           parsed_tokens = parse_tokens(tokens)
           text = template.(template.data(parsed_tokens))
 
-          [full ? "#{messages.rule(keys.last, msg_opts)} #{text}" : text, meta]
+          [message_text(text, path: path, locale: locale, full: full), meta]
         end
+        # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/AbcSize
 
         private
 
+        def message_text(text, path:, locale: nil, full: false)
+          return text unless full
+
+          key = key_text(path: path, locale: locale)
+
+          [key, text].compact.join(FULL_MESSAGE_WHITESPACE[locale])
+        end
+
+        def key_text(path:, locale: nil)
+          locale ||= messages.default_locale
+
+          keys = path.to_a.compact
+          msg_opts = {path: keys, locale: locale}
+
+          messages.rule(keys.last, msg_opts) || keys.last
+        end
+
         def parse_tokens(tokens)
-          Hash[
-            tokens.map do |key, token|
-              [key, parse_token(token)]
-            end
-          ]
+          tokens.transform_values { parse_token(_1) }
         end
 
         def parse_token(token)

data/lib/dry/validation/result.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "concurrent/map"
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/validation/constants"
 require "dry/validation/message_set"
@@ -101,11 +101,32 @@ module Dry
 
       # Check if values include an error for the provided key
       #
-      # @api private
+      # @api public
       def error?(key)
+        errors.any? { |msg| Schema::Path[msg.path].include?(Schema::Path[key]) }
+      end
+
+      # Check if the base schema (without rules) includes an error for the provided key
+      #
+      # @api private
+      def schema_error?(key)
         schema_result.error?(key)
       end
 
+      # Check if the rules includes an error for the provided key
+      #
+      # @api private
+      def rule_error?(key)
+        !schema_error?(key) && error?(key)
+      end
+
+      # Check if the result contains any base rule errors
+      #
+      # @api private
+      def base_rule_error?
+        !errors.filter(:base?).empty?
+      end
+
       # Check if there's any error for the provided key
       #
       # This does not consider errors from the nested values
@@ -116,7 +137,7 @@ module Dry
           key_path = Schema::Path[key]
           err_path = Schema::Path[error.path]
 
-          return false unless key_path.same_root?(err_path)
+          next unless key_path.same_root?(err_path)
 
           key_path == err_path
         }

data/lib/dry/validation/rule.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/validation/constants"
 require "dry/validation/function"
@@ -65,8 +65,8 @@ module Dry
       # for a given array item.
       #
       # @example
-      #   rule(:nums).each do
-      #     key.failure("must be greater than 0") if value < 0
+      #   rule(:nums).each do |index:|
+      #     key([:number, index]).failure("must be greater than 0") if value < 0
       #   end
       #   rule(:nums).each(min: 3)
       #   rule(address: :city) do
@@ -76,19 +76,21 @@ module Dry
       # @return [Rule]
       #
       # @api public
+      #
+      # rubocop:disable Metrics/AbcSize
       def each(*macros, &block)
         root = keys[0]
         macros = parse_macros(*macros)
         @keys = []
 
         @block = proc do
-          unless result.base_error?(root) || !values.key?(root)
+          unless result.base_error?(root) || !values.key?(root) || values[root].nil?
             values[root].each_with_index do |_, idx|
               path = [*Schema::Path[root].to_a, idx]
 
-              next if result.error?(path)
+              next if result.schema_error?(path)
 
-              evaluator = with(macros: macros, keys: [path], &block)
+              evaluator = with(macros: macros, keys: [path], index: idx, &block)
 
               failures.concat(evaluator.failures)
             end
@@ -99,6 +101,7 @@ module Dry
 
         self
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Return a nice string representation
       #

data/lib/dry/validation/values.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/schema/path"
 require "dry/validation/constants"
 
@@ -61,6 +61,7 @@ module Dry
       end
 
       # @api public
+      # rubocop: disable Metrics/PerceivedComplexity
       def key?(key, hash = data)
         return hash.key?(key) if key.is_a?(Symbol)
 
@@ -68,14 +69,20 @@ module Dry
           if e.is_a?(Array)
             result = e.all? { |k| key?(k, a) }
             return result
+          elsif e.is_a?(Symbol) && a.is_a?(Array)
+            return false
+          elsif a.nil?
+            return false
+          elsif a.is_a?(String)
+            return false
           else
             return false unless a.is_a?(Array) ? (e >= 0 && e < a.size) : a.key?(e)
           end
           a[e]
         end
-
         true
       end
+      # rubocop: enable Metrics/PerceivedComplexity
 
       # @api private
       def respond_to_missing?(meth, include_private = false)

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = "1.5.1"
+    VERSION = "1.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -50,28 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: dry-equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.5'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +84,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -181,10 +179,10 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-validation/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-validation/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-validation
   bug_tracker_uri: https://github.com/dry-rb/dry-validation/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,15 +190,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Validation library
 test_files: []